summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--meta/conf/bitbake.conf4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 01f4cd0746..aab43912df 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -483,8 +483,8 @@ export LC_ALL = "C"
##################################################################
# Patch handling.
##################################################################
-PATCHTOOL = 'quilt'
-PATCHRESOLVE = 'user'
+PATCHTOOL = "quilt"
+PATCHRESOLVE = "noop"
##################################################################
# Build flags and options.