Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/20 12:14:36+01:00 mn-solutions.de!schurig
allow 'inherit patcher'

BKrev: 41ef98a0btxbim4o5f-dYY_QgbkR2Q

diff --git a/classes/patcher.bbclass b/classes/patcher.bbclass
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index b15d744..8bd4719 100644 (file)
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -304,9 +304,8 @@ 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"
+# 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 = "quilt upgrade; chmod 644 patches/* || true; quilt import -f -p '%s' -n '%s' '%s'; quilt push"
 PATCH_DEPENDS = "quilt-native"