diff options
| author | Andrew Geissler <geissonator@yahoo.com> | 2020-06-27 08:13:56 +0300 |
|---|---|---|
| committer | Andrew Geissler <geissonator@yahoo.com> | 2020-06-27 08:14:12 +0300 |
| commit | 4fc9e431d19fba76d604f05afd8b9f478d30f462 (patch) | |
| tree | c10d3341dae23968fef480f4698270ff1e1d65b6 /meta-raspberrypi/recipes-kernel | |
| parent | 84ad7c5b112283d1ccb14744025a2d2ba986412d (diff) | |
| download | openbmc-4fc9e431d19fba76d604f05afd8b9f478d30f462.tar.xz | |
meta-raspberrypi: subtree update:39cf54c3cb..a6f1233d52
Jon Magnuson (1):
packagegroup-rpi-test: resolve `wireless-regdb` conflict
Khem Raj (1):
linux-raspberrypi_5.4.bb: Upgrade to 5.4.47
Leon Anavi (7):
lirc_%.bbappend: Fix for gpio-ir
lirc: Move to dynamic-layers
rpi-config: Add ENABLE_IR variable for infrared
rpi-base.inc: Include modules if IR is enabled
lirc_%.bbappend: Use lircd.service as in Raspbian
docs/extra-build-config.md: Infrared
lirc: Rename bbappend to match only version 0.10.1
M. ter Woord (1):
Update layer-contents.md to include pi4
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I6f20c20dec1dd2fdab9e4e52dea1cdd54be4fffc
Diffstat (limited to 'meta-raspberrypi/recipes-kernel')
| -rw-r--r-- | meta-raspberrypi/recipes-kernel/linux/files/0001-Revert-selftests-bpf-Skip-perf-hw-events-test-if-the.patch | 16 | ||||
| -rw-r--r-- | meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.4.bb | 8 |
2 files changed, 12 insertions, 12 deletions
diff --git a/meta-raspberrypi/recipes-kernel/linux/files/0001-Revert-selftests-bpf-Skip-perf-hw-events-test-if-the.patch b/meta-raspberrypi/recipes-kernel/linux/files/0001-Revert-selftests-bpf-Skip-perf-hw-events-test-if-the.patch index 59183dc30..66efde138 100644 --- a/meta-raspberrypi/recipes-kernel/linux/files/0001-Revert-selftests-bpf-Skip-perf-hw-events-test-if-the.patch +++ b/meta-raspberrypi/recipes-kernel/linux/files/0001-Revert-selftests-bpf-Skip-perf-hw-events-test-if-the.patch @@ -1,16 +1,18 @@ -From a7783676c60dd90a6f4c26bcb9be03dc5703b74e Mon Sep 17 00:00:00 2001 +From 754e3030788702c1f013a88a4fc8546742d84e27 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 13 Apr 2020 11:25:32 -0700 -Subject: [PATCH 1/2] Revert "selftests/bpf: Skip perf hw events test if the - setup disabled it" +Date: Thu, 18 Jun 2020 13:45:04 -0700 +Subject: [PATCH] Revert "selftests/bpf: Skip perf hw events test if the setup + disabled it" This reverts commit da43712a7262891317883d4b3a909fb18dac4b1d. + +Signed-off-by: Khem Raj <raj.khem@gmail.com> --- .../selftests/bpf/prog_tests/stacktrace_build_id_nmi.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c b/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c -index 1735faf17536..f62aa0eb959b 100644 +index 437cb93e72ac..f62aa0eb959b 100644 --- a/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c +++ b/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c @@ -49,12 +49,8 @@ void test_stacktrace_build_id_nmi(void) @@ -20,7 +22,7 @@ index 1735faf17536..f62aa0eb959b 100644 - if (pmu_fd < 0 && errno == ENOENT) { - printf("%s:SKIP:no PERF_COUNT_HW_CPU_CYCLES\n", __func__); - test__skip(); -- goto cleanup; +- goto close_prog; - } - if (CHECK(pmu_fd < 0, "perf_event_open", "err %d errno %d\n", + if (CHECK(pmu_fd < 0, "perf_event_open", @@ -29,5 +31,5 @@ index 1735faf17536..f62aa0eb959b 100644 goto close_prog; -- -2.26.0 +2.27.0 diff --git a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.4.bb b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.4.bb index b1881a28f..aaf228e0a 100644 --- a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.4.bb +++ b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.4.bb @@ -1,13 +1,11 @@ -LINUX_VERSION ?= "5.4.45" +LINUX_VERSION ?= "5.4.47" LINUX_RPI_BRANCH ?= "rpi-5.4.y" -SRCREV = "d00cdd80abb2a8c201cae2f6bd80e27eb2f7d347" +SRCREV = "dec0ddc506ab5d93a7de4b8a7c8dc98e0a96f85c" require linux-raspberrypi_5.4.inc -SRC_URI += "file://0001-perf-Make-perf-able-to-build-with-latest-libbfd.patch \ - file://0001-Revert-selftests-bpf-Skip-perf-hw-events-test-if-the.patch \ +SRC_URI += "file://0001-Revert-selftests-bpf-Skip-perf-hw-events-test-if-the.patch \ file://0002-Revert-selftests-bpf-Fix-perf_buffer-test-on-systems.patch \ - file://0001-selftest-bpf-Use-CHECK-macro-instead-of-RET_IF.patch \ file://powersave.cfg \ " |