remove qemu kernel version overrides and superfluous version settings

Hi,

This removes the extra settings for the default kernel version so that you can specify PREFERRED_VERSION_linux-yocto="X%" in your local.conf and it will work for all the default MACHINES poky suports: qemu and hw boards both.

Without this patch, the hardware boards would have used version X but the qemu machines would have used the default since they had machine specific overrides in the poky distro conf.

-brian

The following changes since commit b38e8165330f76b422f4ad15aabcf93dd9458360:

bison: reduce local pending patches (2017-07-21 11:12:44 +0100)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib bavery/mv_linux-yocto_into_machineconf
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=bavery/mv_linux-yocto_into_machineconf

brian avery (2):
meta-yocto-bsp: Remove superfluous kernel set
poky: Remove machine specific kernel overrides

 meta-poky/conf/distro/poky.conf                | 10 ++--------
 meta-yocto-bsp/conf/machine/genericx86-64.conf |  2 --
 meta-yocto-bsp/conf/machine/genericx86.conf    |  2 --
 3 files changed, 2 insertions(+), 12 deletions(-)

--
1.9.1

The genericx86 and genericx86-64 machine confs do not need to set the PREFERRED_PROVIDER_virtual/kernel as they will use the one set by the distribution. If there needed to be a different version for one of these machines in the future, we could add it in to the machine.conf.

---
 meta-yocto-bsp/conf/machine/genericx86-64.conf | 2 --
 meta-yocto-bsp/conf/machine/genericx86.conf    | 2 --
 2 files changed, 4 deletions(-)

index bfedd84..12f7c0d 100644
@@ -7,6 +7,4 @@ DEFAULTTUNE ?= "core2-64"
 require conf/machine/include/tune-core2.inc
 require conf/machine/include/genericx86-common.inc
 
-PREFERRED_VERSION_linux-yocto ?= "4.10%"
-
 SERIAL_CONSOLES_CHECK = "ttyS0"

index af03b86..798b62ec 100644
@@ -8,5 +8,3 @@ require conf/machine/include/tune-core2.inc
 require conf/machine/include/genericx86-common.inc
 
 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "gma500-gfx-check"
-
-PREFERRED_VERSION_linux-yocto ?= "4.10%"

1.9.1

This patch removes the machine specific overrides in poky.conf for all the qemu machines. With this patch, if you set PREFERRED_VERSION_linux-yocto="X%" then all the qemu machines as well as the sample hardware boards will use that version. Without this patch, the hardware boards would have used version X but the qemu machines would have needed to have a PREFERRED_VERSION_linux-yocto_qemuarm="X%" for qemuarm to use that version, for example. If we need to force a specific machine (hardware or qemu) to a particular default version we should add it to the machine conf files for that machine, not in the distro conf.

---
 meta-poky/conf/distro/poky.conf | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

index c907969..d15e50e 100644
@@ -22,12 +22,6 @@ POKY_DEFAULT_EXTRA_RRECOMMENDS = "kernel-module-af-packet"
 DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${DISTRO_FEATURES_LIBC} ${POKY_DEFAULT_DISTRO_FEATURES}"
 
 PREFERRED_VERSION_linux-yocto ?= "4.10%"
-PREFERRED_VERSION_linux-yocto_qemux86 ?= "4.10%"
-PREFERRED_VERSION_linux-yocto_qemux86-64 ?= "4.10%"
-PREFERRED_VERSION_linux-yocto_qemuarm ?= "4.10%"
-PREFERRED_VERSION_linux-yocto_qemumips ?= "4.10%"
-PREFERRED_VERSION_linux-yocto_qemumips64 ?= "4.10%"
-PREFERRED_VERSION_linux-yocto_qemuppc ?= "4.10%"
 
 SDK_NAME = "${DISTRO}-${TCLIBC}-${SDK_ARCH}-${IMAGE_BASENAME}-${TUNE_PKGARCH}"
 SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}"

@@ -84,9 +78,9 @@ SANITY_TESTED_DISTROS ?= " \
             opensuse-42.2 \n \
             "
 #
-# OELAYOUT_ABI allows us to notify users when the format of TMPDIR changes in 
+# OELAYOUT_ABI allows us to notify users when the format of TMPDIR changes in
 # an incompatible way. Such changes should usually be detailed in the commit
-# that breaks the format and have been previously discussed on the mailing list 
+# that breaks the format and have been previously discussed on the mailing list
 # with general agreement from the core team.
 #
 OELAYOUT_ABI = "12"

1.9.1

== Series Details ==

Series: remove qemu kernel version overrides and superfluous version settings
Revision: 1
URL : https://patchwork.openembedded.org/series/7865/
State : failure

== Summary ==

Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures:

* Issue Series does not apply on top of target branch [test_series_merge_on_head]
Suggested fix Rebase your series on top of targeted branch
Targeted branch master (currently at 119dd0889f)

* Issue Series sent to the wrong mailing list or some patches from the series correspond to different mailing lists [test_target_mailing_list]

  Suggested fix    Send the series again to the correct mailing list (ML)
  Suggested ML     [email protected] [http://git.yoctoproject.org/cgit/cgit.cgi/poky/]
  Patch's path:    meta-yocto-bsp/conf/machine/genericx86-64.conf

If you believe any of these test results are incorrect, please reply to the mailing list ([email protected]) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...).

---

Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe