summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Barker <pbarker@konsulko.com>2020-11-25 15:41:53 +0000
committerAndrei Gherzan <andrei@gherzan.ro>2020-11-27 14:29:55 +0000
commit2afeee9b82f670b8a3d24a66d31381131555b5d4 (patch)
treed189ebd321859ca7b3b688494b1474592e120f87
parentba3a417fbbccb5f6af9ac036eac97c87dcf4c1b7 (diff)
downloadmeta-raspberrypi-2afeee9b82f670b8a3d24a66d31381131555b5d4.tar.gz
linux-raspberrypi: Remove obsolete kernel versions
Signed-off-by: Paul Barker <pbarker@konsulko.com>
-rw-r--r--recipes-kernel/linux/files/0001-menuconfig-check-lxdiaglog.sh-Allow-specification-of.patch62
-rw-r--r--recipes-kernel/linux/files/0001-perf-Make-perf-able-to-build-with-latest-libbfd.patch57
-rw-r--r--recipes-kernel/linux/files/0001-selftest-bpf-Use-CHECK-macro-instead-of-RET_IF.patch40
-rw-r--r--recipes-kernel/linux/linux-raspberrypi-rt_4.14.bb9
-rw-r--r--recipes-kernel/linux/linux-raspberrypi-rt_4.19.bb6
-rw-r--r--recipes-kernel/linux/linux-raspberrypi_4.14.bb9
-rw-r--r--recipes-kernel/linux/linux-raspberrypi_4.19.bb10
-rw-r--r--recipes-kernel/linux/linux-raspberrypi_4.19.inc12
8 files changed, 0 insertions, 205 deletions
diff --git a/recipes-kernel/linux/files/0001-menuconfig-check-lxdiaglog.sh-Allow-specification-of.patch b/recipes-kernel/linux/files/0001-menuconfig-check-lxdiaglog.sh-Allow-specification-of.patch
deleted file mode 100644
index a9e9213..0000000
--- a/recipes-kernel/linux/files/0001-menuconfig-check-lxdiaglog.sh-Allow-specification-of.patch
+++ /dev/null
@@ -1,62 +0,0 @@
1From e6ebc8e654bba53f28af5229a1069fc74fa58b7b Mon Sep 17 00:00:00 2001
2From: Jason Wessel <jason.wessel@windriver.com>
3Date: Thu, 25 Sep 2014 11:26:49 -0700
4Subject: [PATCH] menuconfig,check-lxdiaglog.sh: Allow specification of ncurses
5 location
6
7In some cross build environments such as the Yocto Project build
8environment it provides an ncurses library that is compiled
9differently than the host's version. This causes display corruption
10problems when the host's curses includes are used instead of the
11includes from the provided compiler are overridden. There is a second
12case where there is no curses libraries at all on the host system and
13menuconfig will just fail entirely.
14
15The solution is simply to allow an override variable in
16check-lxdialog.sh for environments such as the Yocto Project. Adding
17a CROSS_CURSES_LIB and CROSS_CURSES_INC solves the issue and allowing
18compiling and linking against the right headers and libraries.
19
20Upstream-Status: submitted [https://lkml.org/lkml/2013/3/3/103]
21
22Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
23cc: Michal Marek <mmarek@suse.cz>
24cc: linux-kbuild@vger.kernel.org
25Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
26Signed-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
32diff --git a/scripts/kconfig/lxdialog/check-lxdialog.sh b/scripts/kconfig/lxdialog/check-lxdialog.sh
33old mode 100755
34new mode 100644
35index 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--
612.14.3
62
diff --git a/recipes-kernel/linux/files/0001-perf-Make-perf-able-to-build-with-latest-libbfd.patch b/recipes-kernel/linux/files/0001-perf-Make-perf-able-to-build-with-latest-libbfd.patch
deleted file mode 100644
index e0e7b85..0000000
--- a/recipes-kernel/linux/files/0001-perf-Make-perf-able-to-build-with-latest-libbfd.patch
+++ /dev/null
@@ -1,57 +0,0 @@
1From e66a0be4fac135d67ab228a6fd1453b9e36a3644 Mon Sep 17 00:00:00 2001
2From: Changbin Du <changbin.du@gmail.com>
3Date: Tue, 28 Jan 2020 23:29:38 +0800
4Subject: [PATCH] perf: Make perf able to build with latest libbfd
5
6libbfd has changed the bfd_section_* macros to inline functions
7bfd_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
11This fix make perf able to build with both old and new libbfd.
12
13Signed-off-by: Changbin Du <changbin.du@gmail.com>
14Acked-by: Jiri Olsa <jolsa@redhat.com>
15Cc: Peter Zijlstra <peterz@infradead.org>
16Link: http://lore.kernel.org/lkml/20200128152938.31413-1-changbin.du@gmail.com
17Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
18---
19 tools/perf/util/srcline.c | 16 +++++++++++++++-
20 1 file changed, 15 insertions(+), 1 deletion(-)
21
22diff --git a/tools/perf/util/srcline.c b/tools/perf/util/srcline.c
23index af3f9b9f1e8b..b8e77617fdc4 100644
24--- a/tools/perf/util/srcline.c
25+++ b/tools/perf/util/srcline.c
26@@ -191,16 +191,30 @@ static void find_address_in_section(bfd *abfd, asection *section, void *data)
27 bfd_vma pc, vma;
28 bfd_size_type size;
29 struct a2l_data *a2l = data;
30+ flagword flags;
31
32 if (a2l->found)
33 return;
34
35- if ((bfd_get_section_flags(abfd, section) & SEC_ALLOC) == 0)
36+#ifdef bfd_get_section_flags
37+ flags = bfd_get_section_flags(abfd, section);
38+#else
39+ flags = bfd_section_flags(section);
40+#endif
41+ if ((flags & SEC_ALLOC) == 0)
42 return;
43
44 pc = a2l->addr;
45+#ifdef bfd_get_section_vma
46 vma = bfd_get_section_vma(abfd, section);
47+#else
48+ vma = bfd_section_vma(section);
49+#endif
50+#ifdef bfd_get_section_size
51 size = bfd_get_section_size(section);
52+#else
53+ size = bfd_section_size(section);
54+#endif
55
56 if (pc < vma || pc >= vma + size)
57 return;
diff --git a/recipes-kernel/linux/files/0001-selftest-bpf-Use-CHECK-macro-instead-of-RET_IF.patch b/recipes-kernel/linux/files/0001-selftest-bpf-Use-CHECK-macro-instead-of-RET_IF.patch
deleted file mode 100644
index 1828934..0000000
--- a/recipes-kernel/linux/files/0001-selftest-bpf-Use-CHECK-macro-instead-of-RET_IF.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1From 4cd12df48b83cef9cc7d6b80b128afbf68746718 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 14 Mar 2020 07:31:34 -0700
4Subject: [PATCH] selftest/bpf: Use CHECK macro instead of RET_IF
5
6backporting 634efb750435d0a489dc58477d4fcb88b2692942 causes build
7failures because RET_IF is defined in 7ee0d4e97b889c0478af9c1a6e5af658b181423f
8but that is not backported
9
10Upstream-Status: Submitted
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12Cc: Jakub Sitnicki <jakub@cloudflare.com>
13Cc: Alexei Starovoitov <ast@kernel.org>
14Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
15---
16 tools/testing/selftests/bpf/test_select_reuseport.c | 4 ++--
17 1 file changed, 2 insertions(+), 2 deletions(-)
18
19diff --git a/tools/testing/selftests/bpf/test_select_reuseport.c b/tools/testing/selftests/bpf/test_select_reuseport.c
20index 079d0f5a2909..7e4c91f2238d 100644
21--- a/tools/testing/selftests/bpf/test_select_reuseport.c
22+++ b/tools/testing/selftests/bpf/test_select_reuseport.c
23@@ -668,12 +668,12 @@ static void cleanup_per_test(void)
24
25 for (i = 0; i < NR_RESULTS; i++) {
26 err = bpf_map_update_elem(result_map, &i, &zero, BPF_ANY);
27- RET_IF(err, "reset elem in result_map",
28+ CHECK(err, "reset elem in result_map",
29 "i:%u err:%d errno:%d\n", i, err, errno);
30 }
31
32 err = bpf_map_update_elem(linum_map, &zero, &zero, BPF_ANY);
33- RET_IF(err, "reset line number in linum_map", "err:%d errno:%d\n",
34+ CHECK(err, "reset line number in linum_map", "err:%d errno:%d\n",
35 err, errno);
36
37 for (i = 0; i < REUSEPORT_ARRAY_SIZE; i++)
38--
392.26.0
40
diff --git a/recipes-kernel/linux/linux-raspberrypi-rt_4.14.bb b/recipes-kernel/linux/linux-raspberrypi-rt_4.14.bb
deleted file mode 100644
index 224bc6d..0000000
--- a/recipes-kernel/linux/linux-raspberrypi-rt_4.14.bb
+++ /dev/null
@@ -1,9 +0,0 @@
1LINUX_VERSION ?= "4.14.91"
2
3SRCREV = "0b520d5f1f580d36a742a9457a5673fa1578fff3"
4SRC_URI = " \
5 git://github.com/raspberrypi/linux.git;branch=rpi-4.14.y-rt \
6 file://0001-menuconfig-check-lxdiaglog.sh-Allow-specification-of.patch \
7 "
8
9require linux-raspberrypi.inc
diff --git a/recipes-kernel/linux/linux-raspberrypi-rt_4.19.bb b/recipes-kernel/linux/linux-raspberrypi-rt_4.19.bb
deleted file mode 100644
index 2d9363f..0000000
--- a/recipes-kernel/linux/linux-raspberrypi-rt_4.19.bb
+++ /dev/null
@@ -1,6 +0,0 @@
1LINUX_VERSION ?= "4.19.71"
2LINUX_RPI_BRANCH ?= "rpi-4.19.y-rt"
3
4SRCREV = "e2e9cec6fb061ba58304fd391ef76747f2963557"
5
6require linux-raspberrypi_4.19.inc
diff --git a/recipes-kernel/linux/linux-raspberrypi_4.14.bb b/recipes-kernel/linux/linux-raspberrypi_4.14.bb
deleted file mode 100644
index 03710ed..0000000
--- a/recipes-kernel/linux/linux-raspberrypi_4.14.bb
+++ /dev/null
@@ -1,9 +0,0 @@
1LINUX_VERSION ?= "4.14.114"
2
3SRCREV = "7688b39276ff9952df381d79de63b258e73971ce"
4SRC_URI = " \
5 git://github.com/raspberrypi/linux.git;branch=rpi-4.14.y \
6 file://0001-menuconfig-check-lxdiaglog.sh-Allow-specification-of.patch \
7 "
8
9require linux-raspberrypi.inc
diff --git a/recipes-kernel/linux/linux-raspberrypi_4.19.bb b/recipes-kernel/linux/linux-raspberrypi_4.19.bb
deleted file mode 100644
index 93a29f0..0000000
--- a/recipes-kernel/linux/linux-raspberrypi_4.19.bb
+++ /dev/null
@@ -1,10 +0,0 @@
1LINUX_VERSION ?= "4.19.126"
2LINUX_RPI_BRANCH ?= "rpi-4.19.y"
3
4SRCREV = "f6b3ac28f0a9137d4c24c0b8832e693bbd16f5b7"
5
6require linux-raspberrypi_4.19.inc
7
8SRC_URI += "file://0001-perf-Make-perf-able-to-build-with-latest-libbfd.patch \
9 file://0001-selftest-bpf-Use-CHECK-macro-instead-of-RET_IF.patch \
10 "
diff --git a/recipes-kernel/linux/linux-raspberrypi_4.19.inc b/recipes-kernel/linux/linux-raspberrypi_4.19.inc
deleted file mode 100644
index d6c1223..0000000
--- a/recipes-kernel/linux/linux-raspberrypi_4.19.inc
+++ /dev/null
@@ -1,12 +0,0 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/linux-raspberrypi:"
2
3SRC_URI = " \
4 git://github.com/raspberrypi/linux.git;branch=${LINUX_RPI_BRANCH} \
5 "
6SRC_URI_append_raspberrypi4-64 = " file://rpi4-64-kernel-misc.cfg"
7
8require linux-raspberrypi.inc
9
10LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
11
12KERNEL_EXTRA_ARGS_append_rpi = " DTC_FLAGS='-@ -H epapr'"