From f8e08ecdab7c16352fe2d1d1e12557be213889b1 Mon Sep 17 00:00:00 2001 From: California Sullivan Date: Wed, 10 May 2017 14:59:04 -0700 Subject: recipes-kernel/linux/*: Standardize use of KERNEL_FEATURES_INTEL_COMMON Previously, some recipes hard set it to empty, and some recipes did not set it at all. So in some cases, it acted like a global variable you could modify, and in others you could only append to it. This behavior made it difficult to use (which I doubt anyone was doing). This patch changes the variable to be soft set to empty across all recipes. This way it can be used to globally change meta-intel kernels through a conf file, or individually in the different versioned recipes should the need arise. Signed-off-by: California Sullivan Signed-off-by: Saul Wold --- common/recipes-kernel/linux/linux-intel-rt_4.9.bb | 2 +- common/recipes-kernel/linux/linux-intel_4.9.bb | 3 +-- common/recipes-kernel/linux/linux-yocto-rt_4.1.bbappend | 2 ++ common/recipes-kernel/linux/linux-yocto-rt_4.10.bbappend | 2 +- common/recipes-kernel/linux/linux-yocto-rt_4.4.bbappend | 2 ++ common/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend | 2 ++ common/recipes-kernel/linux/linux-yocto-tiny_4.10.bbappend | 2 ++ common/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend | 2 ++ common/recipes-kernel/linux/linux-yocto_4.1.bbappend | 2 ++ common/recipes-kernel/linux/linux-yocto_4.10.bbappend | 2 +- common/recipes-kernel/linux/linux-yocto_4.4.bbappend | 2 ++ 11 files changed, 18 insertions(+), 5 deletions(-) diff --git a/common/recipes-kernel/linux/linux-intel-rt_4.9.bb b/common/recipes-kernel/linux/linux-intel-rt_4.9.bb index fd88b7d5..6e61997c 100644 --- a/common/recipes-kernel/linux/linux-intel-rt_4.9.bb +++ b/common/recipes-kernel/linux/linux-intel-rt_4.9.bb @@ -27,7 +27,7 @@ KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" LINUX_KERNEL_TYPE = "preempt-rt" -KERNEL_FEATURES_INTEL_COMMON = "" +KERNEL_FEATURES_INTEL_COMMON ?= "" COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" KMACHINE_core2-32-intel-common = "intel-core2-32" diff --git a/common/recipes-kernel/linux/linux-intel_4.9.bb b/common/recipes-kernel/linux/linux-intel_4.9.bb index aebbedf1..46db6632 100644 --- a/common/recipes-kernel/linux/linux-intel_4.9.bb +++ b/common/recipes-kernel/linux/linux-intel_4.9.bb @@ -11,13 +11,12 @@ SRC_URI = "git://github.com/01org/linux-intel-4.9.git;protocol=https;name=machin LINUX_VERSION ?= "4.9.20" LINUX_VERSION_EXTENSION = "-intel-pk-${LINUX_KERNEL_TYPE}" - PV = "${LINUX_VERSION}+git${SRCPV}" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -KERNEL_FEATURES_INTEL_COMMON = "" +KERNEL_FEATURES_INTEL_COMMON ?= "" COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" KMACHINE_core2-32-intel-common = "intel-core2-32" diff --git a/common/recipes-kernel/linux/linux-yocto-rt_4.1.bbappend b/common/recipes-kernel/linux/linux-yocto-rt_4.1.bbappend index 1b81c0ee..fbe2ba8d 100644 --- a/common/recipes-kernel/linux/linux-yocto-rt_4.1.bbappend +++ b/common/recipes-kernel/linux/linux-yocto-rt_4.1.bbappend @@ -6,6 +6,8 @@ SRCREV_MACHINE_INTEL_COMMON ?= "bf977ae249601f88da359260b2b2141462112f8c" KBRANCH_INTEL_COMMON = "standard/preempt-rt/intel/base" +KERNEL_FEATURES_INTEL_COMMON ?= "" + LINUX_VERSION_core2-32-intel-common = "${LINUX_VERSION_INTEL_COMMON}" COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" KMACHINE_core2-32-intel-common = "intel-core2-32" diff --git a/common/recipes-kernel/linux/linux-yocto-rt_4.10.bbappend b/common/recipes-kernel/linux/linux-yocto-rt_4.10.bbappend index 9d2e3c0b..17569a1c 100644 --- a/common/recipes-kernel/linux/linux-yocto-rt_4.10.bbappend +++ b/common/recipes-kernel/linux/linux-yocto-rt_4.10.bbappend @@ -1,4 +1,4 @@ -KERNEL_FEATURES_INTEL_COMMON = "" +KERNEL_FEATURES_INTEL_COMMON ?= "" COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" KMACHINE_core2-32-intel-common = "intel-core2-32" diff --git a/common/recipes-kernel/linux/linux-yocto-rt_4.4.bbappend b/common/recipes-kernel/linux/linux-yocto-rt_4.4.bbappend index 85f4c1c3..03c45c88 100644 --- a/common/recipes-kernel/linux/linux-yocto-rt_4.4.bbappend +++ b/common/recipes-kernel/linux/linux-yocto-rt_4.4.bbappend @@ -6,6 +6,8 @@ SRCREV_MACHINE_INTEL_COMMON ?= "8364651ddaaa71602ad7746937d79dc815fe056d" KBRANCH_INTEL_COMMON = "standard/preempt-rt/intel/base" +KERNEL_FEATURES_INTEL_COMMON ?= "" + LINUX_VERSION_core2-32-intel-common = "${LINUX_VERSION_INTEL_COMMON}" COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" KMACHINE_core2-32-intel-common = "intel-core2-32" diff --git a/common/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend b/common/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend index 18ee836a..a447b4d9 100644 --- a/common/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend +++ b/common/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend @@ -1,5 +1,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +KERNEL_FEATURES_INTEL_COMMON ?= "" + LINUX_VERSION_i586-nlp-32-intel-common = "4.1.39" SRCREV_meta_i586-nlp-32-intel-common = "a867edab415f0ddc1a0d8da6ddb43c8afa9611dd" SRCREV_machine_i586-nlp-32-intel-common = "17e44fa855e657b2fd7bd810c42615fe6318c99b" diff --git a/common/recipes-kernel/linux/linux-yocto-tiny_4.10.bbappend b/common/recipes-kernel/linux/linux-yocto-tiny_4.10.bbappend index 98d42bf3..28741825 100644 --- a/common/recipes-kernel/linux/linux-yocto-tiny_4.10.bbappend +++ b/common/recipes-kernel/linux/linux-yocto-tiny_4.10.bbappend @@ -1,5 +1,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +KERNEL_FEATURES_INTEL_COMMON ?= "" + COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}" COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" diff --git a/common/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend b/common/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend index 159d8c09..d35033bc 100644 --- a/common/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend +++ b/common/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend @@ -2,6 +2,8 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" EXTRA_OEMAKE = "LD=${STAGING_BINDIR_NATIVE}/${HOST_SYS}/${TARGET_PREFIX}ld AR=${STAGING_BINDIR_NATIVE}/${HOST_SYS}/${TARGET_PREFIX}gcc-ar" +KERNEL_FEATURES_INTEL_COMMON ?= "" + LINUX_VERSION_i586-nlp-32-intel-common = "4.4.60" LINUX_VERSION_core2-32-intel-common = "4.4.60" LINUX_VERSION_corei7-64-intel-common = "4.4.60" diff --git a/common/recipes-kernel/linux/linux-yocto_4.1.bbappend b/common/recipes-kernel/linux/linux-yocto_4.1.bbappend index 92b08962..4897e088 100644 --- a/common/recipes-kernel/linux/linux-yocto_4.1.bbappend +++ b/common/recipes-kernel/linux/linux-yocto_4.1.bbappend @@ -6,6 +6,8 @@ SRCREV_MACHINE_INTEL_COMMON = "d2d93ffb422b65a8b66f3d24b4cd0652bec9e224" KBRANCH_INTEL_COMMON = "standard/intel/base" +KERNEL_FEATURES_INTEL_COMMON ?= "" + LINUX_VERSION_core2-32-intel-common = "${LINUX_VERSION_INTEL_COMMON}" COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" KMACHINE_core2-32-intel-common = "intel-core2-32" diff --git a/common/recipes-kernel/linux/linux-yocto_4.10.bbappend b/common/recipes-kernel/linux/linux-yocto_4.10.bbappend index a09fe1a4..20504637 100644 --- a/common/recipes-kernel/linux/linux-yocto_4.10.bbappend +++ b/common/recipes-kernel/linux/linux-yocto_4.10.bbappend @@ -1,4 +1,4 @@ -KERNEL_FEATURES_INTEL_COMMON = "" +KERNEL_FEATURES_INTEL_COMMON ?= "" COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" KMACHINE_core2-32-intel-common = "intel-core2-32" diff --git a/common/recipes-kernel/linux/linux-yocto_4.4.bbappend b/common/recipes-kernel/linux/linux-yocto_4.4.bbappend index 2c853818..01359828 100644 --- a/common/recipes-kernel/linux/linux-yocto_4.4.bbappend +++ b/common/recipes-kernel/linux/linux-yocto_4.4.bbappend @@ -6,6 +6,8 @@ SRCREV_MACHINE_INTEL_COMMON = "2cc78e92f40522d8b5f278b7099c1ae657947749" KBRANCH_INTEL_COMMON = "standard/intel/base" +KERNEL_FEATURES_INTEL_COMMON ?= "" + LINUX_VERSION_core2-32-intel-common = "${LINUX_VERSION_INTEL_COMMON}" COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" KMACHINE_core2-32-intel-common = "intel-core2-32" -- cgit v1.2.3-54-g00ecf