diff options
| author |   Chris Larson <kergoth@openedhand.com> | 2006-08-28 20:36:36 +0000 |
|---|---|---|
| committer | Chris Larson <kergoth@openedhand.com> | 2006-08-28 20:36:36 +0000 |
| commit | ecb32bdee770c3ff6c73ac2a57e612872b13910f (patch) | |
| tree | a97c3bb8b6fa3402c90510dab06f0f712667303e /meta/conf/bitbake.conf | |
| parent | 01056cdbea9ebe38b589f74120f5fab39452bbf0 (diff) | |
| download | openembedded-core-contrib-ecb32bdee770c3ff6c73ac2a57e612872b13910f.tar.gz | |
Patch failure handling updates, added a 'patch' concrete class, so we can apply patches to quilt-native itself.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@670 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/conf/bitbake.conf')
| -rw-r--r-- | meta/conf/bitbake.conf | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 9f94bae3f5..2e3cb0f980 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -239,6 +239,12 @@ export MAKE = "make" EXTRA_OEMAKE = "-e MAKEFLAGS=" ################################################################## +# Patch handling. +################################################################## +PATCHTOOL = 'quilt' +PATCHRESOLVE = 'user' + +################################################################## # Build flags and options. ################################################################## @@ -336,12 +342,6 @@ SRC_URI = "file://${FILE}" MKTEMPDIRCMD = "mktemp -d -q ${TMPBASE}" MKTEMPCMD = "mktemp -q ${TMPBASE}" -# Program to be used to patch sources, use 'inherit patcher' to overwrite this: - -PATCHCLEANCMD = 'if [ -n "`quilt applied`" ]; then quilt pop -a -R -f || exit 1; fi' -PATCHCMD = "pnum='%s'; name='%s'; patch='%s'; mkdir -p patches ; quilt upgrade >/dev/null 2>&1; quilt import -f -p $pnum -P $name $patch; chmod u+w patches/$name; quilt push" -PATCH_DEPENDS = "quilt-native" - # GNU patch tries to be intellgent about checking out read-only files from # a RCS, which freaks out those special folks with active Perforce clients # the following makes patch ignore RCS: |