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 c754dab..cdca2b6 100644 (file)
--- 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.