diff options
| author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-01-18 01:52:40 +0000 |
|---|---|---|
| committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-01-18 01:52:40 +0000 |
| commit | 0f235b0f42575bfb50dd891cf44aa08c2e404a67 (patch) | |
| tree | 280012a23de1185e7b135d5a033c60afed8589d3 /conf | |
| parent | 2650645237555cc24c532a4c9ccd81d8c01bcaf7 (diff) | |
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/01/17 19:52:39-06:00 ti.com!kergoth
Kill off the dyn-ldconfig patch for uclibc cvs, as the patch was accepted upstream.
2005/01/17 19:48:04-06:00 ti.com!kergoth
Update the patcher-native build to set PATCHCMD, in case we want to actually apply patches to it at some point.
2005/01/17 19:45:23-06:00 ti.com!kergoth
Add quilt-native and use quilt instead of patcher by default.
BKrev: 41ec6be8oJA-Iu3VSh3tCDGFhr_Xkw
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/bitbake.conf | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 86abdc1991..b15d744a96 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -304,9 +304,12 @@ SRC_URI = "file://${FILE}" MKTEMPDIRCMD = "mktemp -d -q ${TMPBASE}" MKTEMPCMD = "mktemp -q ${TMPBASE}" -PATCHCLEANCMD = "patcher -B" -PATCHCMD = "patcher -R -p '%s' -n '%s' -i '%s'" -PATCH_DEPENDS = "patcher-native" +# PATCHCLEANCMD = "patcher -B" +# PATCHCMD = "patcher -R -p '%s' -n '%s' -i '%s'" +# PATCH_DEPENDS = "patcher-native" +PATCHCLEANCMD = 'if [ -n "`quilt applied`" ]; then quilt pop -a -R -f || exit 1; fi' +PATCHCMD = "quilt upgrade; chmod 644 patches/* || true; quilt import -f -p '%s' -n '%s' '%s'; quilt push" +PATCH_DEPENDS = "quilt-native" ################################################################## # Not sure about the rest of this yet. |