From ecb32bdee770c3ff6c73ac2a57e612872b13910f Mon Sep 17 00:00:00 2001
From: Chris Larson <kergoth@openedhand.com>
Date: Mon, 28 Aug 2006 20:36:36 +0000
Subject: 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
---
 meta/conf/bitbake.conf | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'meta/conf')

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 9f94bae3f..2e3cb0f98 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -238,6 +238,12 @@ export BUILD_STRIP = "${BUILD_PREFIX}strip"
 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:
-- 
cgit v1.2.3