diff options
author | Anuj Mittal <anuj.mittal@intel.com> | 2020-04-16 11:16:03 +0800 |
---|---|---|
committer | Anuj Mittal <anuj.mittal@intel.com> | 2020-04-27 09:22:54 +0800 |
commit | 259c94cc312aace4d85ef02a9dfda6243999a45a (patch) | |
tree | 90ee54d21673de127954bb4ce54ade78cc3eda09 | |
parent | 9f65fd57fea1470ed138f323a7e268d02c8ab198 (diff) | |
download | meta-intel-259c94cc312aace4d85ef02a9dfda6243999a45a.tar.gz |
linux-intel/4.19: remove
We will maintain only the 5.4 kernel for dunfell LTS. Switch alt-cfg to
using v5.4.
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
5 files changed, 2 insertions, 171 deletions
diff --git a/conf/machine/include/meta-intel.inc b/conf/machine/include/meta-intel.inc index 47976cde..266f5c4e 100644 --- a/conf/machine/include/meta-intel.inc +++ b/conf/machine/include/meta-intel.inc | |||
@@ -22,8 +22,8 @@ PREFERRED_PROVIDER_nativesdk-libva-utils = "nativesdk-libva-utils-intel" | |||
22 | 22 | ||
23 | PREFERRED_VERSION_linux-intel ?= "5.4%" | 23 | PREFERRED_VERSION_linux-intel ?= "5.4%" |
24 | PREFERRED_VERSION_linux-intel-rt ?= "5.4%" | 24 | PREFERRED_VERSION_linux-intel-rt ?= "5.4%" |
25 | PREFERRED_VERSION_linux-intel_poky-altcfg ?= "4.19%" | 25 | PREFERRED_VERSION_linux-intel_poky-altcfg ?= "5.4%" |
26 | PREFERRED_VERSION_linux-intel-rt_poky-altcfg ?= "4.19%" | 26 | PREFERRED_VERSION_linux-intel-rt_poky-altcfg ?= "5.4%" |
27 | 27 | ||
28 | XSERVER_X86_ASPEED_AST = "xf86-video-ast \ | 28 | XSERVER_X86_ASPEED_AST = "xf86-video-ast \ |
29 | " | 29 | " |
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 @@ | |||
1 | require linux-intel.inc | ||
2 | |||
3 | # Skip processing of this recipe if it is not explicitly specified as the | ||
4 | # PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying | ||
5 | # to build multiple virtual/kernel providers, e.g. as dependency of | ||
6 | # core-image-rt-sdk, core-image-rt. | ||
7 | python () { | ||
8 | if d.getVar("KERNEL_PACKAGE_NAME", True) == "kernel" and d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-intel-rt": | ||
9 | raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-intel-rt to enable it") | ||
10 | } | ||
11 | |||
12 | LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" | ||
13 | SRC_URI_append = " file://perf-fix-build-with-binutils.patch" | ||
14 | SRC_URI_append = " file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch" | ||
15 | |||
16 | KBRANCH = "4.19/preempt-rt" | ||
17 | KMETA_BRANCH = "yocto-4.19" | ||
18 | |||
19 | DEPENDS += "elfutils-native openssl-native util-linux-native" | ||
20 | |||
21 | LINUX_VERSION ?= "4.19.94" | ||
22 | SRCREV_machine ?= "5bffd5bf8a51a0b0a81267616cdeceef06466561" | ||
23 | SRCREV_meta ?= "4f5d761316a9cf14605e5d0cc91b53c1b2e9dc6a" | ||
24 | |||
25 | 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 @@ | |||
1 | From e6ebc8e654bba53f28af5229a1069fc74fa58b7b Mon Sep 17 00:00:00 2001 | ||
2 | From: Jason Wessel <jason.wessel@windriver.com> | ||
3 | Date: Thu, 25 Sep 2014 11:26:49 -0700 | ||
4 | Subject: [PATCH] menuconfig,check-lxdiaglog.sh: Allow specification of ncurses | ||
5 | location | ||
6 | |||
7 | In some cross build environments such as the Yocto Project build | ||
8 | environment it provides an ncurses library that is compiled | ||
9 | differently than the host's version. This causes display corruption | ||
10 | problems when the host's curses includes are used instead of the | ||
11 | includes from the provided compiler are overridden. There is a second | ||
12 | case where there is no curses libraries at all on the host system and | ||
13 | menuconfig will just fail entirely. | ||
14 | |||
15 | The solution is simply to allow an override variable in | ||
16 | check-lxdialog.sh for environments such as the Yocto Project. Adding | ||
17 | a CROSS_CURSES_LIB and CROSS_CURSES_INC solves the issue and allowing | ||
18 | compiling and linking against the right headers and libraries. | ||
19 | |||
20 | Upstream-Status: submitted [https://lkml.org/lkml/2013/3/3/103] | ||
21 | |||
22 | Signed-off-by: Jason Wessel <jason.wessel@windriver.com> | ||
23 | cc: Michal Marek <mmarek@suse.cz> | ||
24 | cc: linux-kbuild@vger.kernel.org | ||
25 | Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> | ||
26 | Signed-off-by: California Sullivan <california.l.sullivan@intel.com> | ||
27 | --- | ||
28 | scripts/kconfig/lxdialog/check-lxdialog.sh | 8 ++++++++ | ||
29 | 1 file changed, 8 insertions(+) | ||
30 | mode change 100755 => 100644 scripts/kconfig/lxdialog/check-lxdialog.sh | ||
31 | |||
32 | diff --git a/scripts/kconfig/lxdialog/check-lxdialog.sh b/scripts/kconfig/lxdialog/check-lxdialog.sh | ||
33 | old mode 100755 | ||
34 | new mode 100644 | ||
35 | index 5075ebf2d3b9..ba9242101190 | ||
36 | --- a/scripts/kconfig/lxdialog/check-lxdialog.sh | ||
37 | +++ b/scripts/kconfig/lxdialog/check-lxdialog.sh | ||
38 | @@ -4,6 +4,10 @@ | ||
39 | # What library to link | ||
40 | ldflags() | ||
41 | { | ||
42 | + if [ "$CROSS_CURSES_LIB" != "" ]; then | ||
43 | + echo "$CROSS_CURSES_LIB" | ||
44 | + exit | ||
45 | + fi | ||
46 | pkg-config --libs ncursesw 2>/dev/null && exit | ||
47 | pkg-config --libs ncurses 2>/dev/null && exit | ||
48 | for ext in so a dll.a dylib ; do | ||
49 | @@ -21,6 +25,10 @@ ldflags() | ||
50 | # Where is ncurses.h? | ||
51 | ccflags() | ||
52 | { | ||
53 | + if [ x"$CROSS_CURSES_INC" != x ]; then | ||
54 | + echo "$CROSS_CURSES_INC" | ||
55 | + exit | ||
56 | + fi | ||
57 | if pkg-config --cflags ncursesw 2>/dev/null; then | ||
58 | echo '-DCURSES_LOC="<ncurses.h>" -DNCURSES_WIDECHAR=1' | ||
59 | elif pkg-config --cflags ncurses 2>/dev/null; then | ||
60 | -- | ||
61 | 2.14.3 | ||
62 | |||
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 @@ | |||
1 | From 0ada120c883d4f1f6aafd01cf0fbb10d8bbba015 Mon Sep 17 00:00:00 2001 | ||
2 | From: Changbin Du <changbin.du@gmail.com> | ||
3 | Date: Tue, 28 Jan 2020 23:29:38 +0800 | ||
4 | Subject: [PATCH] perf: Make perf able to build with latest libbfd | ||
5 | |||
6 | libbfd has changed the bfd_section_* macros to inline functions | ||
7 | bfd_section_<field> since 2019-09-18. See below two commits: | ||
8 | o http://www.sourceware.org/ml/gdb-cvs/2019-09/msg00064.html | ||
9 | o https://www.sourceware.org/ml/gdb-cvs/2019-09/msg00072.html | ||
10 | |||
11 | This fix make perf able to build with both old and new libbfd. | ||
12 | |||
13 | Signed-off-by: Changbin Du <changbin.du@gmail.com> | ||
14 | Acked-by: Jiri Olsa <jolsa@redhat.com> | ||
15 | Cc: Peter Zijlstra <peterz@infradead.org> | ||
16 | Link: http://lore.kernel.org/lkml/20200128152938.31413-1-changbin.du@gmail.com | ||
17 | Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> | ||
18 | |||
19 | Upstream-Status: Backport [https://github.com/torvalds/linux/commit/0ada120c883d4f1f6aafd01cf0fbb10d8bbba015] | ||
20 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
21 | --- | ||
22 | tools/perf/util/srcline.c | 16 +++++++++++++++- | ||
23 | 1 file changed, 15 insertions(+), 1 deletion(-) | ||
24 | |||
25 | diff --git a/tools/perf/util/srcline.c b/tools/perf/util/srcline.c | ||
26 | index 6ccf6f6d09df9..5b7d6c16d33fe 100644 | ||
27 | --- a/tools/perf/util/srcline.c | ||
28 | +++ b/tools/perf/util/srcline.c | ||
29 | @@ -193,16 +193,30 @@ static void find_address_in_section(bfd *abfd, asection *section, void *data) | ||
30 | bfd_vma pc, vma; | ||
31 | bfd_size_type size; | ||
32 | struct a2l_data *a2l = data; | ||
33 | + flagword flags; | ||
34 | |||
35 | if (a2l->found) | ||
36 | return; | ||
37 | |||
38 | - if ((bfd_get_section_flags(abfd, section) & SEC_ALLOC) == 0) | ||
39 | +#ifdef bfd_get_section_flags | ||
40 | + flags = bfd_get_section_flags(abfd, section); | ||
41 | +#else | ||
42 | + flags = bfd_section_flags(section); | ||
43 | +#endif | ||
44 | + if ((flags & SEC_ALLOC) == 0) | ||
45 | return; | ||
46 | |||
47 | pc = a2l->addr; | ||
48 | +#ifdef bfd_get_section_vma | ||
49 | vma = bfd_get_section_vma(abfd, section); | ||
50 | +#else | ||
51 | + vma = bfd_section_vma(section); | ||
52 | +#endif | ||
53 | +#ifdef bfd_get_section_size | ||
54 | size = bfd_get_section_size(section); | ||
55 | +#else | ||
56 | + size = bfd_section_size(section); | ||
57 | +#endif | ||
58 | |||
59 | if (pc < vma || pc >= vma + size) | ||
60 | 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 @@ | |||
1 | require linux-intel.inc | ||
2 | |||
3 | KBRANCH = "4.19/base" | ||
4 | KMETA_BRANCH = "yocto-4.19" | ||
5 | |||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" | ||
7 | |||
8 | SRC_URI_append = " file://perf-fix-build-with-binutils.patch" | ||
9 | SRC_URI_append = " file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch" | ||
10 | |||
11 | DEPENDS += "elfutils-native openssl-native util-linux-native" | ||
12 | |||
13 | LINUX_VERSION ?= "4.19.106" | ||
14 | SRCREV_machine ?= "8ef641c89e3c2ff303eb362a7b77760dd2ed7e69" | ||
15 | SRCREV_meta ?= "7cb520d405cd5ca8f21a333941fbc0861bbb36b0" | ||
16 | |||
17 | # For Crystalforest and Romley | ||
18 | KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " uio" | ||
19 | KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " uio" | ||
20 | |||
21 | # Functionality flags | ||
22 | KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/security/security.scc" | ||