We will maintain only the 5.4 kernel for dunfell LTS. Switch alt-cfg to using v5.4.
Signed-off-by: Anuj Mittal <[email protected]> --- conf/machine/include/meta-intel.inc | 4 +- recipes-kernel/linux/linux-intel-rt_4.19.bb | 25 -------- ...-lxdiaglog.sh-Allow-specification-of.patch | 62 ------------------- .../perf-fix-build-with-binutils.patch | 60 ------------------ recipes-kernel/linux/linux-intel_4.19.bb | 22 ------- 5 files changed, 2 insertions(+), 171 deletions(-) delete mode 100644 recipes-kernel/linux/linux-intel-rt_4.19.bb delete mode 100644 recipes-kernel/linux/linux-intel/0001-menuconfig-check-lxdiaglog.sh-Allow-specification-of.patch delete mode 100644 recipes-kernel/linux/linux-intel/perf-fix-build-with-binutils.patch delete mode 100644 recipes-kernel/linux/linux-intel_4.19.bb diff --git a/conf/machine/include/meta-intel.inc b/conf/machine/include/meta-intel.inc index 27d7a70f..932c0cc1 100644 --- a/conf/machine/include/meta-intel.inc +++ b/conf/machine/include/meta-intel.inc @@ -14,8 +14,8 @@ PREFERRED_PROVIDER_nativesdk-zlib = "nativesdk-zlib" PREFERRED_VERSION_linux-intel ?= "5.4%" PREFERRED_VERSION_linux-intel-rt ?= "5.4%" -PREFERRED_VERSION_linux-intel_poky-altcfg ?= "4.19%" -PREFERRED_VERSION_linux-intel-rt_poky-altcfg ?= "4.19%" +PREFERRED_VERSION_linux-intel_poky-altcfg ?= "5.4%" +PREFERRED_VERSION_linux-intel-rt_poky-altcfg ?= "5.4%" XSERVER_X86_ASPEED_AST = "xf86-video-ast \ " diff --git a/recipes-kernel/linux/linux-intel-rt_4.19.bb b/recipes-kernel/linux/linux-intel-rt_4.19.bb deleted file mode 100644 index 21152c19..00000000 --- a/recipes-kernel/linux/linux-intel-rt_4.19.bb +++ /dev/null @@ -1,25 +0,0 @@ -require linux-intel.inc - -# 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=bbea815ee2795b2f4230826c0c6b8814" -SRC_URI_append = " file://perf-fix-build-with-binutils.patch" -SRC_URI_append = " file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch" - -KBRANCH = "4.19/preempt-rt" -KMETA_BRANCH = "yocto-4.19" - -DEPENDS += "elfutils-native openssl-native util-linux-native" - -LINUX_VERSION ?= "4.19.94" -SRCREV_machine ?= "5bffd5bf8a51a0b0a81267616cdeceef06466561" -SRCREV_meta ?= "4f5d761316a9cf14605e5d0cc91b53c1b2e9dc6a" - -LINUX_KERNEL_TYPE = "preempt-rt" diff --git a/recipes-kernel/linux/linux-intel/0001-menuconfig-check-lxdiaglog.sh-Allow-specification-of.patch b/recipes-kernel/linux/linux-intel/0001-menuconfig-check-lxdiaglog.sh-Allow-specification-of.patch deleted file mode 100644 index a9e9213b..00000000 --- a/recipes-kernel/linux/linux-intel/0001-menuconfig-check-lxdiaglog.sh-Allow-specification-of.patch +++ /dev/null @@ -1,62 +0,0 @@ -From e6ebc8e654bba53f28af5229a1069fc74fa58b7b Mon Sep 17 00:00:00 2001 -From: Jason Wessel <[email protected]> -Date: Thu, 25 Sep 2014 11:26:49 -0700 -Subject: [PATCH] menuconfig,check-lxdiaglog.sh: 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 [https://lkml.org/lkml/2013/3/3/103] - -Signed-off-by: Jason Wessel <[email protected]> -cc: Michal Marek <[email protected]> -cc: [email protected] -Signed-off-by: Bruce Ashfield <[email protected]> -Signed-off-by: California Sullivan <[email protected]> ---- - scripts/kconfig/lxdialog/check-lxdialog.sh | 8 ++++++++ - 1 file changed, 8 insertions(+) - mode change 100755 => 100644 scripts/kconfig/lxdialog/check-lxdialog.sh - -diff --git a/scripts/kconfig/lxdialog/check-lxdialog.sh b/scripts/kconfig/lxdialog/check-lxdialog.sh -old mode 100755 -new mode 100644 -index 5075ebf2d3b9..ba9242101190 ---- a/scripts/kconfig/lxdialog/check-lxdialog.sh -+++ b/scripts/kconfig/lxdialog/check-lxdialog.sh -@@ -4,6 +4,10 @@ - # What library to link - ldflags() - { -+ if [ "$CROSS_CURSES_LIB" != "" ]; then -+ echo "$CROSS_CURSES_LIB" -+ exit -+ fi - pkg-config --libs ncursesw 2>/dev/null && exit - pkg-config --libs ncurses 2>/dev/null && exit - for ext in so a dll.a dylib ; do -@@ -21,6 +25,10 @@ ldflags() - # Where is ncurses.h? - ccflags() - { -+ if [ x"$CROSS_CURSES_INC" != x ]; then -+ echo "$CROSS_CURSES_INC" -+ exit -+ fi - if pkg-config --cflags ncursesw 2>/dev/null; then - echo '-DCURSES_LOC="<ncurses.h>" -DNCURSES_WIDECHAR=1' - elif pkg-config --cflags ncurses 2>/dev/null; then --- -2.14.3 - diff --git a/recipes-kernel/linux/linux-intel/perf-fix-build-with-binutils.patch b/recipes-kernel/linux/linux-intel/perf-fix-build-with-binutils.patch deleted file mode 100644 index 1470a5d7..00000000 --- a/recipes-kernel/linux/linux-intel/perf-fix-build-with-binutils.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 0ada120c883d4f1f6aafd01cf0fbb10d8bbba015 Mon Sep 17 00:00:00 2001 -From: Changbin Du <[email protected]> -Date: Tue, 28 Jan 2020 23:29:38 +0800 -Subject: [PATCH] perf: Make perf able to build with latest libbfd - -libbfd has changed the bfd_section_* macros to inline functions -bfd_section_<field> since 2019-09-18. See below two commits: - o http://www.sourceware.org/ml/gdb-cvs/2019-09/msg00064.html - o https://www.sourceware.org/ml/gdb-cvs/2019-09/msg00072.html - -This fix make perf able to build with both old and new libbfd. - -Signed-off-by: Changbin Du <[email protected]> -Acked-by: Jiri Olsa <[email protected]> -Cc: Peter Zijlstra <[email protected]> -Link: http://lore.kernel.org/lkml/[email protected] -Signed-off-by: Arnaldo Carvalho de Melo <[email protected]> - -Upstream-Status: Backport [https://github.com/torvalds/linux/commit/0ada120c883d4f1f6aafd01cf0fbb10d8bbba015] -Signed-off-by: Anuj Mittal <[email protected]> ---- - tools/perf/util/srcline.c | 16 +++++++++++++++- - 1 file changed, 15 insertions(+), 1 deletion(-) - -diff --git a/tools/perf/util/srcline.c b/tools/perf/util/srcline.c -index 6ccf6f6d09df9..5b7d6c16d33fe 100644 ---- a/tools/perf/util/srcline.c -+++ b/tools/perf/util/srcline.c -@@ -193,16 +193,30 @@ static void find_address_in_section(bfd *abfd, asection *section, void *data) - bfd_vma pc, vma; - bfd_size_type size; - struct a2l_data *a2l = data; -+ flagword flags; - - if (a2l->found) - return; - -- if ((bfd_get_section_flags(abfd, section) & SEC_ALLOC) == 0) -+#ifdef bfd_get_section_flags -+ flags = bfd_get_section_flags(abfd, section); -+#else -+ flags = bfd_section_flags(section); -+#endif -+ if ((flags & SEC_ALLOC) == 0) - return; - - pc = a2l->addr; -+#ifdef bfd_get_section_vma - vma = bfd_get_section_vma(abfd, section); -+#else -+ vma = bfd_section_vma(section); -+#endif -+#ifdef bfd_get_section_size - size = bfd_get_section_size(section); -+#else -+ size = bfd_section_size(section); -+#endif - - if (pc < vma || pc >= vma + size) - return; diff --git a/recipes-kernel/linux/linux-intel_4.19.bb b/recipes-kernel/linux/linux-intel_4.19.bb deleted file mode 100644 index 4552b148..00000000 --- a/recipes-kernel/linux/linux-intel_4.19.bb +++ /dev/null @@ -1,22 +0,0 @@ -require linux-intel.inc - -KBRANCH = "4.19/base" -KMETA_BRANCH = "yocto-4.19" - -LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" - -SRC_URI_append = " file://perf-fix-build-with-binutils.patch" -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.106" -SRCREV_machine ?= "8ef641c89e3c2ff303eb362a7b77760dd2ed7e69" -SRCREV_meta ?= "7cb520d405cd5ca8f21a333941fbc0861bbb36b0" - -# 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" -- 2.25.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#6493): https://lists.yoctoproject.org/g/meta-intel/message/6493 Mute This Topic: https://lists.yoctoproject.org/mt/73048623/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
