Patchwork [2/5] opkg-utils_svn.bb: Sync with yocto

login
register
mail settings
Submitter Khem Raj
Date Jan. 24, 2011, 8:18 p.m.
Message ID <1295900293-25470-3-git-send-email-raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/351/
State Accepted
Headers show

Comments

Khem Raj - Jan. 24, 2011, 8:18 p.m.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../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

Patch

diff --git a/recipes/opkg-utils/opkg-utils/index-ignore-filenotfound.patch b/recipes/opkg-utils/opkg-utils/index-ignore-filenotfound.patch
new file mode 100644
index 0000000..e4a5481
--- /dev/null
+++ b/recipes/opkg-utils/opkg-utils/index-ignore-filenotfound.patch
@@ -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
diff --git a/recipes/opkg-utils/opkg-utils_svn.bb b/recipes/opkg-utils/opkg-utils_svn.bb
index 4634690..951580a 100644
--- a/recipes/opkg-utils/opkg-utils_svn.bb
+++ b/recipes/opkg-utils/opkg-utils_svn.bb
@@ -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}"