From bbbfb9e751d50810baf197f492489dce6ba834da Mon Sep 17 00:00:00 2001 From: Darren Hart Date: Mon, 17 Mar 2014 15:30:17 -0700 Subject: intel-core*: Set kernel provider with conditional assignment The PREFERRED_PROVIDER_virtual/kernel was assigned with = instead of ?=, preventing the user from overriding the setting with something like linux-yocto-rt. Use ?=. Signed-off-by: Darren Hart Reported-by: Teemu Keskinarkaus Cc: Tom Zanussi --- conf/machine/intel-core2-32.conf | 2 +- conf/machine/intel-corei7-64.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'conf') diff --git a/conf/machine/intel-core2-32.conf b/conf/machine/intel-core2-32.conf index c1023e7e..92c2ec6a 100644 --- a/conf/machine/intel-core2-32.conf +++ b/conf/machine/intel-core2-32.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for 32 bit Intel Core 2 CPU (and later) with MMX, SSE, SSE2, SSE3, and SSSE3 instruction set support. Supports a moderately wide range of drivers that should boot and be usable on "typical" hardware. -PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-dev" +PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto-dev" require conf/machine/include/meta-intel.inc require conf/machine/include/intel-core2-32-common.inc diff --git a/conf/machine/intel-corei7-64.conf b/conf/machine/intel-corei7-64.conf index 54bc1d1a..6f9e1f67 100644 --- a/conf/machine/intel-corei7-64.conf +++ b/conf/machine/intel-corei7-64.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for 64 bit Intel Core i7 CPU (and later) with MMX, SSE, SSE2, SSE3, and SSSE3 instruction set support. Supports a moderately wide range of drivers that should boot and be usable on "typical" hardware. -PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-dev" +PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto-dev" require conf/machine/include/meta-intel.inc require conf/machine/include/intel-corei7-64-common.inc -- cgit v1.2.3-54-g00ecf