From c05129498c4f3b1757ce0ee195d6ff1d3f71c5d5 Mon Sep 17 00:00:00 2001 From: Darren Hart Date: Wed, 30 May 2012 11:24:13 -0700 Subject: 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 --- meta-fri2/conf/machine/fri2-noemgd.conf | 2 +- meta-fri2/conf/machine/fri2.conf | 2 +- 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 31c890ad..92052927 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 MACHINE_FEATURES += "wifi 3g pcbios efi" MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5" -PREFERRED_PROVIDER_virtual/kernel = "linux-yocto" +PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" PREFERRED_VERSION_linux-yocto = "3.2%" XSERVER ?= "${XSERVER_IA32_BASE} \ diff --git a/meta-fri2/conf/machine/fri2.conf b/meta-fri2/conf/machine/fri2.conf index 4924ca23..547fe6af 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 MACHINE_FEATURES += "wifi 3g pcbios efi" MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5" -PREFERRED_PROVIDER_virtual/kernel = "linux-yocto" +PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" PREFERRED_VERSION_linux-yocto = "3.2%" XSERVER ?= "${XSERVER_IA32_BASE} \ -- cgit v1.2.3-54-g00ecf