diff --git a/conf/machine/include/radxa-zero-3.inc b/conf/machine/include/radxa-zero-3.inc index 1c6f972..b351afa 100644 --- a/conf/machine/include/radxa-zero-3.inc +++ b/conf/machine/include/radxa-zero-3.inc @@ -2,7 +2,7 @@ MACHINEOVERRIDES =. "radxa-zero-3:" require conf/machine/include/rk3566.inc -PREFERRED_PROVIDER_virtual/kernel = "linux-torvalds-next" +PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-dev" MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" UBOOT_MACHINE = "radxa-zero-3-rk3566_defconfig" diff --git a/dynamic-layers/rk-rauc-demo/recipes-kernel/linux/linux-torvalds-next_%.bbappend b/dynamic-layers/rk-rauc-demo/recipes-kernel/linux/linux-yocto-dev.bbappend similarity index 100% rename from dynamic-layers/rk-rauc-demo/recipes-kernel/linux/linux-torvalds-next_%.bbappend rename to dynamic-layers/rk-rauc-demo/recipes-kernel/linux/linux-yocto-dev.bbappend diff --git a/recipes-kernel/linux/linux-torvalds-next_git.bb b/recipes-kernel/linux/linux-torvalds-next_git.bb deleted file mode 100644 index b961b14..0000000 --- a/recipes-kernel/linux/linux-torvalds-next_git.bb +++ /dev/null @@ -1,25 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/linux-yocto-dev:" - -DESCRIPTION = "Linux Kernel" -SECTION = "kernel" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" - -ERROR_QA:remove = "buildpaths" -DEFAULT_PREFERENCE = "-1" -COMPATIBLE_MACHINE = "^$" -COMPATIBLE_MACHINE:radxa-zero-3 = "radxa-zero-3" - -LINUX_VERSION = "6.11-rc6" -KERNEL_VERSION_SANITY_SKIP = "1" -PV = "${LINUX_VERSION}+git${SRCPV}" -SRC_URI = " \ - git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git;protocol=https;nobranch=1 \ - file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta \ - " -# this is tag 'next-20240904' -SRCREV = "fdadd93817f124fd0ea6ef251d4a1068b7feceba" - -inherit kernel -inherit kernel-yocto -require recipes-kernel/linux/linux-yocto.inc diff --git a/recipes-kernel/linux/linux-yocto-dev.bbappend b/recipes-kernel/linux/linux-yocto-dev.bbappend index b6a63d7..f738d13 100644 --- a/recipes-kernel/linux/linux-yocto-dev.bbappend +++ b/recipes-kernel/linux/linux-yocto-dev.bbappend @@ -1,5 +1,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" COMPATIBLE_MACHINE:orangepi-5-plus = "orangepi-5-plus" +COMPATIBLE_MACHINE:radxa-zero-3 = "radxa-zero-3" SRC_URI:append:orangepi-5-plus = " file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta" +SRC_URI:append:radxa-zero-3 = " file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta"