From 8c5809ebbb9020ac5867d25a05120a87b9da5e2c Mon Sep 17 00:00:00 2001 From: Paul Barker Date: Wed, 25 Nov 2020 15:49:10 +0000 Subject: [PATCH] linux-raspberrypi: Merge v5.4 recipe & inc file There is no need for a separate inc file for the v5.4 kernel recipe. Variable assignments are simplified where possible after merging. Signed-off-by: Paul Barker --- recipes-kernel/linux/linux-raspberrypi_5.4.bb | 21 +++++++++++++------ .../linux/linux-raspberrypi_5.4.inc | 14 ------------- 2 files changed, 15 insertions(+), 20 deletions(-) delete mode 100644 recipes-kernel/linux/linux-raspberrypi_5.4.inc diff --git a/recipes-kernel/linux/linux-raspberrypi_5.4.bb b/recipes-kernel/linux/linux-raspberrypi_5.4.bb index b75a63a..1d04c2f 100644 --- a/recipes-kernel/linux/linux-raspberrypi_5.4.bb +++ b/recipes-kernel/linux/linux-raspberrypi_5.4.bb @@ -4,10 +4,19 @@ LINUX_RPI_BRANCH ?= "rpi-5.4.y" SRCREV_machine = "9797f1a4938c20139b00a25de93cc99efb5c291b" SRCREV_meta = "5d52d9eea95fa09d404053360c2351b2b91b323b" -require linux-raspberrypi_5.4.inc +KMETA = "kernel-meta" -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://powersave.cfg \ - file://android-drivers.cfg \ - " +SRC_URI = " \ + git://github.com/raspberrypi/linux.git;name=machine;branch=${LINUX_RPI_BRANCH} \ + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA} \ + 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://powersave.cfg \ + file://android-drivers.cfg \ + " + +require linux-raspberrypi.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" + +KERNEL_EXTRA_ARGS += "DTC_FLAGS='-@ -H epapr'" diff --git a/recipes-kernel/linux/linux-raspberrypi_5.4.inc b/recipes-kernel/linux/linux-raspberrypi_5.4.inc deleted file mode 100644 index 205d0b7..0000000 --- a/recipes-kernel/linux/linux-raspberrypi_5.4.inc +++ /dev/null @@ -1,14 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/linux-raspberrypi:" - -KMETA = "kernel-meta" - -SRC_URI = " \ - git://github.com/raspberrypi/linux.git;name=machine;branch=${LINUX_RPI_BRANCH} \ - git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA} \ - " - -require linux-raspberrypi.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" - -KERNEL_EXTRA_ARGS_append_rpi = " DTC_FLAGS='-@ -H epapr'"