summaryrefslogtreecommitdiffstats
path: root/meta-yocto-bsp/conf/machine
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2017-03-14 21:08:58 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-22 11:35:23 +0000
commit00abe678bf115843b4ab45eb878e43a0fe2a20fc (patch)
tree16e7cbbbbd52ee7fb03323ca6d90f94016d19302 /meta-yocto-bsp/conf/machine
parent70f18264cec44914f6f790890281939ddbcea3b1 (diff)
downloadpoky-00abe678bf115843b4ab45eb878e43a0fe2a20fc.tar.gz
genericx86-common: Update .inc file's PREFERRED_VERSION
Since the genericx86*.conf file directly set PREFERRED_VERSION remove it from here to avoid confusion. (From meta-yocto rev: 2383d50b084cafdf04f7bd15ea732cd98982625b) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-yocto-bsp/conf/machine')
-rw-r--r--meta-yocto-bsp/conf/machine/include/genericx86-common.inc1
1 files changed, 0 insertions, 1 deletions
diff --git a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc
index cec7970852..e35685cb22 100644
--- a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc
+++ b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc
@@ -3,7 +3,6 @@ require conf/machine/include/qemuboot-x86.inc
3MACHINE_FEATURES += "wifi efi pcbios" 3MACHINE_FEATURES += "wifi efi pcbios"
4 4
5PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" 5PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
6PREFERRED_VERSION_linux-yocto ?= "4.8%"
7PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" 6PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
8XSERVER ?= "${XSERVER_X86_BASE} \ 7XSERVER ?= "${XSERVER_X86_BASE} \
9 ${XSERVER_X86_EXT} \ 8 ${XSERVER_X86_EXT} \