From 03229249889f621577b211de2d5c4d12914c341b Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Mon, 20 Feb 2023 13:44:22 +0800 Subject: linux-intel/5.15: remove recipes We're adding v6.1 as the LTS for this release so remove these recipes. Signed-off-by: Anuj Mittal --- recipes-kernel/linux/linux-intel-rt_5.15.bb | 37 ----------------- ...mconf-cfg-Allow-specification-of-ncurses-.patch | 48 ---------------------- recipes-kernel/linux/linux-intel_5.15.bb | 29 ------------- 3 files changed, 114 deletions(-) delete mode 100644 recipes-kernel/linux/linux-intel-rt_5.15.bb delete mode 100644 recipes-kernel/linux/linux-intel/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch delete mode 100644 recipes-kernel/linux/linux-intel_5.15.bb diff --git a/recipes-kernel/linux/linux-intel-rt_5.15.bb b/recipes-kernel/linux/linux-intel-rt_5.15.bb deleted file mode 100644 index d25b895a..00000000 --- a/recipes-kernel/linux/linux-intel-rt_5.15.bb +++ /dev/null @@ -1,37 +0,0 @@ -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-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 -# core-image-rt-sdk, core-image-rt. -python () { - if d.getVar("KERNEL_PACKAGE_NAME", True) == "kernel" and d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-intel-rt": - raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-intel-rt to enable it") -} - -LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" - -KBRANCH = "5.15/preempt-rt" -KMETA_BRANCH = "yocto-5.15" - -DEPENDS += "elfutils-native openssl-native util-linux-native" - -LINUX_VERSION_EXTENSION ??= "-intel-pk-${LINUX_KERNEL_TYPE}" - -LINUX_VERSION ?= "5.15.85" -SRCREV_machine ?= "a2fb1a92fb6e734b2253cde6b6ef5f203cf0fefc" -SRCREV_meta ?= "78c4410c172946903e35ba8cebf1cf90fad09b5a" - -LINUX_KERNEL_TYPE = "preempt-rt" - -# We've 8b766b0f8eece backported from v5.19 to linux-intel v5.15 kernel -# https://github.com/torvalds/linux/commit/8b766b0f8eece55155146f7628610ce54a065e0f -# It drops 'CONFIG_FB_BOOT_VESA_SUPPORT' config option which would result in a warning with 5.15 y-k-c. -# Suppress the harmless warning for now. -KCONF_BSP_AUDIT_LEVEL = "0" - -UPSTREAM_CHECK_GITTAGREGEX = "^lts-(?Pv5.15.(\d+)-rt(\d+)-preempt-rt-(\d+)T(\d+)Z)$" 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 deleted file mode 100644 index 3dc71ff2..00000000 --- a/recipes-kernel/linux/linux-intel/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch +++ /dev/null @@ -1,48 +0,0 @@ -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_5.15.bb b/recipes-kernel/linux/linux-intel_5.15.bb deleted file mode 100644 index 71861cb9..00000000 --- a/recipes-kernel/linux/linux-intel_5.15.bb +++ /dev/null @@ -1,29 +0,0 @@ -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-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch" - -KBRANCH = "5.15/linux" -KMETA_BRANCH = "yocto-5.15" - -LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" - -DEPENDS += "elfutils-native openssl-native util-linux-native" - -LINUX_VERSION_EXTENSION ??= "-intel-pk-${LINUX_KERNEL_TYPE}" - -LINUX_VERSION ?= "5.15.85" -SRCREV_machine ?= "c256f934aefa78ec001067313a76a4a382ac59a6" -SRCREV_meta ?= "78c4410c172946903e35ba8cebf1cf90fad09b5a" - -# Functionality flags -KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/security/security.scc" - -# We've 8b766b0f8eece backported from v5.19 to linux-intel v5.15 kernel -# https://github.com/torvalds/linux/commit/8b766b0f8eece55155146f7628610ce54a065e0f -# It drops 'CONFIG_FB_BOOT_VESA_SUPPORT' config option which would result in a warning with 5.15 y-k-c. -# Suppress the harmless warning for now. -KCONF_BSP_AUDIT_LEVEL = "0" - -UPSTREAM_CHECK_GITTAGREGEX = "^lts-(?Pv5.15.(\d+)-linux-(\d+)T(\d+)Z)$" -- cgit v1.2.3-54-g00ecf