mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 00:39:46 +00:00
Code Issues Projects Releases Wiki Activity

opkg-utils: Update changing .ipk avoidence patch

Browse Source 
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
Richard Purdie
2009-08-27 16:12:57 +01:00
parent 670a7ee294
commit c5983de054
2 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/packages/opkg-utils/opkg-utils/index-ignore-filenotfound.patch
+18 -4
View File
@@ -1,7 +1,14 @@
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 Index: opkg-utils/opkg-make-index
=================================================================== ===================================================================
--- opkg-utils.orig/opkg-make-index 2009-08-26 17:21:26.000000000 +0100 --- opkg-utils.orig/opkg-make-index 2009-08-26 17:21:26.000000000 +0100
+++ opkg-utils/opkg-make-index 2009-08-26 20:49:52.000000000 +0100 +++ opkg-utils/opkg-make-index 2009-08-27 16:11:22.000000000 +0100
@@ -96,6 +96,7 @@ @@ -96,6 +96,7 @@
files=glob(pkg_dir + '/*.ipk') + glob(pkg_dir + '/*.deb') files=glob(pkg_dir + '/*.ipk') + glob(pkg_dir + '/*.deb')
files.sort() files.sort()
@@ -10,17 +17,20 @@ Index: opkg-utils/opkg-make-index
basename = os.path.basename(filename) basename = os.path.basename(filename)
pkg = None pkg = None
fnameStat = os.stat(filename) fnameStat = os.stat(filename)
@@ -130,6 +131,9 @@ @@ -130,6 +131,12 @@
to_morgue(basename) to_morgue(basename)
if opt_s: if opt_s:
print filename print filename
+ except OSError: + except OSError:
+ sys.stderr.write("Package %s disappeared on us!\n" % (filename)) + sys.stderr.write("Package %s disappeared on us!\n" % (filename))
+ continue
+ except IOError:
+ sys.stderr.write("Package %s disappeared on us!\n" % (filename))
+ continue + continue
pkgsStampsFile = open(stamplist_filename, "w") pkgsStampsFile = open(stamplist_filename, "w")
for f in pkgsStamps.keys(): for f in pkgsStamps.keys():
@@ -148,6 +152,7 @@ @@ -148,6 +155,7 @@
names = packages.packages.keys() names = packages.packages.keys()
names.sort() names.sort()
for name in names: for name in names:
@@ -28,13 +38,17 @@ Index: opkg-utils/opkg-make-index
pkg = packages.packages[name] pkg = packages.packages[name]
if locales_dir and pkg.depends: if locales_dir and pkg.depends:
depends = string.split(pkg.depends, ',') depends = string.split(pkg.depends, ',')
@@ -165,6 +170,9 @@ @@ -165,6 +173,13 @@
if (verbose): if (verbose):
sys.stderr.write("Writing info for package %s\n" % (pkg.package,)) sys.stderr.write("Writing info for package %s\n" % (pkg.package,))
print pkg print pkg
+ except OSError: + except OSError:
+ sys.stderr.write("Package %s disappeared on us!\n" % (name)) + sys.stderr.write("Package %s disappeared on us!\n" % (name))
+ continue + continue
+ except IOError:
+ sys.stderr.write("Package %s disappeared on us!\n" % (name))
+ continue
+
if packages_filename: if packages_filename:
sys.stdout.close() sys.stdout.close()
sys.stdout = old_stdout sys.stdout = old_stdout
meta/packages/opkg-utils/opkg-utils_svn.bb
+1 -1
View File
@@ -4,7 +4,7 @@ PRIORITY = "optional"
LICENSE = "GPL" LICENSE = "GPL"
RDEPENDS = "python" RDEPENDS = "python"
RDEPENDS_virtclass-native = "" RDEPENDS_virtclass-native = ""
PR = "r5" PR = "r6"
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;patch=1" file://index-ignore-filenotfound.patch;patch=1"