diff mbox series

[meta-rockchip,1/5] kmeta reorganization

Message ID 20251219070014.39432-1-twoerner@gmail.com
State New
Headers show
Series [meta-rockchip,1/5] kmeta reorganization | expand

Commit Message

Trevor Woerner Dec. 19, 2025, 7 a.m. UTC 
Reorganize the rockchip kmeta data so linux-yocto and linux-yocto-dev
share the same files.

Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
 .../realtek-r8169.cfg                         |  0
 .../rockchip/remove-non-rockchip-arch-arm.cfg |  0
 .../rockchip/remove-non-rockchip-arch-arm.scc |  0
 .../remove-non-rockchip-arch-arm64.cfg        |  0
 .../remove-non-rockchip-arch-arm64.scc        |  0
 recipes-kernel/linux/linux-yocto-dev.bbappend |  2 +-
 .../rockchip/remove-non-rockchip-arch-arm.cfg | 85 -------------------
 .../rockchip/remove-non-rockchip-arch-arm.scc |  1 -
 .../remove-non-rockchip-arch-arm64.cfg        | 62 --------------
 .../remove-non-rockchip-arch-arm64.scc        |  1 -
 recipes-kernel/linux/linux-yocto_%.bbappend   |  2 +-
 11 files changed, 2 insertions(+), 151 deletions(-)
 rename recipes-kernel/linux/{linux-yocto => linux-rockchip}/realtek-r8169.cfg (100%)
 rename recipes-kernel/linux/{linux-yocto-dev => linux-rockchip}/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.cfg (100%)
 rename recipes-kernel/linux/{linux-yocto-dev => linux-rockchip}/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.scc (100%)
 rename recipes-kernel/linux/{linux-yocto-dev => linux-rockchip}/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm64.cfg (100%)
 rename recipes-kernel/linux/{linux-yocto-dev => linux-rockchip}/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm64.scc (100%)
 delete mode 100644 recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.cfg
 delete mode 100644 recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.scc
 delete mode 100644 recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm64.cfg
 delete mode 100644 recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm64.scc

Comments

Trevor Woerner Dec. 19, 2025, 1:43 p.m. UTC | #1 
On Fri 2025-12-19 @ 02:00:11 AM, Trevor Woerner via lists.yoctoproject.org wrote:
> Consolidate the two bbappends for linux-yocto and linux-yocto-dev and
> provide the "guts" of the rockchip additions in an *inc file which could
> be used by other linux kernel recipes outside this layer when a rockchip
> machine is used.
> 
> Signed-off-by: Trevor Woerner <twoerner@gmail.com>
> ---
>  recipes-kernel/linux/linux-%.bbappend                          | 1 +
>  .../linux/{linux-yocto_%.bbappend => linux-rockchip.inc}       | 0
>  recipes-kernel/linux/linux-yocto-dev.bbappend                  | 3 ---
>  3 files changed, 1 insertion(+), 3 deletions(-)
>  create mode 100644 recipes-kernel/linux/linux-%.bbappend
>  rename recipes-kernel/linux/{linux-yocto_%.bbappend => linux-rockchip.inc} (100%)
>  delete mode 100644 recipes-kernel/linux/linux-yocto-dev.bbappend
> 
> diff --git a/recipes-kernel/linux/linux-%.bbappend b/recipes-kernel/linux/linux-%.bbappend
> new file mode 100644
> index 000000000000..34bf335d0b10
> --- /dev/null
> +++ b/recipes-kernel/linux/linux-%.bbappend

I considered this one for quite a while. I saw it in Bruce's
meta-virtualization and thought it was clever, but now that I've slept
on it, I think it's a bit too aggressive for meta-rockchip.

I think instead of 'linux-%.bbappend' maybe 'linux-yocto%.bbappend'? or
'linux-yocto_%.bbappend' would be better?

> @@ -0,0 +1 @@
> +require linux-rockchip.inc
> diff --git a/recipes-kernel/linux/linux-yocto_%.bbappend b/recipes-kernel/linux/linux-rockchip.inc
> similarity index 100%
> rename from recipes-kernel/linux/linux-yocto_%.bbappend
> rename to recipes-kernel/linux/linux-rockchip.inc
> diff --git a/recipes-kernel/linux/linux-yocto-dev.bbappend b/recipes-kernel/linux/linux-yocto-dev.bbappend
> deleted file mode 100644
> index 81d2b6d693c4..000000000000
> --- a/recipes-kernel/linux/linux-yocto-dev.bbappend
> +++ /dev/null
> @@ -1,3 +0,0 @@
> -FILESEXTRAPATHS:prepend := "${THISDIR}/linux-rockchip:"
> -
> -SRC_URI:append:rockchip = " file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta"
> -- 
> 2.50.0.173.g8b6f19ccfc3a
> 
> 
> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#2824): https://lists.yoctoproject.org/g/yocto-patches/message/2824
> Mute This Topic: https://lists.yoctoproject.org/mt/116856174/900817
> Group Owner: yocto-patches+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/yocto-patches/leave/13168745/900817/63955952/xyzzy [twoerner@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
> 
>
diff mbox series

Patch

diff --git a/recipes-kernel/linux/linux-yocto/realtek-r8169.cfg b/recipes-kernel/linux/linux-rockchip/realtek-r8169.cfg
similarity index 100%
rename from recipes-kernel/linux/linux-yocto/realtek-r8169.cfg
rename to recipes-kernel/linux/linux-rockchip/realtek-r8169.cfg
diff --git a/recipes-kernel/linux/linux-yocto-dev/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.cfg b/recipes-kernel/linux/linux-rockchip/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.cfg
similarity index 100%
rename from recipes-kernel/linux/linux-yocto-dev/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.cfg
rename to recipes-kernel/linux/linux-rockchip/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.cfg
diff --git a/recipes-kernel/linux/linux-yocto-dev/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.scc b/recipes-kernel/linux/linux-rockchip/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.scc
similarity index 100%
rename from recipes-kernel/linux/linux-yocto-dev/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.scc
rename to recipes-kernel/linux/linux-rockchip/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.scc
diff --git a/recipes-kernel/linux/linux-yocto-dev/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm64.cfg b/recipes-kernel/linux/linux-rockchip/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm64.cfg
similarity index 100%
rename from recipes-kernel/linux/linux-yocto-dev/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm64.cfg
rename to recipes-kernel/linux/linux-rockchip/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm64.cfg
diff --git a/recipes-kernel/linux/linux-yocto-dev/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm64.scc b/recipes-kernel/linux/linux-rockchip/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm64.scc
similarity index 100%
rename from recipes-kernel/linux/linux-yocto-dev/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm64.scc
rename to recipes-kernel/linux/linux-rockchip/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm64.scc
diff --git a/recipes-kernel/linux/linux-yocto-dev.bbappend b/recipes-kernel/linux/linux-yocto-dev.bbappend
index 67a16b4d67ff..81d2b6d693c4 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}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/linux-rockchip:"
 
 SRC_URI:append:rockchip = " file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta"
diff --git a/recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.cfg b/recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.cfg
deleted file mode 100644
index e9443f17895c..000000000000
--- a/recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.cfg
+++ /dev/null
@@ -1,85 +0,0 @@ 
-CONFIG_ARCH_ACTIONS=n
-CONFIG_ARCH_AIROHA=n
-CONFIG_ARCH_ALPINE=n
-CONFIG_ARCH_ARTPEC=n
-CONFIG_ARCH_ASPEED=n
-CONFIG_ARCH_AT91=n
-CONFIG_ARCH_BCM2835=n
-CONFIG_ARCH_BCM=n
-CONFIG_ARCH_BCMBCA=n
-CONFIG_ARCH_BCMBCA_BRAHMAB15=n
-CONFIG_ARCH_BCMBCA_CORTEXA7=n
-CONFIG_ARCH_BCMBCA_CORTEXA9=n
-CONFIG_ARCH_BCM_21664=n
-CONFIG_ARCH_BCM_23550=n
-CONFIG_ARCH_BCM_281XX=n
-CONFIG_ARCH_BCM_5301X=n
-CONFIG_ARCH_BCM_53573=n
-CONFIG_ARCH_BCM_CYGNUS=n
-CONFIG_ARCH_BCM_HR2=n
-CONFIG_ARCH_BCM_NSP=n
-CONFIG_ARCH_BERLIN=n
-CONFIG_ARCH_BRCMSTB=n
-CONFIG_ARCH_DIGICOLOR=n
-CONFIG_ARCH_EMEV2=n
-CONFIG_ARCH_EXYNOS=n
-CONFIG_ARCH_HI3xxx=n
-CONFIG_ARCH_HIGHBANK=n
-CONFIG_ARCH_HIP01=n
-CONFIG_ARCH_HIP04=n
-CONFIG_ARCH_HISI=n
-CONFIG_ARCH_HIX5HD2=n
-CONFIG_ARCH_HPE=n
-CONFIG_ARCH_HPE_GXP=n
-CONFIG_ARCH_INTEL_SOCFPGA=n
-CONFIG_ARCH_KEYSTONE=n
-CONFIG_ARCH_MEDIATEK=n
-CONFIG_ARCH_MESON=n
-CONFIG_ARCH_MILBEAUT=n
-CONFIG_ARCH_MILBEAUT_M10V=n
-CONFIG_ARCH_MMP=n
-CONFIG_ARCH_MSM8916=n
-CONFIG_ARCH_MSM8960=n
-CONFIG_ARCH_MSM8974=n
-CONFIG_ARCH_MSM8X60=n
-CONFIG_ARCH_MVEBU=n
-CONFIG_ARCH_MXC=n
-CONFIG_ARCH_OMAP3=n
-CONFIG_ARCH_OMAP4=n
-CONFIG_ARCH_QCOM=n
-CONFIG_ARCH_R7S72100=n
-CONFIG_ARCH_R7S9210=n
-CONFIG_ARCH_R8A73A4=n
-CONFIG_ARCH_R8A7740=n
-CONFIG_ARCH_R8A7742=n
-CONFIG_ARCH_R8A7743=n
-CONFIG_ARCH_R8A7744=n
-CONFIG_ARCH_R8A7745=n
-CONFIG_ARCH_R8A77470=n
-CONFIG_ARCH_R8A7778=n
-CONFIG_ARCH_R8A7779=n
-CONFIG_ARCH_R8A7790=n
-CONFIG_ARCH_R8A7791=n
-CONFIG_ARCH_R8A7792=n
-CONFIG_ARCH_R8A7793=n
-CONFIG_ARCH_R8A7794=n
-CONFIG_ARCH_R9A06G032=n
-CONFIG_ARCH_RENESAS=n
-CONFIG_ARCH_SH73A0=n
-CONFIG_ARCH_SPEAR13XX=n
-CONFIG_ARCH_STI=n
-CONFIG_ARCH_STM32=n
-CONFIG_ARCH_SUNPLUS=n
-CONFIG_ARCH_SUNXI=n
-CONFIG_ARCH_TEGRA=n
-CONFIG_ARCH_TEGRA_114_SOC=n
-CONFIG_ARCH_TEGRA_124_SOC=n
-CONFIG_ARCH_TEGRA_2x_SOC=n
-CONFIG_ARCH_TEGRA_3x_SOC=n
-CONFIG_ARCH_U8500=n
-CONFIG_ARCH_UNIPHIER=n
-CONFIG_ARCH_VEXPRESS=n
-CONFIG_ARCH_VEXPRESS_TC2_PM=n
-CONFIG_ARCH_VIRT=n
-CONFIG_ARCH_WM8850=n
-CONFIG_ARCH_ZYNQ=n
diff --git a/recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.scc b/recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.scc
deleted file mode 100644
index ce7770456ea4..000000000000
--- a/recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.scc
+++ /dev/null
@@ -1 +0,0 @@ 
-kconf hardware remove-non-rockchip-arch-arm.cfg
diff --git a/recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm64.cfg b/recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm64.cfg
deleted file mode 100644
index 597d47a424d2..000000000000
--- a/recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm64.cfg
+++ /dev/null
@@ -1,62 +0,0 @@ 
-CONFIG_ARCH_ACTIONS=n
-CONFIG_ARCH_ALPINE=n
-CONFIG_ARCH_APPLE=n
-CONFIG_ARCH_BCM2835=n
-CONFIG_ARCH_BCM=n
-CONFIG_ARCH_BCMBCA=n
-CONFIG_ARCH_BCM_IPROC=n
-CONFIG_ARCH_BERLIN=n
-CONFIG_ARCH_BRCMSTB=n
-CONFIG_ARCH_EXYNOS=n
-CONFIG_ARCH_HISI=n
-CONFIG_ARCH_INTEL_SOCFPGA=n
-CONFIG_ARCH_K3=n
-CONFIG_ARCH_KEEMBAY=n
-CONFIG_ARCH_LAYERSCAPE=n
-CONFIG_ARCH_LG1K=n
-CONFIG_ARCH_MEDIATEK=n
-CONFIG_ARCH_MESON=n
-CONFIG_ARCH_MVEBU=n
-CONFIG_ARCH_MXC=n
-CONFIG_ARCH_NPCM=n
-CONFIG_ARCH_NXP=n
-CONFIG_ARCH_QCOM=n
-CONFIG_ARCH_R8A774A1=n
-CONFIG_ARCH_R8A774B1=n
-CONFIG_ARCH_R8A774C0=n
-CONFIG_ARCH_R8A774E1=n
-CONFIG_ARCH_R8A77951=n
-CONFIG_ARCH_R8A77960=n
-CONFIG_ARCH_R8A77961=n
-CONFIG_ARCH_R8A77965=n
-CONFIG_ARCH_R8A77970=n
-CONFIG_ARCH_R8A77980=n
-CONFIG_ARCH_R8A77990=n
-CONFIG_ARCH_R8A77995=n
-CONFIG_ARCH_R8A779A0=n
-CONFIG_ARCH_R8A779F0=n
-CONFIG_ARCH_R8A779G0=n
-CONFIG_ARCH_R9A07G043=n
-CONFIG_ARCH_R9A07G044=n
-CONFIG_ARCH_R9A07G054=n
-CONFIG_ARCH_R9A09G011=n
-CONFIG_ARCH_RENESAS=n
-CONFIG_ARCH_S32=n
-CONFIG_ARCH_SEATTLE=n
-CONFIG_ARCH_SPRD=n
-CONFIG_ARCH_SUNXI=n
-CONFIG_ARCH_SYNQUACER=n
-CONFIG_ARCH_TEGRA=n
-CONFIG_ARCH_TEGRA_132_SOC=n
-CONFIG_ARCH_TEGRA_186_SOC=n
-CONFIG_ARCH_TEGRA_194_SOC=n
-CONFIG_ARCH_TEGRA_210_SOC=n
-CONFIG_ARCH_TEGRA_234_SOC=n
-CONFIG_ARCH_TESLA_FSD=n
-CONFIG_ARCH_THUNDER2=n
-CONFIG_ARCH_THUNDER=n
-CONFIG_ARCH_UNIPHIER=n
-CONFIG_ARCH_VEXPRESS=n
-CONFIG_ARCH_VISCONTI=n
-CONFIG_ARCH_XGENE=n
-CONFIG_ARCH_ZYNQMP=n
diff --git a/recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm64.scc b/recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm64.scc
deleted file mode 100644
index e169240f5067..000000000000
--- a/recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm64.scc
+++ /dev/null
@@ -1 +0,0 @@ 
-kconf hardware remove-non-rockchip-arch-arm64.cfg
diff --git a/recipes-kernel/linux/linux-yocto_%.bbappend b/recipes-kernel/linux/linux-yocto_%.bbappend
index 2dba3d70a3ca..a648ecb20679 100644
--- a/recipes-kernel/linux/linux-yocto_%.bbappend
+++ b/recipes-kernel/linux/linux-yocto_%.bbappend
@@ -1,4 +1,4 @@ 
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/linux-rockchip:"
 
 # 32-bit devices
 COMPATIBLE_MACHINE:firefly-rk3288 = "firefly-rk3288"