From 503e4e567eb268fc51e7e85df03e2e92076e07cd Mon Sep 17 00:00:00 2001 From: Naveen Saini Date: Wed, 8 Mar 2023 13:18:58 +0800 Subject: linux-intel/6.2: add recipe It builds 6.2 kernel version from mainline-tracking tree. https://github.com/intel/mainline-tracking tag: mainline-tracking-v6.2-linux-230223T032049Z Remove linux-intel 5.19 recipe. There is no -rt version of 6.2 yet so 5.19-rt has been kept. Signed-off-by: Naveen Saini Signed-off-by: Anuj Mittal --- recipes-kernel/linux/linux-intel-rt_5.19.bb | 2 - recipes-kernel/linux/linux-intel.inc | 1 + ...mconf-cfg-Allow-specification-of-ncurses-.patch | 52 ++++++++++++++++++++++ ...mconf-cfg-Allow-specification-of-ncurses-.patch | 52 ---------------------- recipes-kernel/linux/linux-intel_5.19.bb | 22 --------- recipes-kernel/linux/linux-intel_6.1.bb | 2 - recipes-kernel/linux/linux-intel_6.2.bb | 20 +++++++++ 7 files changed, 73 insertions(+), 78 deletions(-) create mode 100644 recipes-kernel/linux/linux-intel/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch delete mode 100644 recipes-kernel/linux/linux-intel/0001-v5.19-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch delete mode 100644 recipes-kernel/linux/linux-intel_5.19.bb create mode 100644 recipes-kernel/linux/linux-intel_6.2.bb diff --git a/recipes-kernel/linux/linux-intel-rt_5.19.bb b/recipes-kernel/linux/linux-intel-rt_5.19.bb index 117c903b..7fab89a9 100644 --- a/recipes-kernel/linux/linux-intel-rt_5.19.bb +++ b/recipes-kernel/linux/linux-intel-rt_5.19.bb @@ -2,8 +2,6 @@ require linux-intel.inc SRC_URI:prepend = "git://github.com/intel/mainline-tracking.git;protocol=https;name=machine;nobranch=1; \ " -SRC_URI:append = " file://0001-v5.19-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch" - # Skip processing of this recipe if it is not explicitly specified as the # PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying # to build multiple virtual/kernel providers, e.g. as dependency of diff --git a/recipes-kernel/linux/linux-intel.inc b/recipes-kernel/linux/linux-intel.inc index b54d634b..7f81fc18 100644 --- a/recipes-kernel/linux/linux-intel.inc +++ b/recipes-kernel/linux/linux-intel.inc @@ -10,6 +10,7 @@ SRC_URI = " \ file://0001-vt-conmakehash-improve-reproducibility.patch \ file://0001-lib-build_OID_registry-fix-reproducibility-issues.patch \ file://fix-perf-reproducibility.patch \ + file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch \ " PV = "${LINUX_VERSION}+git${SRCPV}" 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..9aff37de --- /dev/null +++ b/recipes-kernel/linux/linux-intel/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch @@ -0,0 +1,52 @@ +From ecb938c19d20543382c9bbc42588c29b5ebfd3ed Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield +Date: Fri, 12 Aug 2022 13:12:18 +0800 +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. + +Upstream-Status: Submitted + +Signed-off-by: Jason Wessel +cc: Michal Marek +cc: linux-kbuild@vger.kernel.org +Signed-off-by: Bruce Ashfield +Signed-off-by: Naveen Saini +--- + scripts/kconfig/mconf-cfg.sh | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/scripts/kconfig/mconf-cfg.sh b/scripts/kconfig/mconf-cfg.sh +index 025b565e0b7c..6514d19790e6 100755 +--- a/scripts/kconfig/mconf-cfg.sh ++++ b/scripts/kconfig/mconf-cfg.sh +@@ -4,6 +4,15 @@ + 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 ${HOSTPKG_CONFIG})" ]; then + if ${HOSTPKG_CONFIG} --exists $PKG; then + echo cflags=\"$(${HOSTPKG_CONFIG} --cflags $PKG)\" +-- +2.25.1 + diff --git a/recipes-kernel/linux/linux-intel/0001-v5.19-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch b/recipes-kernel/linux/linux-intel/0001-v5.19-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch deleted file mode 100644 index 9aff37de..00000000 --- a/recipes-kernel/linux/linux-intel/0001-v5.19-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch +++ /dev/null @@ -1,52 +0,0 @@ -From ecb938c19d20543382c9bbc42588c29b5ebfd3ed Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield -Date: Fri, 12 Aug 2022 13:12:18 +0800 -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. - -Upstream-Status: Submitted - -Signed-off-by: Jason Wessel -cc: Michal Marek -cc: linux-kbuild@vger.kernel.org -Signed-off-by: Bruce Ashfield -Signed-off-by: Naveen Saini ---- - scripts/kconfig/mconf-cfg.sh | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/scripts/kconfig/mconf-cfg.sh b/scripts/kconfig/mconf-cfg.sh -index 025b565e0b7c..6514d19790e6 100755 ---- a/scripts/kconfig/mconf-cfg.sh -+++ b/scripts/kconfig/mconf-cfg.sh -@@ -4,6 +4,15 @@ - 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 ${HOSTPKG_CONFIG})" ]; then - if ${HOSTPKG_CONFIG} --exists $PKG; then - echo cflags=\"$(${HOSTPKG_CONFIG} --cflags $PKG)\" --- -2.25.1 - diff --git a/recipes-kernel/linux/linux-intel_5.19.bb b/recipes-kernel/linux/linux-intel_5.19.bb deleted file mode 100644 index 9c3e9890..00000000 --- a/recipes-kernel/linux/linux-intel_5.19.bb +++ /dev/null @@ -1,22 +0,0 @@ -require linux-intel.inc - -SRC_URI:prepend = "git://github.com/intel/mainline-tracking.git;protocol=https;name=machine;nobranch=1; \ - " -SRC_URI:append = " file://0001-v5.19-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch" - -KMETA_BRANCH = "yocto-5.19" - -LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" - -DEPENDS += "elfutils-native openssl-native util-linux-native" - -LINUX_VERSION_EXTENSION ??= "-mainline-tracking-${LINUX_KERNEL_TYPE}" - -LINUX_VERSION ?= "5.19.0" -SRCREV_machine ?= "51b9920cab3c5ee38b2c0cd5c7509ce005241b72" -SRCREV_meta ?= "f5d4c109d6de04005def04c3a06f053ae0c397ad" - -# Functionality flags -KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/security/security.scc" - -UPSTREAM_CHECK_GITTAGREGEX = "^mainline-tracking-v5.19-linux-(?P(\d+)T(\d+)Z)$" diff --git a/recipes-kernel/linux/linux-intel_6.1.bb b/recipes-kernel/linux/linux-intel_6.1.bb index ee27a5cf..a3c113f5 100644 --- a/recipes-kernel/linux/linux-intel_6.1.bb +++ b/recipes-kernel/linux/linux-intel_6.1.bb @@ -2,8 +2,6 @@ require linux-intel.inc SRC_URI:prepend = "git://github.com/intel/linux-intel-lts.git;protocol=https;name=machine;branch=${KBRANCH}; \ " -SRC_URI:append = " file://0001-v5.19-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch" - KBRANCH = "6.1/linux" KMETA_BRANCH = "yocto-6.1" diff --git a/recipes-kernel/linux/linux-intel_6.2.bb b/recipes-kernel/linux/linux-intel_6.2.bb new file mode 100644 index 00000000..60f8d315 --- /dev/null +++ b/recipes-kernel/linux/linux-intel_6.2.bb @@ -0,0 +1,20 @@ +require linux-intel.inc + +SRC_URI:prepend = "git://github.com/intel/mainline-tracking.git;protocol=https;name=machine;nobranch=1; \ + " +KMETA_BRANCH = "master" + +LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" + +DEPENDS += "elfutils-native openssl-native util-linux-native" + +LINUX_VERSION_EXTENSION ??= "-mainline-tracking-${LINUX_KERNEL_TYPE}" + +LINUX_VERSION ?= "6.2.0" +SRCREV_machine ?= "4b86b0f8f30699805284163233f6ac34fc507863" +SRCREV_meta ?= "bd77e1f904f681d21732bb3ae77b6591f6ec3d81" + +# Functionality flags +KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/security/security.scc" + +UPSTREAM_CHECK_GITTAGREGEX = "^mainline-tracking-v6.2-linux-(?P(\d+)T(\d+)Z)$" -- cgit v1.2.3-54-g00ecf