diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2006-09-12 09:25:38 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2006-09-12 09:25:38 +0000 |
| commit | 30136a8e89b86b9e3d0fa4b07fafdf484ff8d4f2 (patch) | |
| tree | fda5c2385c803bfdf3e338b3368c7d14622e41c4 /conf/bitbake.conf | |
| parent | 431b0378e7c2a282c4dc5ba2bf641d644facc4dd (diff) | |
| parent | 1849c7146319438853e3b6c932003bde1a14b32f (diff) | |
merge of '14cc680dbaa6317eec602330d2fe0ac7dea3be7a'
and '350557edbea2aa55107ce4c0e4dffc849b7e2307'
Diffstat (limited to 'conf/bitbake.conf')
| -rw-r--r-- | conf/bitbake.conf | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 9f94bae3f5..2e3cb0f980 100644 --- a/conf/bitbake.conf +++ b/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: |