diff options
Diffstat (limited to 'meta/packages/opkg-utils')
-rw-r--r-- | meta/packages/opkg-utils/opkg-utils/index-ignore-filenotfound.patch | 54 | ||||
-rw-r--r-- | meta/packages/opkg-utils/opkg-utils_svn.bb | 24 |
2 files changed, 0 insertions, 78 deletions
diff --git a/meta/packages/opkg-utils/opkg-utils/index-ignore-filenotfound.patch b/meta/packages/opkg-utils/opkg-utils/index-ignore-filenotfound.patch deleted file mode 100644 index e4a548156..000000000 --- a/meta/packages/opkg-utils/opkg-utils/index-ignore-filenotfound.patch +++ /dev/null @@ -1,54 +0,0 @@ -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 diff --git a/meta/packages/opkg-utils/opkg-utils_svn.bb b/meta/packages/opkg-utils/opkg-utils_svn.bb deleted file mode 100644 index f3b6f1f4c..000000000 --- a/meta/packages/opkg-utils/opkg-utils_svn.bb +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION = "OPKG Package Manager Utilities" -SECTION = "base" -HOMEPAGE = "http://wiki.openmoko.org/wiki/Opkg" -PRIORITY = "optional" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://opkg.py;beginline=1;endline=18;md5=15917491ad6bf7acc666ca5f7cc1e083" -RDEPENDS = "python" -RDEPENDS_virtclass-native = "" -PR = "r1" - -SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=opkg-utils;proto=http \ - file://index-ignore-filenotfound.patch" - -S = "${WORKDIR}/opkg-utils" - -# Avoid circular dependencies from package_ipk.bbclass -PACKAGES_virtclass-native = "" - -do_install() { - oe_runmake PREFIX=${prefix} DESTDIR=${D} install -} - -BBCLASSEXTEND = "native" |