]> git.openpandora.org Git - openembedded.git/commitdiff
Merge bk://oe-devel.bkbits.net/openembedded
authornslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>
Tue, 18 Jan 2005 05:40:09 +0000 (05:40 +0000)
committernslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>
Tue, 18 Jan 2005 05:40:09 +0000 (05:40 +0000)
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

classes/base.bbclass
packages/ipkg-utils/ipkg-utils-native_1.6cvs.bb
packages/uclibc/uclibc_0.9.26.bb
packages/uclibc/uclibc_cvs.bb

index 886f25664b08760d7840227b3794e9d4bb514e8d..f4ee9d90d709e7743b0b96c9661ae6176fd7b154 100644 (file)
@@ -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)
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a4bd93c319fc3b9c9b86471727c40a984eb665fc 100644 (file)
@@ -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
+}
index 946690a2bb778701ac9dbf80cf9d3bf219e2a55a..64efb969b3dd430d81a570dcd780a8aa6be40b11 100644 (file)
@@ -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"
 
index 27e306c29e8f5dee08fa72b3b09ee73fec6779cb..b4100b949ddaa585625ccdbe4129a8bb7c67e17e 100644 (file)
@@ -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)}"