Replace ipkg-utils with opkg-utils
cover Replace ipkg-utils with opkg-utils
From: Khem Raj <[email protected]>
These patches replace usage of ipkg-utils with opkg-utils in OE. I have built a native-sdk-image successfully on angstrom-2008.1
Please review and provide your feedback
-Khem
PATCH 1/5 classes/package_ipk.bbclass, classes/sourceipk.bbclass: Use opkg-utils-native instead of ipkg-utils-native
--- classes/package_ipk.bbclass | 4 ++-- classes/sourceipk.bbclass | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
classes/package_ipk.bbclass +2 -2
@@ -70,7 +70,7 @@ do_package_update_index_ipk[lockfiles] = "${DEPLOY_DIR_IPK}.lock" do_package_update_index_ipk[nostamp] = "1" do_package_update_index_ipk[recrdeptask] += "do_package_write_ipk" do_package_update_index_ipk[recrdeptask] += "do_package_write_ipk" -do_package_update_index_ipk[depends] += "ipkg-utils-native:do_populate_sysroot" +do_package_update_index_ipk[depends] += "opkg-utils-native:do_populate_sysroot" # # Update the Packages index files in ${DEPLOY_DIR_IPK}
@@ -315,7 +315,7 @@ python do_package_ipk () { python () { if bb.data.getVar('PACKAGES', d, True) != '': deps = (bb.data.getVarFlag('do_package_write_ipk', 'depends', d) or "").split() - deps.append('ipkg-utils-native:do_populate_sysroot') + deps.append('opkg-utils-native:do_populate_sysroot') deps.append('fakeroot-native:do_populate_sysroot') bb.data.setVarFlag('do_package_write_ipk', 'depends', " ".join(deps), d) }
classes/sourceipk.bbclass +2 -2
@@ -34,9 +34,9 @@ # Need to figure out how to use ipkg-build in this class. # I tried adding it as a dependency for the do_create_srcipk # task using: -# do_create_srcipk[depends] += "ipkg-utils-native:do_populate_sysroot" +# do_create_srcipk[depends] += "opkg-utils-native:do_populate_sysroot" # But then there is a circular dependency between sourcipk.bbclass and -# ipkg-utils-native. Until I can figure out how to resolve this +# opkg-utils-native. Until I can figure out how to resolve this # circular dependency I am extracting the needed pieces from ipkg-build # into this class and building the source ipk myself.
Signature · 1 line
1.7.0.4
PATCH 2/5 opkg-utils_svn.bb: Sync with yocto
In reply to Khem Raj--- .../opkg-utils/index-ignore-filenotfound.patch | 54 ++++++++++++++++++++ recipes/opkg-utils/opkg-utils_svn.bb | 24 ++++++--- 2 files changed, 69 insertions(+), 9 deletions(-) create mode 100644 recipes/opkg-utils/opkg-utils/index-ignore-filenotfound.patch
recipes/opkg-utils/opkg-utils/index-ignore-filenotfound.patch new file +54 -0
@@ -0,0 +1,54 @@ +If we're building an image and some package rebuilds while this is happening +some package can be removed/added to the ipk deploy directory. The image will +not depend on this package so we can safely ignore these cases rather than +error out. + +RP - 26/8/09 + +Index: opkg-utils/opkg-make-index +=================================================================== +--- opkg-utils.orig/opkg-make-index 2009-08-26 17:21:26.000000000 +0100 ++++ opkg-utils/opkg-make-index 2009-08-27 16:11:22.000000000 +0100 +@@ -96,6 +96,7 @@ + files=glob(pkg_dir + '/*.ipk') + glob(pkg_dir + '/*.deb') + files.sort() + for filename in files: ++ try: + basename = os.path.basename(filename) + pkg = None + fnameStat = os.stat(filename) +@@ -130,6 +131,12 @@ + to_morgue(basename) + if opt_s: + print filename ++ except OSError: ++ sys.stderr.write("Package %s disappeared on us!\n" % (filename)) ++ continue ++ except IOError: ++ sys.stderr.write("Package %s disappeared on us!\n" % (filename)) ++ continue + + pkgsStampsFile = open(stamplist_filename, "w") + for f in pkgsStamps.keys(): +@@ -148,6 +155,7 @@ + names = packages.packages.keys() + names.sort() + for name in names: ++ try: + pkg = packages.packages[name] + if locales_dir and pkg.depends: + depends = string.split(pkg.depends, ',') +@@ -165,6 +173,13 @@ + if (verbose): + sys.stderr.write("Writing info for package %s\n" % (pkg.package,)) + print pkg ++ except OSError: ++ sys.stderr.write("Package %s disappeared on us!\n" % (name)) ++ continue ++ except IOError: ++ sys.stderr.write("Package %s disappeared on us!\n" % (name)) ++ continue ++ + if packages_filename: + sys.stdout.close() + sys.stdout = old_stdout
recipes/opkg-utils/opkg-utils_svn.bb +15 -9
@@ -1,18 +1,24 @@ DESCRIPTION = "OPKG Package Manager Utilities" SECTION = "base" +HOMEPAGE = "http://wiki.openmoko.org/wiki/Opkg" PRIORITY = "optional" -LICENSE = "GPL" RDEPENDS_${PN} = "python" -RDEPENDS_virtclass-native = "" -SRCREV = "4595" -PV = "0.0+svnr${SRCPV}" +RDEPENDS_${PN}_virtclass-native = "" +SRCREV = "4747" +PV = "0.1.8+svnr${SRCPV}" PR = "r5" -BBCLASSEXTEND = "native" - -SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=opkg-utils;proto=http" +SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=opkg-utils;proto=http \ + file://index-ignore-filenotfound.patch" -TARGET_CC_ARCH += "${LDFLAGS}" S = "${WORKDIR}/opkg-utils" -inherit autotools +# Avoid circular dependencies from package_ipk.bbclass +PACKAGES_virtclass-native = "" + +do_install() { + oe_runmake PREFIX=${prefix} DESTDIR=${D} install +} + +BBCLASSEXTEND = "native" +TARGET_CC_ARCH += "${LDFLAGS}"
Signature · 1 line
1.7.0.4
PATCH 3/5 recipes/meta recipes/tasks: Replace ipkg-utils with opkg-utils
In reply to Khem Raj--- recipes/meta/canadian-sdk.bb | 2 +- recipes/meta/foonas-packages.bb | 2 +- recipes/meta/meta-toolchain.bb | 2 +- recipes/meta/openprotium-packages.bb | 2 +- recipes/meta/oplinux-packages.bb | 2 +- recipes/meta/package-index.bb | 2 +- recipes/meta/slugos-packages.bb | 2 +- recipes/tasks/task-sdk-sbox-gpe.bb | 2 +- recipes/tasks/task-shr-feed.bb | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-)
recipes/meta/canadian-sdk.bb +1 -1
@@ -1,6 +1,6 @@ DESCRIPTION = "Meta package for building a installable toolchain" LICENSE = "MIT" -DEPENDS = "opkg-native ipkg-utils-native fakeroot-native sed-native zip-native" +DEPENDS = "opkg-native opkg-utils-native fakeroot-native sed-native zip-native" PR = "r5" # NOTE: We need to save and restore PACKAGE_ARCHS, because sdk.bbclass
recipes/meta/foonas-packages.bb +1 -1
@@ -74,7 +74,7 @@ FOONAS_PACKAGES = "\ gtk-doc \ gzip \ hdparm \ - ipkg-utils \ + opkg-utils \ iptables \ ircp \ joe \
recipes/meta/meta-toolchain.bb +1 -1
@@ -1,6 +1,6 @@ DESCRIPTION = "Meta package for building a installable toolchain" LICENSE = "MIT" -DEPENDS = "opkg-native ipkg-utils-native fakeroot-native sed-native" +DEPENDS = "opkg-native opkg-utils-native fakeroot-native sed-native" inherit meta
recipes/meta/openprotium-packages.bb +1 -1
@@ -106,7 +106,7 @@ OPENPROTIUM_PACKAGES = "\ gzip \ hdparm \ ifupdown \ - ipkg-utils \ + opkg-utils \ iptables \ ircp \ joe \
recipes/meta/oplinux-packages.bb +1 -1
@@ -201,7 +201,7 @@ PACKAGES_LIST = "\ hydra \ ifupdown \ iputils \ - ipkg-utils \ + opkg-utils \ iptables \ intercom \ ircp \
recipes/meta/package-index.bb +1 -1
@@ -1,6 +1,6 @@ DESCRIPTION = "Rebuild the package index" LICENSE = "MIT" -DEPENDS = "ipkg-utils-native" +DEPENDS = "opkg-utils-native" PACKAGE_ARCH = "${MACHINE_ARCH}"
recipes/meta/slugos-packages.bb +1 -1
@@ -99,7 +99,7 @@ SLUGOS_PACKAGES = "\ ifupdown \ iozone3 \ iperf \ - ipkg-utils \ + opkg-utils \ iptables \ joe \ jpeg \
recipes/tasks/task-sdk-sbox-gpe.bb +1 -1
@@ -11,7 +11,7 @@ RDEPENDS_${PN} = "\ gdk-pixbuf-loader-xpm \ intltool \ intltool-dev \ - ipkg-utils \ + opkg-utils \ gettext-dev \ pkgconfig-dev \ autoconf \
recipes/tasks/task-shr-feed.bb +1 -1
@@ -79,7 +79,7 @@ RDEPENDS_${PN} += "\ mtpaint \ telepathy-python \ intone-video \ - ipkg-utils \ + opkg-utils \ mysql \ fltk-chess \ remoko \
Signature · 1 line
1.7.0.4
Re: [PATCH 3/5] recipes/meta recipes/tasks: Replace ipkg-utils with opkg-utils
recipes/meta/canadian-sdk.bb line 4
Quoted 3 lines · Khem Raj
recipes/meta/canadian-sdk.bb +1
-1-DEPENDS = "opkg-native ipkg-utils-native fakeroot-native sed-native zip-native" +DEPENDS = "opkg-native opkg-utils-native fakeroot-native sed-native zip-native" PR = "r5"
Do you want to change the PR?
Re: [PATCH 3/5] recipes/meta recipes/tasks: Replace ipkg-utils with opkg-utils
Quoted 6 lines · Holger Freyther
Quoted 3 lines · Khem Raj
recipes/meta/canadian-sdk.bb +1
-1-DEPENDS = "opkg-native ipkg-utils-native fakeroot-native sed-native zip-native" +DEPENDS = "opkg-native opkg-utils-native fakeroot-native sed-native zip-native"PR = "r5"
Do you want to change the PR?
Will do.
Quoted 6 lines
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel