The latest updates to linux-yocto-dev now include support for the rock-pi-e so do away with our custom recipe and use the one from oe-core.
Signed-off-by: Trevor Woerner <[email protected]> --- conf/machine/rock-pi-e.conf | 2 +- .../linux/linux-stable-bleeding_5.11.bb | 18 ------------------ recipes-kernel/linux/linux-yocto%.bbappend | 1 + 3 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 recipes-kernel/linux/linux-stable-bleeding_5.11.bb diff --git a/conf/machine/rock-pi-e.conf b/conf/machine/rock-pi-e.conf index 7afe143..9cd3ed4 100644 --- a/conf/machine/rock-pi-e.conf +++ b/conf/machine/rock-pi-e.conf @@ -7,7 +7,7 @@ require conf/machine/include/rk3328.inc MACHINEOVERRIDES =. "rock-pi-e:" -PREFERRED_PROVIDER_virtual/kernel = "linux-stable-bleeding" +PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-dev" KERNEL_DEVICETREE = "rockchip/rk3328-rock-pi-e.dtb" MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" diff --git a/recipes-kernel/linux/linux-stable-bleeding_5.11.bb b/recipes-kernel/linux/linux-stable-bleeding_5.11.bb deleted file mode 100644 index 508ddae..0000000 --- a/recipes-kernel/linux/linux-stable-bleeding_5.11.bb +++ /dev/null @@ -1,18 +0,0 @@ -# the rock-pi-e is very new -# it's exciting that support has already been added upstream -# but it's so new that even linux-yocto-dev doesn't have it yet -# -# in time we should see the need for this recipe going away - -inherit kernel -require recipes-kernel/linux/linux-yocto.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" - -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git" -SRCREV = "c03c21ba6f4e95e406a1a7b4c34ef334b977c194" -LINUX_VERSION = "5.11" -LINUX_VERSION_EXTENSION = "" -PV = "${LINUX_VERSION}" - -COMPATIBLE_MACHINE_rock-pi-e = "rock-pi-e" diff --git a/recipes-kernel/linux/linux-yocto%.bbappend b/recipes-kernel/linux/linux-yocto%.bbappend index 3789c72..c2fe9ad 100644 --- a/recipes-kernel/linux/linux-yocto%.bbappend +++ b/recipes-kernel/linux/linux-yocto%.bbappend @@ -9,6 +9,7 @@ COMPATIBLE_MACHINE_rock-pi-4 = "rock-pi-4" COMPATIBLE_MACHINE_nanopi-m4 = "nanopi-m4" COMPATIBLE_MACHINE_nanopi-m4-2gb = "nanopi-m4-2gb" COMPATIBLE_MACHINE_rock64 = "rock64" +COMPATIBLE_MACHINE_rock-pi-e = "rock-pi-e" FILESEXTRAPATHS_prepend := "${THISDIR}/files:" -- 2.30.0.rc0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#54122): https://lists.yoctoproject.org/g/yocto/message/54122 Mute This Topic: https://lists.yoctoproject.org/mt/84191278/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
