summaryrefslogtreecommitdiff
path: root/meta/conf
diff options
context:
space:
mode:
authorChristopher Larson <chris_larson@mentor.com>2015-08-24 15:18:39 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-30 12:34:17 +0100
commit4d8b993851d28909333d04166df592c8adc451aa (patch)
tree1e79f7f49a1ee03251b6d0ce0b203c6bb681e02f /meta/conf
parent8144069cd295fae67a7007a984e285c1a2a320e5 (diff)
downloadopenembedded-core-4d8b993851d28909333d04166df592c8adc451aa.tar.gz
openembedded-core-4d8b993851d28909333d04166df592c8adc451aa.tar.bz2
openembedded-core-4d8b993851d28909333d04166df592c8adc451aa.zip
bitbake.conf: set PATCHRESOLVE to noop by default
Automatically spawning a devshell, rather than doing so on demand, is questionable default behavior, and is potentially problematic in headless builds. Further, there are problems with the patch resolver today. Default to noop, and the user can always opt-in to use of the patch resolver by setting PATCHRESOLVE to user. (From OE-Core rev: 7964936dd1fb202373e58048c19a91d4b27cdfd6) Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-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.