diff options
| author | Chris Larson <clarson@kergoth.com> | 2006-08-28 20:30:14 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2006-08-28 20:30:14 +0000 |
| commit | d3c0ca658f75bf8f2aa96c51126712eb8d45c875 (patch) | |
| tree | 71f0dc44890c6004b9592936984495039d57454b /conf | |
| parent | 395ef28947528cc4cd955ae4480c2b6b5561c892 (diff) | |
Merge from poky:
Rework the way patches are handled. There are now two abstract base classes,
initialized in patch.bbclass. One for patchset operations on a directory, and
another for patch failure resolution. Currently includes 'patch' and 'quilt'
concrete PatchSet classes, and a 'user' resolver class, which simply drops you
into a shell in the source tree to fix the rejects.
Diffstat (limited to '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: |