* [PATCH 1/5] classes/package_ipk.bbclass, classes/sourceipk.bbclass: Use opkg-utils-native instead of ipkg-utils-native
2011-01-24 20:18 [PATCH 0/5] Replace ipkg-utils with opkg-utils Khem Raj
@ 2011-01-24 20:18 ` Khem Raj
2011-01-24 20:18 ` [PATCH 2/5] opkg-utils_svn.bb: Sync with yocto Khem Raj
2011-01-24 20:18 ` [PATCH 3/5] recipes/meta recipes/tasks: Replace ipkg-utils with opkg-utils Khem Raj
2 siblings, 0 replies; 6+ messages in thread
From: Khem Raj @ 2011-01-24 20:18 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
classes/package_ipk.bbclass | 4 ++--
classes/sourceipk.bbclass | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass
index 97e5cd8..fea678d 100644
--- a/classes/package_ipk.bbclass
+++ b/classes/package_ipk.bbclass
@@ -70,7 +70,7 @@ do_package_update_index_ipk[lockfiles] = "${DEPLOY_DIR_IPK}.lock"
do_package_update_index_ipk[nostamp] = "1"
do_package_update_index_ipk[recrdeptask] += "do_package_write_ipk"
do_package_update_index_ipk[recrdeptask] += "do_package_write_ipk"
-do_package_update_index_ipk[depends] += "ipkg-utils-native:do_populate_sysroot"
+do_package_update_index_ipk[depends] += "opkg-utils-native:do_populate_sysroot"
#
# Update the Packages index files in ${DEPLOY_DIR_IPK}
@@ -315,7 +315,7 @@ python do_package_ipk () {
python () {
if bb.data.getVar('PACKAGES', d, True) != '':
deps = (bb.data.getVarFlag('do_package_write_ipk', 'depends', d) or "").split()
- deps.append('ipkg-utils-native:do_populate_sysroot')
+ deps.append('opkg-utils-native:do_populate_sysroot')
deps.append('fakeroot-native:do_populate_sysroot')
bb.data.setVarFlag('do_package_write_ipk', 'depends', " ".join(deps), d)
}
diff --git a/classes/sourceipk.bbclass b/classes/sourceipk.bbclass
index 17a7cdd..b443ef6 100644
--- a/classes/sourceipk.bbclass
+++ b/classes/sourceipk.bbclass
@@ -34,9 +34,9 @@
# Need to figure out how to use ipkg-build in this class.
# I tried adding it as a dependency for the do_create_srcipk
# task using:
-# do_create_srcipk[depends] += "ipkg-utils-native:do_populate_sysroot"
+# do_create_srcipk[depends] += "opkg-utils-native:do_populate_sysroot"
# But then there is a circular dependency between sourcipk.bbclass and
-# ipkg-utils-native. Until I can figure out how to resolve this
+# opkg-utils-native. Until I can figure out how to resolve this
# circular dependency I am extracting the needed pieces from ipkg-build
# into this class and building the source ipk myself.
--
1.7.0.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/5] opkg-utils_svn.bb: Sync with yocto
2011-01-24 20:18 [PATCH 0/5] Replace ipkg-utils with opkg-utils Khem Raj
2011-01-24 20:18 ` [PATCH 1/5] classes/package_ipk.bbclass, classes/sourceipk.bbclass: Use opkg-utils-native instead of ipkg-utils-native Khem Raj
@ 2011-01-24 20:18 ` Khem Raj
2011-01-24 20:18 ` [PATCH 3/5] recipes/meta recipes/tasks: Replace ipkg-utils with opkg-utils Khem Raj
2 siblings, 0 replies; 6+ messages in thread
From: Khem Raj @ 2011-01-24 20:18 UTC (permalink / raw)
To: openembedded-devel
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
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}"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/5] recipes/meta recipes/tasks: Replace ipkg-utils with opkg-utils
2011-01-24 20:18 [PATCH 0/5] Replace ipkg-utils with opkg-utils Khem Raj
2011-01-24 20:18 ` [PATCH 1/5] classes/package_ipk.bbclass, classes/sourceipk.bbclass: Use opkg-utils-native instead of ipkg-utils-native Khem Raj
2011-01-24 20:18 ` [PATCH 2/5] opkg-utils_svn.bb: Sync with yocto Khem Raj
@ 2011-01-24 20:18 ` Khem Raj
2011-01-24 21:45 ` Holger Freyther
2 siblings, 1 reply; 6+ messages in thread
From: Khem Raj @ 2011-01-24 20:18 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
recipes/meta/canadian-sdk.bb | 2 +-
recipes/meta/foonas-packages.bb | 2 +-
recipes/meta/meta-toolchain.bb | 2 +-
recipes/meta/openprotium-packages.bb | 2 +-
recipes/meta/oplinux-packages.bb | 2 +-
recipes/meta/package-index.bb | 2 +-
recipes/meta/slugos-packages.bb | 2 +-
recipes/tasks/task-sdk-sbox-gpe.bb | 2 +-
recipes/tasks/task-shr-feed.bb | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/recipes/meta/canadian-sdk.bb b/recipes/meta/canadian-sdk.bb
index 701a02d..93b80b2 100644
--- a/recipes/meta/canadian-sdk.bb
+++ b/recipes/meta/canadian-sdk.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Meta package for building a installable toolchain"
LICENSE = "MIT"
-DEPENDS = "opkg-native ipkg-utils-native fakeroot-native sed-native zip-native"
+DEPENDS = "opkg-native opkg-utils-native fakeroot-native sed-native zip-native"
PR = "r5"
# NOTE: We need to save and restore PACKAGE_ARCHS, because sdk.bbclass
diff --git a/recipes/meta/foonas-packages.bb b/recipes/meta/foonas-packages.bb
index 2bd8437..570c26e 100644
--- a/recipes/meta/foonas-packages.bb
+++ b/recipes/meta/foonas-packages.bb
@@ -74,7 +74,7 @@ FOONAS_PACKAGES = "\
gtk-doc \
gzip \
hdparm \
- ipkg-utils \
+ opkg-utils \
iptables \
ircp \
joe \
diff --git a/recipes/meta/meta-toolchain.bb b/recipes/meta/meta-toolchain.bb
index cb9e438..b8ea037 100644
--- a/recipes/meta/meta-toolchain.bb
+++ b/recipes/meta/meta-toolchain.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Meta package for building a installable toolchain"
LICENSE = "MIT"
-DEPENDS = "opkg-native ipkg-utils-native fakeroot-native sed-native"
+DEPENDS = "opkg-native opkg-utils-native fakeroot-native sed-native"
inherit meta
diff --git a/recipes/meta/openprotium-packages.bb b/recipes/meta/openprotium-packages.bb
index 4b10ee2..a738f08 100644
--- a/recipes/meta/openprotium-packages.bb
+++ b/recipes/meta/openprotium-packages.bb
@@ -106,7 +106,7 @@ OPENPROTIUM_PACKAGES = "\
gzip \
hdparm \
ifupdown \
- ipkg-utils \
+ opkg-utils \
iptables \
ircp \
joe \
diff --git a/recipes/meta/oplinux-packages.bb b/recipes/meta/oplinux-packages.bb
index d828eed..ab38c1d 100644
--- a/recipes/meta/oplinux-packages.bb
+++ b/recipes/meta/oplinux-packages.bb
@@ -201,7 +201,7 @@ PACKAGES_LIST = "\
hydra \
ifupdown \
iputils \
- ipkg-utils \
+ opkg-utils \
iptables \
intercom \
ircp \
diff --git a/recipes/meta/package-index.bb b/recipes/meta/package-index.bb
index 335970d..3ad1d10 100644
--- a/recipes/meta/package-index.bb
+++ b/recipes/meta/package-index.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Rebuild the package index"
LICENSE = "MIT"
-DEPENDS = "ipkg-utils-native"
+DEPENDS = "opkg-utils-native"
PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/recipes/meta/slugos-packages.bb b/recipes/meta/slugos-packages.bb
index fb8458a..3487c69 100644
--- a/recipes/meta/slugos-packages.bb
+++ b/recipes/meta/slugos-packages.bb
@@ -99,7 +99,7 @@ SLUGOS_PACKAGES = "\
ifupdown \
iozone3 \
iperf \
- ipkg-utils \
+ opkg-utils \
iptables \
joe \
jpeg \
diff --git a/recipes/tasks/task-sdk-sbox-gpe.bb b/recipes/tasks/task-sdk-sbox-gpe.bb
index 315bddb..b8d1cce 100644
--- a/recipes/tasks/task-sdk-sbox-gpe.bb
+++ b/recipes/tasks/task-sdk-sbox-gpe.bb
@@ -11,7 +11,7 @@ RDEPENDS_${PN} = "\
gdk-pixbuf-loader-xpm \
intltool \
intltool-dev \
- ipkg-utils \
+ opkg-utils \
gettext-dev \
pkgconfig-dev \
autoconf \
diff --git a/recipes/tasks/task-shr-feed.bb b/recipes/tasks/task-shr-feed.bb
index daec242..35e5f0b 100644
--- a/recipes/tasks/task-shr-feed.bb
+++ b/recipes/tasks/task-shr-feed.bb
@@ -79,7 +79,7 @@ RDEPENDS_${PN} += "\
mtpaint \
telepathy-python \
intone-video \
- ipkg-utils \
+ opkg-utils \
mysql \
fltk-chess \
remoko \
--
1.7.0.4
^ permalink raw reply related [flat|nested] 6+ messages in thread