Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/18 00:19:55-05:00 handhelds.org!kergoth
Disable use of parallel make for uclibc.

2005/01/17 23:57:02-05:00 handhelds.org!kergoth
Fix a major bug in the new base_do_patch.. it wasn't chdir()ing into the correct dir before calling the PATCHCMD.

2005/01/17 23:48:20-05:00 handhelds.org!kergoth
Remove python-native from the ipkg-utils-native deps, because having it there is just silly.

BKrev: 41eca139NmEzWeP48TMCg6TqCdQpAg

diff --git a/classes/base.bbclass b/classes/base.bbclass
index 886f256..f4ee9d9 100644 (file)
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -454,7 +454,9 @@ python base_do_patch() {
                else:
                        pname = unpacked
 
-               os.chdir(workdir)
+               patchdir = bb.data.getVar('S', d, 1)
+               os.chdir(patchdir)
+
                bb.note("Applying patch '%s'" % pname)
                bb.data.setVar("do_patchcmd", bb.data.getVar("PATCHCMD", d, 1) % (pnum, pname, unpacked), d)
                bb.data.setVarFlag("do_patchcmd", "func", 1, d)

diff --git a/packages/ipkg-utils/ipkg-utils-native_1.6cvs.bb b/packages/ipkg-utils/ipkg-utils-native_1.6cvs.bb
index e69de29..a4bd93c 100644 (file)
--- a/packages/ipkg-utils/ipkg-utils-native_1.6cvs.bb
+++ b/packages/ipkg-utils/ipkg-utils-native_1.6cvs.bb
@@ -0,0 +1,11 @@
+SECTION = "base"
+include ipkg-utils_${PV}.bb
+PR = "r3"
+inherit native
+DEPENDS = ""
+
+do_stage() {
+        for i in ${INSTALL}; do
+                install -m 0755 $i ${STAGING_BINDIR}
+        done
+}

diff --git a/packages/uclibc/uclibc_0.9.26.bb b/packages/uclibc/uclibc_0.9.26.bb
index 946690a..64efb96 100644 (file)
--- a/packages/uclibc/uclibc_0.9.26.bb
+++ b/packages/uclibc/uclibc_0.9.26.bb
@@ -26,6 +26,7 @@ PROVIDES += "${@['virtual/libiconv', ''][bb.data.getVar('USE_NLS', d, 1) == 'no'
 DEPENDS = "virtual/${TARGET_PREFIX}binutils \
           virtual/${TARGET_PREFIX}gcc-initial linux-libc-headers"
 INHIBIT_DEFAULT_DEPS = "1"
+PARALLEL_MAKE = ""
 
 PACKAGES = "uclibc ldd uclibc-utils uclibc-gconv uclibc-dev uclibc-doc uclibc-thread-db"
 

diff --git a/packages/uclibc/uclibc_cvs.bb b/packages/uclibc/uclibc_cvs.bb
index 27e306c..b4100b9 100644 (file)
--- a/packages/uclibc/uclibc_cvs.bb
+++ b/packages/uclibc/uclibc_cvs.bb
@@ -28,6 +28,7 @@ PROVIDES += "${@['virtual/libiconv', ''][bb.data.getVar('USE_NLS', d, 1) == 'no'
 DEPENDS = "virtual/${TARGET_PREFIX}binutils \
           virtual/${TARGET_PREFIX}gcc-initial linux-libc-headers"
 INHIBIT_DEFAULT_DEPS = "1"
+PARALLEL_MAKE = ""
 
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-cvs', '${FILE_DIRNAME}/uclibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"