From 13ae1339c24a5d431274bdd324048f1043045ae5 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Sat, 24 Nov 2018 11:30:46 +0800 Subject: linux-intel/4.19: add recipe Builds 4.19/base from linux-intel-lts. Include a patch from linux-yocto 4.18 to detect ncurses correctly when cross-compiling and move the older patch to version specific recipes from inc. In addition to intel-common kernel configs from yocto-kernel-cache, this also includes security.scc feature which enables a set of configs with the aim of reducing the kernel attack surface and/or of performing additional checks and validation of commonly used structures in kernel. Signed-off-by: Anuj Mittal --- recipes-kernel/linux/linux-intel.inc | 1 - ...mconf-cfg-Allow-specification-of-ncurses-.patch | 48 ++++++++++++++++++++++ recipes-kernel/linux/linux-intel_4.14.bb | 4 +- recipes-kernel/linux/linux-intel_4.19.bb | 21 ++++++++++ recipes-kernel/linux/linux-intel_4.9.bb | 4 ++ 5 files changed, 76 insertions(+), 2 deletions(-) create mode 100644 recipes-kernel/linux/linux-intel/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch create mode 100644 recipes-kernel/linux/linux-intel_4.19.bb diff --git a/recipes-kernel/linux/linux-intel.inc b/recipes-kernel/linux/linux-intel.inc index 2525c70d..f2ba0d13 100644 --- a/recipes-kernel/linux/linux-intel.inc +++ b/recipes-kernel/linux/linux-intel.inc @@ -7,7 +7,6 @@ KERNEL_CONFIG_URI ?= "git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;n SRC_URI = " \ git://github.com/intel/linux-intel-lts.git;protocol=https;name=machine;branch=${KBRANCH}; \ - file://0001-menuconfig-check-lxdiaglog.sh-Allow-specification-of.patch \ ${KERNEL_CONFIG_URI} \ " diff --git a/recipes-kernel/linux/linux-intel/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch b/recipes-kernel/linux/linux-intel/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch new file mode 100644 index 00000000..3dc71ff2 --- /dev/null +++ b/recipes-kernel/linux/linux-intel/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch @@ -0,0 +1,48 @@ +From bebd63730a433ba62549a80114a9851328aa8897 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield +Date: Mon, 2 Jul 2018 23:10:28 -0400 +Subject: [PATCH] menuconfig,mconf-cfg: Allow specification of ncurses location + +In some cross build environments such as the Yocto Project build +environment it provides an ncurses library that is compiled +differently than the host's version. This causes display corruption +problems when the host's curses includes are used instead of the +includes from the provided compiler are overridden. There is a second +case where there is no curses libraries at all on the host system and +menuconfig will just fail entirely. + +The solution is simply to allow an override variable in +check-lxdialog.sh for environments such as the Yocto Project. Adding +a CROSS_CURSES_LIB and CROSS_CURSES_INC solves the issue and allowing +compiling and linking against the right headers and libraries. + +Signed-off-by: Jason Wessel +cc: Michal Marek +cc: linux-kbuild@vger.kernel.org +Signed-off-by: Bruce Ashfield +--- + scripts/kconfig/mconf-cfg.sh | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/scripts/kconfig/mconf-cfg.sh b/scripts/kconfig/mconf-cfg.sh +index c812872d7f9d..42d20819025c 100755 +--- a/scripts/kconfig/mconf-cfg.sh ++++ b/scripts/kconfig/mconf-cfg.sh +@@ -4,6 +4,14 @@ + PKG="ncursesw" + PKG2="ncurses" + ++if [ "$CROSS_CURSES_LIB" != "" ]; then ++ echo libs=\'$CROSS_CURSES_LIB\' ++ if [ x"$CROSS_CURSES_INC" != x ]; then ++ echo cflags=\'$CROSS_CURSES_INC\' ++ fi ++ exit 0 ++fi ++ + if [ -n "$(command -v pkg-config)" ]; then + if pkg-config --exists $PKG; then + echo cflags=\"$(pkg-config --cflags $PKG)\" +-- +2.17.1 + diff --git a/recipes-kernel/linux/linux-intel_4.14.bb b/recipes-kernel/linux/linux-intel_4.14.bb index c678e955..d371c1ee 100644 --- a/recipes-kernel/linux/linux-intel_4.14.bb +++ b/recipes-kernel/linux/linux-intel_4.14.bb @@ -4,7 +4,9 @@ KBRANCH = "4.14/base" KMETA_BRANCH = "yocto-4.14" # Fix for 32-bit perf issue. Remove when patch is backported to 4.14. -SRC_URI_append = " file://0001-perf-x86-32-explicitly-include-errno.h.patch" +SRC_URI_append = " file://0001-perf-x86-32-explicitly-include-errno.h.patch \ + file://0001-menuconfig-check-lxdiaglog.sh-Allow-specification-of.patch \ + " DEPENDS += "elfutils-native openssl-native util-linux-native" diff --git a/recipes-kernel/linux/linux-intel_4.19.bb b/recipes-kernel/linux/linux-intel_4.19.bb new file mode 100644 index 00000000..02353d26 --- /dev/null +++ b/recipes-kernel/linux/linux-intel_4.19.bb @@ -0,0 +1,21 @@ +require linux-intel.inc + +KBRANCH = "4.19/base" +KMETA_BRANCH = "yocto-4.19" + +LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" + +SRC_URI_append = " file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch" + +DEPENDS += "elfutils-native openssl-native util-linux-native" + +LINUX_VERSION ?= "4.19.0" +SRCREV_machine ?= "a13be70e5ba050d848fc4005add46ca89bb8e6e6" +SRCREV_meta ?= "26bfb042ebb6e4816c5a8ce85d97a55e763430c7" + +# For Crystalforest and Romley +KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " uio" +KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " uio" + +# Functionality flags +KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/security/security.scc" diff --git a/recipes-kernel/linux/linux-intel_4.9.bb b/recipes-kernel/linux/linux-intel_4.9.bb index e2f1eaad..30db4d34 100644 --- a/recipes-kernel/linux/linux-intel_4.9.bb +++ b/recipes-kernel/linux/linux-intel_4.9.bb @@ -4,6 +4,10 @@ require linux-intel.inc KBRANCH = "4.9/yocto/base" KMETA_BRANCH = "yocto-4.9" +SRC_URI_append = " \ + file://0001-menuconfig-check-lxdiaglog.sh-Allow-specification-of.patch \ + " + LINUX_VERSION ?= "4.9.134" SRCREV_machine ?= "33c9f20d1f40e87af4ccaf55c0fabb89b068d6ab" SRCREV_meta ?= "f9e90afd4e47920e990dacb73cd6508917ca5422" -- cgit v1.2.3-54-g00ecf