[meta-intel] [PATCH 1/2] Revert "machine: move PREFERRED_VERSION/PREFERRED_PROVIDER to meta-intel.inc"

[California Sullivan]

This reverts commit aaab29ad036b13a0959925329b2b8e471869ca53.

This commit interfered with how some others used meta-intel.

Signed-off-by: California Sullivan <california.l.sullivan at intel.com>
---
 conf/machine/include/meta-intel.inc | 3 ---
 conf/machine/intel-core2-32.conf    | 3 +++
 conf/machine/intel-corei7-64.conf   | 3 +++
 conf/machine/intel-quark.conf       | 3 +++
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/conf/machine/include/meta-intel.inc b/conf/machine/include/meta-intel.inc
index dbc97f4..8818027 100644
--- a/conf/machine/include/meta-intel.inc
+++ b/conf/machine/include/meta-intel.inc
@@ -8,9 +8,6 @@
 # XSERVER subcomponents, used to build the XSERVER variable
 #
 
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-PREFERRED_VERSION_linux-yocto ?= "4.4%"
-
 # for Xserver older than 1.13.0
 OLD_XSERVER_X86_EXT = "xserver-xorg-extension-dri \
            xserver-xorg-extension-dri2 \
diff --git a/conf/machine/intel-core2-32.conf b/conf/machine/intel-core2-32.conf
index 5f8ee24..f8707fd 100644
--- a/conf/machine/intel-core2-32.conf
+++ b/conf/machine/intel-core2-32.conf
@@ -7,6 +7,9 @@ require conf/machine/include/meta-intel.inc
 require conf/machine/include/intel-core2-32-common.inc
 require conf/machine/include/intel-common-pkgarch.inc
 
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
+PREFERRED_VERSION_linux-yocto ?= "4.4%"
+
 MACHINE_FEATURES += "pcbios efi"
 MACHINE_FEATURES += "va-impl-intel"
 MACHINE_FEATURES += "wifi 3g nfc"
diff --git a/conf/machine/intel-corei7-64.conf b/conf/machine/intel-corei7-64.conf
index 30d492f..f4d043c 100644
--- a/conf/machine/intel-corei7-64.conf
+++ b/conf/machine/intel-corei7-64.conf
@@ -7,6 +7,9 @@ require conf/machine/include/meta-intel.inc
 require conf/machine/include/intel-corei7-64-common.inc
 require conf/machine/include/intel-common-pkgarch.inc
 
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
+PREFERRED_VERSION_linux-yocto ?= "4.4%"
+
 MACHINE_FEATURES += "pcbios efi"
 MACHINE_FEATURES += "va-impl-intel"
 MACHINE_FEATURES += "wifi 3g nfc"
diff --git a/conf/machine/intel-quark.conf b/conf/machine/intel-quark.conf
index ad67319..65f0966 100644
--- a/conf/machine/intel-quark.conf
+++ b/conf/machine/intel-quark.conf
@@ -7,6 +7,9 @@ require conf/machine/include/meta-intel.inc
 require conf/machine/include/intel-quark-common.inc
 require conf/machine/include/intel-common-pkgarch.inc
 
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
+PREFERRED_VERSION_linux-yocto ?= "4.4%"
+
 #Avoid pulling in GRUB
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS = ""
 
-- 
2.5.5