diff options
| author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-01-18 05:40:09 +0000 |
|---|---|---|
| committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-01-18 05:40:09 +0000 |
| commit | fbb14d6d3f6b35b66f39efed78d7836ea7110b28 (patch) | |
| tree | 592ee5068baf2158f7736879c9f1ebccd8433610 | |
| parent | a35990fa45364f8fca196741fa0b1e6728254459 (diff) | |
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
| -rw-r--r-- | classes/base.bbclass | 4 | ||||
| -rw-r--r-- | packages/ipkg-utils/ipkg-utils-native_1.6cvs.bb | 11 | ||||
| -rw-r--r-- | packages/uclibc/uclibc_0.9.26.bb | 1 | ||||
| -rw-r--r-- | packages/uclibc/uclibc_cvs.bb | 1 |
4 files changed, 16 insertions, 1 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index 886f25664b..f4ee9d90d7 100644 --- 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 e69de29bb2..a4bd93c319 100644 --- 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 946690a2bb..64efb969b3 100644 --- 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 27e306c29e..b4100b949d 100644 --- 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)}" |