From 7a4b83bf561b95b4e7472c714a58285f77cdc300 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Fri, 11 May 2007 12:36:42 +0000
Subject: bitbake.conf: set patch resolver to 'noop' to get the old
 abort-on-error back

---
 conf/bitbake.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index c754dab273..cdca2b6383 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -264,7 +264,7 @@ EXTRA_OEMAKE = "-e MAKEFLAGS="
 # Patch handling.
 ##################################################################
 PATCHTOOL = 'quilt'
-PATCHRESOLVE = 'user'
+PATCHRESOLVE = 'noop'
 
 ##################################################################
 # Build flags and options.
-- 
cgit v1.2.3