From: Koen Kooi <koen@openembedded.org>
Date: Fri, 11 May 2007 12:36:42 +0000 (+0000)
Subject: bitbake.conf: set patch resolver to 'noop' to get the old abort-on-error back
X-Git-Tag: Release-2010-05/1~8868^2~557
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a4b83bf561b95b4e7472c714a58285f77cdc300;p=openembedded.git

bitbake.conf: set patch resolver to 'noop' to get the old abort-on-error back
---

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.