From 0f20512deac20f3ec7241ff431c8523ce3c66034 Mon Sep 17 00:00:00 2001 From: brian avery Date: Fri, 21 Jul 2017 12:39:53 -0700 Subject: poky: Remove machine specific kernel overrides 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. (From meta-yocto rev: 6b194a137dcedcae7e4b03f9ebed822d44f53fe2) Signed-off-by: brian avery Signed-off-by: Richard Purdie --- meta-poky/conf/distro/poky.conf | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'meta-poky') diff --git a/meta-poky/conf/distro/poky.conf b/meta-poky/conf/distro/poky.conf index c9079695d4..d15e50ed28 100644 --- a/meta-poky/conf/distro/poky.conf +++ b/meta-poky/conf/distro/poky.conf @@ -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" -- cgit v1.2.3-54-g00ecf