summaryrefslogtreecommitdiffstats
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:35:57 +0100
commit641b2e2b1a51b975bcd63ca8e0274664a35fd2be (patch)
treea60eff5d063fd3280d0d60831863d497ae19ee40
parent51f95dfe393fc907210db798c9bce732ce868353 (diff)
downloadpoky-641b2e2b1a51b975bcd63ca8e0274664a35fd2be.tar.gz
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) (From OE-Core rev: 4d8b993851d28909333d04166df592c8adc451aa) Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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"
483################################################################## 483##################################################################
484# Patch handling. 484# Patch handling.
485################################################################## 485##################################################################
486PATCHTOOL = 'quilt' 486PATCHTOOL = "quilt"
487PATCHRESOLVE = 'user' 487PATCHRESOLVE = "noop"
488 488
489################################################################## 489##################################################################
490# Build flags and options. 490# Build flags and options.