summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Hart <dvhart@linux.intel.com>2012-05-30 18:24:13 (GMT)
committerDarren Hart <dvhart@linux.intel.com>2012-05-30 18:26:23 (GMT)
commitc05129498c4f3b1757ce0ee195d6ff1d3f71c5d5 (patch)
treef49f410dc6c777b7986cde5491466d8ce9afb610
parent3f5fd3791acfdef7850ab7c0b270416e72d76cf3 (diff)
downloadmeta-intel-c05129498c4f3b1757ce0ee195d6ff1d3f71c5d5.tar.gz
fri2: Conditionally assign virtual/kernel=linux-yocto
Allow overriding of the PREFERRED_PROVIDER_virtual/kernel by using the ?= operator rather than the = operator. Signed-off-by: Darren Hart <dvhart@linux.intel.com>
-rw-r--r--meta-fri2/conf/machine/fri2-noemgd.conf2
-rw-r--r--meta-fri2/conf/machine/fri2.conf2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta-fri2/conf/machine/fri2-noemgd.conf b/meta-fri2/conf/machine/fri2-noemgd.conf
index 31c890a..9205292 100644
--- a/meta-fri2/conf/machine/fri2-noemgd.conf
+++ b/meta-fri2/conf/machine/fri2-noemgd.conf
@@ -10,7 +10,7 @@ require conf/machine/include/ia32-base.inc
10MACHINE_FEATURES += "wifi 3g pcbios efi" 10MACHINE_FEATURES += "wifi 3g pcbios efi"
11MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5" 11MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5"
12 12
13PREFERRED_PROVIDER_virtual/kernel = "linux-yocto" 13PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
14PREFERRED_VERSION_linux-yocto = "3.2%" 14PREFERRED_VERSION_linux-yocto = "3.2%"
15 15
16XSERVER ?= "${XSERVER_IA32_BASE} \ 16XSERVER ?= "${XSERVER_IA32_BASE} \
diff --git a/meta-fri2/conf/machine/fri2.conf b/meta-fri2/conf/machine/fri2.conf
index 4924ca2..547fe6a 100644
--- a/meta-fri2/conf/machine/fri2.conf
+++ b/meta-fri2/conf/machine/fri2.conf
@@ -10,7 +10,7 @@ require conf/machine/include/ia32-base.inc
10MACHINE_FEATURES += "wifi 3g pcbios efi" 10MACHINE_FEATURES += "wifi 3g pcbios efi"
11MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5" 11MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5"
12 12
13PREFERRED_PROVIDER_virtual/kernel = "linux-yocto" 13PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
14PREFERRED_VERSION_linux-yocto = "3.2%" 14PREFERRED_VERSION_linux-yocto = "3.2%"
15 15
16XSERVER ?= "${XSERVER_IA32_BASE} \ 16XSERVER ?= "${XSERVER_IA32_BASE} \