[oe-commits] Christopher Larson : bitbake.conf: set PATCHRESOLVE to noop by default

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 7964936dd1fb202373e58048c19a91d4b27cdfd6
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=7964936dd1fb202373e58048c19a91d4b27cdfd6

Author: Christopher Larson <chris_larson at mentor.com>
Date:   Mon Aug 24 15:18:39 2015 -0700

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.

Signed-off-by: Christopher Larson <chris_larson at mentor.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/conf/bitbake.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 01f4cd0..aab4391 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.