summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/packages/opkg-utils/opkg-utils-native_svn.bb9
-rw-r--r--meta/packages/opkg-utils/opkg-utils/index-ignore-filenotfound.patch29
-rw-r--r--meta/packages/opkg-utils/opkg-utils_svn.bb13
3 files changed, 38 insertions, 13 deletions
diff --git a/meta/packages/opkg-utils/opkg-utils-native_svn.bb b/meta/packages/opkg-utils/opkg-utils-native_svn.bb
deleted file mode 100644
index b12b5456bf..0000000000
--- a/meta/packages/opkg-utils/opkg-utils-native_svn.bb
+++ /dev/null
@@ -1,9 +0,0 @@
1require opkg-utils_svn.bb
2
3RDEPENDS = ""
4
5inherit native
6
7# Avoid circular dependencies from package_ipk.bbclass
8PACKAGES = ""
9
diff --git a/meta/packages/opkg-utils/opkg-utils/index-ignore-filenotfound.patch b/meta/packages/opkg-utils/opkg-utils/index-ignore-filenotfound.patch
new file mode 100644
index 0000000000..3eb2c9349a
--- /dev/null
+++ b/meta/packages/opkg-utils/opkg-utils/index-ignore-filenotfound.patch
@@ -0,0 +1,29 @@
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
8Index: opkg-utils/opkg-make-index
9===================================================================
10--- opkg-utils.orig/opkg-make-index 2009-08-26 17:21:26.000000000 +0100
11+++ opkg-utils/opkg-make-index 2009-08-26 17:24:05.000000000 +0100
12@@ -96,6 +96,7 @@
13 files=glob(pkg_dir + '/*.ipk') + glob(pkg_dir + '/*.deb')
14 files.sort()
15 for filename in files:
16+ try:
17 basename = os.path.basename(filename)
18 pkg = None
19 fnameStat = os.stat(filename)
20@@ -130,6 +131,9 @@
21 to_morgue(basename)
22 if opt_s:
23 print filename
24+ except OSError:
25+ sys.stderr.write("Package %s disappeared on us!\n" % (filename,))
26+ continue
27
28 pkgsStampsFile = open(stamplist_filename, "w")
29 for f in pkgsStamps.keys():
diff --git a/meta/packages/opkg-utils/opkg-utils_svn.bb b/meta/packages/opkg-utils/opkg-utils_svn.bb
index c896300642..53b208db14 100644
--- a/meta/packages/opkg-utils/opkg-utils_svn.bb
+++ b/meta/packages/opkg-utils/opkg-utils_svn.bb
@@ -3,12 +3,17 @@ SECTION = "base"
3PRIORITY = "optional" 3PRIORITY = "optional"
4LICENSE = "GPL" 4LICENSE = "GPL"
5RDEPENDS = "python" 5RDEPENDS = "python"
6PR = "r2" 6RDEPENDS_virtclass-native = ""
7PR = "r4"
7 8
8SRC_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 \
9 10 file://index-ignore-filenotfound.patch;patch=1"
10S = "${WORKDIR}/opkg-utils"
11 11
12inherit autotools_stage 12inherit autotools_stage
13 13
14S = "${WORKDIR}/opkg-utils" 14S = "${WORKDIR}/opkg-utils"
15
16# Avoid circular dependencies from package_ipk.bbclass
17PACKAGES_virtclass-native = ""
18
19BBCLASSEXTEND = "native"