summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/packages/opkg-utils/opkg-utils/index-ignore-filenotfound.patch22
-rw-r--r--meta/packages/opkg-utils/opkg-utils_svn.bb2
2 files changed, 19 insertions, 5 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
index bafc2f6a1c..e4a548156f 100644
--- a/meta/packages/opkg-utils/opkg-utils/index-ignore-filenotfound.patch
+++ b/meta/packages/opkg-utils/opkg-utils/index-ignore-filenotfound.patch
@@ -1,7 +1,14 @@
1If we're building an image and some package rebuilds while this is happening
2some package can be removed/added to the ipk deploy directory. The image will
3not depend on this package so we can safely ignore these cases rather than
4error out.
5
6RP - 26/8/09
7
1Index: opkg-utils/opkg-make-index 8Index: opkg-utils/opkg-make-index
2=================================================================== 9===================================================================
3--- opkg-utils.orig/opkg-make-index 2009-08-26 17:21:26.000000000 +0100 10--- opkg-utils.orig/opkg-make-index 2009-08-26 17:21:26.000000000 +0100
4+++ opkg-utils/opkg-make-index 2009-08-26 20:49:52.000000000 +0100 11+++ opkg-utils/opkg-make-index 2009-08-27 16:11:22.000000000 +0100
5@@ -96,6 +96,7 @@ 12@@ -96,6 +96,7 @@
6 files=glob(pkg_dir + '/*.ipk') + glob(pkg_dir + '/*.deb') 13 files=glob(pkg_dir + '/*.ipk') + glob(pkg_dir + '/*.deb')
7 files.sort() 14 files.sort()
@@ -10,17 +17,20 @@ Index: opkg-utils/opkg-make-index
10 basename = os.path.basename(filename) 17 basename = os.path.basename(filename)
11 pkg = None 18 pkg = None
12 fnameStat = os.stat(filename) 19 fnameStat = os.stat(filename)
13@@ -130,6 +131,9 @@ 20@@ -130,6 +131,12 @@
14 to_morgue(basename) 21 to_morgue(basename)
15 if opt_s: 22 if opt_s:
16 print filename 23 print filename
17+ except OSError: 24+ except OSError:
18+ sys.stderr.write("Package %s disappeared on us!\n" % (filename)) 25+ sys.stderr.write("Package %s disappeared on us!\n" % (filename))
19+ continue 26+ continue
27+ except IOError:
28+ sys.stderr.write("Package %s disappeared on us!\n" % (filename))
29+ continue
20 30
21 pkgsStampsFile = open(stamplist_filename, "w") 31 pkgsStampsFile = open(stamplist_filename, "w")
22 for f in pkgsStamps.keys(): 32 for f in pkgsStamps.keys():
23@@ -148,6 +152,7 @@ 33@@ -148,6 +155,7 @@
24 names = packages.packages.keys() 34 names = packages.packages.keys()
25 names.sort() 35 names.sort()
26 for name in names: 36 for name in names:
@@ -28,13 +38,17 @@ Index: opkg-utils/opkg-make-index
28 pkg = packages.packages[name] 38 pkg = packages.packages[name]
29 if locales_dir and pkg.depends: 39 if locales_dir and pkg.depends:
30 depends = string.split(pkg.depends, ',') 40 depends = string.split(pkg.depends, ',')
31@@ -165,6 +170,9 @@ 41@@ -165,6 +173,13 @@
32 if (verbose): 42 if (verbose):
33 sys.stderr.write("Writing info for package %s\n" % (pkg.package,)) 43 sys.stderr.write("Writing info for package %s\n" % (pkg.package,))
34 print pkg 44 print pkg
35+ except OSError: 45+ except OSError:
36+ sys.stderr.write("Package %s disappeared on us!\n" % (name)) 46+ sys.stderr.write("Package %s disappeared on us!\n" % (name))
37+ continue 47+ continue
48+ except IOError:
49+ sys.stderr.write("Package %s disappeared on us!\n" % (name))
50+ continue
51+
38 if packages_filename: 52 if packages_filename:
39 sys.stdout.close() 53 sys.stdout.close()
40 sys.stdout = old_stdout 54 sys.stdout = old_stdout
diff --git a/meta/packages/opkg-utils/opkg-utils_svn.bb b/meta/packages/opkg-utils/opkg-utils_svn.bb
index a141505710..b06ea6a68e 100644
--- a/meta/packages/opkg-utils/opkg-utils_svn.bb
+++ b/meta/packages/opkg-utils/opkg-utils_svn.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
4LICENSE = "GPL" 4LICENSE = "GPL"
5RDEPENDS = "python" 5RDEPENDS = "python"
6RDEPENDS_virtclass-native = "" 6RDEPENDS_virtclass-native = ""
7PR = "r5" 7PR = "r6"
8 8
9SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=opkg-utils;proto=http \ 9SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=opkg-utils;proto=http \
10 file://index-ignore-filenotfound.patch;patch=1" 10 file://index-ignore-filenotfound.patch;patch=1"