diff options
| author | Darren Hart <dvhart@linux.intel.com> | 2012-05-30 11:24:13 -0700 |
|---|---|---|
| committer | Darren Hart <dvhart@linux.intel.com> | 2012-05-30 11:26:23 -0700 |
| commit | c05129498c4f3b1757ce0ee195d6ff1d3f71c5d5 (patch) | |
| tree | f49f410dc6c777b7986cde5491466d8ce9afb610 | |
| parent | 3f5fd3791acfdef7850ab7c0b270416e72d76cf3 (diff) | |
| download | meta-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.conf | 2 | ||||
| -rw-r--r-- | 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 | |||
| 10 | MACHINE_FEATURES += "wifi 3g pcbios efi" | 10 | MACHINE_FEATURES += "wifi 3g pcbios efi" |
| 11 | MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5" | 11 | MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5" |
| 12 | 12 | ||
| 13 | PREFERRED_PROVIDER_virtual/kernel = "linux-yocto" | 13 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" |
| 14 | PREFERRED_VERSION_linux-yocto = "3.2%" | 14 | PREFERRED_VERSION_linux-yocto = "3.2%" |
| 15 | 15 | ||
| 16 | XSERVER ?= "${XSERVER_IA32_BASE} \ | 16 | 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 | |||
| 10 | MACHINE_FEATURES += "wifi 3g pcbios efi" | 10 | MACHINE_FEATURES += "wifi 3g pcbios efi" |
| 11 | MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5" | 11 | MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5" |
| 12 | 12 | ||
| 13 | PREFERRED_PROVIDER_virtual/kernel = "linux-yocto" | 13 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" |
| 14 | PREFERRED_VERSION_linux-yocto = "3.2%" | 14 | PREFERRED_VERSION_linux-yocto = "3.2%" |
| 15 | 15 | ||
| 16 | XSERVER ?= "${XSERVER_IA32_BASE} \ | 16 | XSERVER ?= "${XSERVER_IA32_BASE} \ |