[meta-rockchip][PATCH] kernel overrides

[meta-rockchip][PATCH] kernel overrides

[Trevor Woerner]

Add a :rockchip override to the kernel SRC_URI appends to play nicely when
multiple BSP layers are used together in the same build.

Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
 recipes-kernel/linux/linux-yocto-dev.bbappend | 2 +-
 recipes-kernel/linux/linux-yocto_%.bbappend   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-kernel/linux/linux-yocto-dev.bbappend b/recipes-kernel/linux/linux-yocto-dev.bbappend
index e06c8a4f717d..67a16b4d67ff 100644
--- a/recipes-kernel/linux/linux-yocto-dev.bbappend
+++ b/recipes-kernel/linux/linux-yocto-dev.bbappend
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-SRC_URI:append = " file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta"
+SRC_URI:append:rockchip = " file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta"
diff --git a/recipes-kernel/linux/linux-yocto_%.bbappend b/recipes-kernel/linux/linux-yocto_%.bbappend
index f0fbe57955e1..75de6110c228 100644
--- a/recipes-kernel/linux/linux-yocto_%.bbappend
+++ b/recipes-kernel/linux/linux-yocto_%.bbappend
@@ -30,5 +30,5 @@ COMPATIBLE_MACHINE:rock-pi-s = "rock-pi-s"
 COMPATIBLE_MACHINE:rock64 = "rock64"
 COMPATIBLE_MACHINE:soquartz = "soquartz"
 
-SRC_URI:append = " file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta"
+SRC_URI:append:rockchip = " file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta"
 SRC_URI:append:nanopi-r4s = " file://nanopi-r4s.scc"
-- 
2.44.0.501.g19981daefd7c

Re: [yocto-patches] [meta-rockchip][PATCH] kernel overrides

[Quentin Schulz]

Hi Trevor,

On 9/2/25 2:54 PM, Trevor Woerner via lists.yoctoproject.org wrote:
> Add a :rockchip override to the kernel SRC_URI appends to play nicely when
> multiple BSP layers are used together in the same build.
> 
> Signed-off-by: Trevor Woerner <twoerner@gmail.com>
> ---
>   recipes-kernel/linux/linux-yocto-dev.bbappend | 2 +-
>   recipes-kernel/linux/linux-yocto_%.bbappend   | 2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/recipes-kernel/linux/linux-yocto-dev.bbappend b/recipes-kernel/linux/linux-yocto-dev.bbappend
> index e06c8a4f717d..67a16b4d67ff 100644
> --- a/recipes-kernel/linux/linux-yocto-dev.bbappend
> +++ b/recipes-kernel/linux/linux-yocto-dev.bbappend
> @@ -1,3 +1,3 @@
>   FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
>   
> -SRC_URI:append = " file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta"

I would have preferred to not have this "broken" code make it to the 
master branch in the first place though :)

> +SRC_URI:append:rockchip = " file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta"
> diff --git a/recipes-kernel/linux/linux-yocto_%.bbappend b/recipes-kernel/linux/linux-yocto_%.bbappend
> index f0fbe57955e1..75de6110c228 100644
> --- a/recipes-kernel/linux/linux-yocto_%.bbappend
> +++ b/recipes-kernel/linux/linux-yocto_%.bbappend
> @@ -30,5 +30,5 @@ COMPATIBLE_MACHINE:rock-pi-s = "rock-pi-s"
>   COMPATIBLE_MACHINE:rock64 = "rock64"
>   COMPATIBLE_MACHINE:soquartz = "soquartz"
>   
> -SRC_URI:append = " file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta"
> +SRC_URI:append:rockchip = " file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta"
>   SRC_URI:append:nanopi-r4s = " file://nanopi-r4s.scc"

Reviewed-by: Quentin Schulz <quentin.schulz@cherry.de>

Thanks!
Quentin

Re: [meta-rockchip][PATCH] kernel overrides

[Trevor Woerner]

On Tue 2025-09-02 @ 08:54:35 AM, Trevor Woerner wrote:
> Add a :rockchip override to the kernel SRC_URI appends to play nicely when
> multiple BSP layers are used together in the same build.
> 
> Signed-off-by: Trevor Woerner <twoerner@gmail.com>
> ---
>  recipes-kernel/linux/linux-yocto-dev.bbappend | 2 +-
>  recipes-kernel/linux/linux-yocto_%.bbappend   | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)

Applied to meta-rockchip, master branch.