summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2007-05-11 12:36:42 +0000
committerKoen Kooi <koen@openembedded.org>2007-05-11 12:36:42 +0000
commit7a4b83bf561b95b4e7472c714a58285f77cdc300 (patch)
tree0380cd63edda870c444dafd5b016b98c7e101d4a /conf
parenta22f97e5c43501ceed138b3187c94db5760a3f96 (diff)
bitbake.conf: set patch resolver to 'noop' to get the old abort-on-error back
Diffstat (limited to 'conf')
-rw-r--r--conf/bitbake.conf2
1 files changed, 1 insertions, 1 deletions
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.