Skip to contentSkip to conversation

linux-yocto bbappend: sort

PATCH In review Trevor Woerner 2 participants 14 messages Aug 31, 2025 – Sep 2, 2025

lore
Share & tools
lore
#0 lore raw

PATCH 1/4 linux-yocto bbappend: sort

Separate the entires into lists of 32 vs 64 bit machines, then sort each list.

---
 recipes-kernel/linux/linux-yocto_%.bbappend | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)
recipes-kernel/linux/linux-yocto_%.bbappend +11 -10
index 56ec9d7ea81b..cd5efcf9d25c 100644
@@ -1,27 +1,28 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
+COMPATIBLE_MACHINE:firefly-rk3288 = "firefly-rk3288"
 COMPATIBLE_MACHINE:marsboard-rk3066 = "marsboard-rk3066"
-COMPATIBLE_MACHINE:rock2-square = "rock2-square"
 COMPATIBLE_MACHINE:radxarock = "radxarock"
-COMPATIBLE_MACHINE:firefly-rk3288 = "firefly-rk3288"
-COMPATIBLE_MACHINE:vyasa-rk3288 = "vyasa-rk3288"
+COMPATIBLE_MACHINE:rock2-square = "rock2-square"
 COMPATIBLE_MACHINE:tinker-board = "tinker-board"
 COMPATIBLE_MACHINE:tinker-board-s = "tinker-board-s"
-COMPATIBLE_MACHINE:rock-pi-4 = "rock-pi-4"
+COMPATIBLE_MACHINE:vyasa-rk3288 = "vyasa-rk3288"
+
 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"
-COMPATIBLE_MACHINE:nanopi-r4s = "nanopi-r4s"
-COMPATIBLE_MACHINE:nanopi-r2s = "nanopi-r2s"
 COMPATIBLE_MACHINE:nanopi-m4b = "nanopi-m4b"
-COMPATIBLE_MACHINE:rock-pi-s = "rock-pi-s"
-COMPATIBLE_MACHINE:roc-rk3328-cc = "roc-rk3328-cc"
+COMPATIBLE_MACHINE:nanopi-r2s = "nanopi-r2s"
+COMPATIBLE_MACHINE:nanopi-r4s = "nanopi-r4s"
 COMPATIBLE_MACHINE:roc-rk3308-cc = "roc-rk3308-cc"
+COMPATIBLE_MACHINE:roc-rk3328-cc = "roc-rk3328-cc"
 COMPATIBLE_MACHINE:rock-3a = "rock-3a"
 COMPATIBLE_MACHINE:rock-4c-plus = "rock-4c-plus"
 COMPATIBLE_MACHINE:rock-5a = "rock-5a"
 COMPATIBLE_MACHINE:rock-5b = "rock-5b"
+COMPATIBLE_MACHINE:rock-pi-4 = "rock-pi-4"
+COMPATIBLE_MACHINE:rock-pi-e = "rock-pi-e"
+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"
Signature · 1 line
2.44.0.501.g19981daefd7c
#1 lore raw

PATCH 2/4 radxa-zero-3: use non -dev kernel

Now that 6.16.y is the preferred version of the linux-yocto kernel, the radxa-zero-3 machine that had been using the linux-yocto-dev kernel can be switched to using the linux-yocto kernel instead.

---
 conf/machine/include/radxa-zero-3.inc         | 1 -
 recipes-kernel/linux/linux-yocto-dev.bbappend | 2 --
 recipes-kernel/linux/linux-yocto_%.bbappend   | 1 +
 3 files changed, 1 insertion(+), 3 deletions(-)
conf/machine/include/radxa-zero-3.inc +0 -1
index b351afae8c0f..b05a0872a511 100644
@@ -2,7 +2,6 @@ MACHINEOVERRIDES =. "radxa-zero-3:"
 
 require conf/machine/include/rk3566.inc
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-dev"
 MACHINE_EXTRA_RRECOMMENDS += "kernel-modules"
 
 UBOOT_MACHINE = "radxa-zero-3-rk3566_defconfig"
recipes-kernel/linux/linux-yocto-dev.bbappend +0 -2
index f49768ba57f1..b876a1cefedb 100644
@@ -1,9 +1,7 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 COMPATIBLE_MACHINE:orangepi-5-plus = "orangepi-5-plus"
-COMPATIBLE_MACHINE:radxa-zero-3 = "radxa-zero-3"
 COMPATIBLE_MACHINE:nanopc-t6 = "nanopc-t6"
 
 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"
 SRC_URI:append:nanopc-t6 = " file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta"
recipes-kernel/linux/linux-yocto_%.bbappend +1 -0
index cd5efcf9d25c..9d60e2641ec5 100644
@@ -13,6 +13,7 @@ COMPATIBLE_MACHINE:nanopi-m4-2gb = "nanopi-m4-2gb"
 COMPATIBLE_MACHINE:nanopi-m4b = "nanopi-m4b"
 COMPATIBLE_MACHINE:nanopi-r2s = "nanopi-r2s"
 COMPATIBLE_MACHINE:nanopi-r4s = "nanopi-r4s"
+COMPATIBLE_MACHINE:radxa-zero-3 = "radxa-zero-3"
 COMPATIBLE_MACHINE:roc-rk3308-cc = "roc-rk3308-cc"
 COMPATIBLE_MACHINE:roc-rk3328-cc = "roc-rk3328-cc"
 COMPATIBLE_MACHINE:rock-3a = "rock-3a"
Signature · 1 line
2.44.0.501.g19981daefd7c
#4 lore raw

PATCH 3/4 orangepi-5-plus: use non -dev kernel

In reply to Trevor Woerner

Now that 6.16.y is the preferred version of the linux-yocto kernel, the orangepi-5-plus machine that had been using the linux-yocto-dev kernel can be switched to using the linux-yocto kernel instead.

---
 conf/machine/orangepi-5-plus.conf             | 1 -
 recipes-kernel/linux/linux-yocto-dev.bbappend | 2 --
 recipes-kernel/linux/linux-yocto_%.bbappend   | 1 +
 3 files changed, 1 insertion(+), 3 deletions(-)
conf/machine/orangepi-5-plus.conf +0 -1
index 2731ff4d871d..a726b1c0ca67 100644
@@ -5,7 +5,6 @@
 
 require conf/machine/include/rk3588.inc
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-dev"
 KERNEL_DEVICETREE = "rockchip/rk3588-orangepi-5-plus.dtb"
 MACHINE_EXTRA_RRECOMMENDS += "kernel-modules"
 
recipes-kernel/linux/linux-yocto-dev.bbappend +0 -2
index b876a1cefedb..6f4981fe29e6 100644
@@ -1,7 +1,5 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-COMPATIBLE_MACHINE:orangepi-5-plus = "orangepi-5-plus"
 COMPATIBLE_MACHINE:nanopc-t6 = "nanopc-t6"
 
-SRC_URI:append:orangepi-5-plus = " file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta"
 SRC_URI:append:nanopc-t6 = " file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta"
recipes-kernel/linux/linux-yocto_%.bbappend +1 -0
index 9d60e2641ec5..45cfb1c10b48 100644
@@ -13,6 +13,7 @@ COMPATIBLE_MACHINE:nanopi-m4-2gb = "nanopi-m4-2gb"
 COMPATIBLE_MACHINE:nanopi-m4b = "nanopi-m4b"
 COMPATIBLE_MACHINE:nanopi-r2s = "nanopi-r2s"
 COMPATIBLE_MACHINE:nanopi-r4s = "nanopi-r4s"
+COMPATIBLE_MACHINE:orangepi-5-plus = "orangepi-5-plus"
 COMPATIBLE_MACHINE:radxa-zero-3 = "radxa-zero-3"
 COMPATIBLE_MACHINE:roc-rk3308-cc = "roc-rk3308-cc"
 COMPATIBLE_MACHINE:roc-rk3328-cc = "roc-rk3328-cc"
Signature · 1 line
2.44.0.501.g19981daefd7c
#7 lore raw

PATCH 4/4 nanopc-t6: use non -dev kernel

In reply to Trevor Woerner

Now that 6.16.y is the preferred version of the linux-yocto kernel, the nanopc-t6 machine that had been using the linux-yocto-dev kernel can be switched to using the linux-yocto kernel instead.

NOTE: keep the various pieces of linux-yocto-dev infrastructure in place
so it can be used more easily again should it be needed

---
 conf/machine/nanopc-t6.conf                   | 1 -
 recipes-kernel/linux/linux-yocto-dev.bbappend | 4 +---
 recipes-kernel/linux/linux-yocto_%.bbappend   | 1 +
 3 files changed, 2 insertions(+), 4 deletions(-)
conf/machine/nanopc-t6.conf +0 -1
index 5ed413d1c0e5..8d524bd764f6 100644
@@ -5,7 +5,6 @@
 
 require conf/machine/include/rk3588.inc
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-dev"
 KERNEL_DEVICETREE = " \
     rockchip/rk3588-nanopc-t6.dtb \
     rockchip/rk3588-nanopc-t6-lts.dtb \
recipes-kernel/linux/linux-yocto-dev.bbappend +1 -3
index 6f4981fe29e6..e06c8a4f717d 100644
@@ -1,5 +1,3 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-COMPATIBLE_MACHINE:nanopc-t6 = "nanopc-t6"
-
-SRC_URI:append:nanopc-t6 = " file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta"
+SRC_URI:append = " file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta"
recipes-kernel/linux/linux-yocto_%.bbappend +1 -0
index 45cfb1c10b48..470aeb8f16b1 100644
@@ -8,6 +8,7 @@ COMPATIBLE_MACHINE:tinker-board = "tinker-board"
 COMPATIBLE_MACHINE:tinker-board-s = "tinker-board-s"
 COMPATIBLE_MACHINE:vyasa-rk3288 = "vyasa-rk3288"
 
+COMPATIBLE_MACHINE:nanopc-t6 = "nanopc-t6"
 COMPATIBLE_MACHINE:nanopi-m4 = "nanopi-m4"
 COMPATIBLE_MACHINE:nanopi-m4-2gb = "nanopi-m4-2gb"
 COMPATIBLE_MACHINE:nanopi-m4b = "nanopi-m4b"
Signature · 1 line
2.44.0.501.g19981daefd7c
#8 lore raw

Re: [yocto-patches] [meta-rockchip][PATCH 4/4] nanopc-t6: use non -dev kernel

Hi Trevor,

Quoted 31 lines · Trevor Woerner via lists.yoctoproject.org

Now that 6.16.y is the preferred version of the linux-yocto kernel, the nanopc-t6 machine that had been using the linux-yocto-dev kernel can be switched to using the linux-yocto kernel instead.

NOTE: keep the various pieces of linux-yocto-dev infrastructure in place
so it can be used more easily again should it be needed

---
  conf/machine/nanopc-t6.conf                   | 1 -
  recipes-kernel/linux/linux-yocto-dev.bbappend | 4 +---
  recipes-kernel/linux/linux-yocto_%.bbappend   | 1 +
  3 files changed, 2 insertions(+), 4 deletions(-)
conf/machine/nanopc-t6.conf +0 -1
index 5ed413d1c0e5..8d524bd764f6 100644
@@ -5,7 +5,6 @@
 
  require conf/machine/include/rk3588.inc
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-dev"
  KERNEL_DEVICETREE = " \
      rockchip/rk3588-nanopc-t6.dtb \
      rockchip/rk3588-nanopc-t6-lts.dtb \
recipes-kernel/linux/linux-yocto-dev.bbappend +0 -0
index 6f4981fe29e6..e06c8a4f717d 100644

recipes-kernel/linux/linux-yocto-dev.bbappend line 3

Quoted 6 lines
recipes-kernel/linux/linux-yocto-dev.bbappend +1 -3
@@ -1,5 +1,3 @@
  FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-COMPATIBLE_MACHINE:nanopc-t6 = "nanopc-t6"
-
-SRC_URI:append:nanopc-t6 = " file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta"
+SRC_URI:append = " file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta"

Shouldn't we have SRC_URI:append:rockchip here instead to avoid adding it when building non-Rockchip boards while having meta-rockchip layer included in bblayers.conf?

Same remark for the existing SRC_URI:append in linux-yocto_%.bbappend.

Otherwise looks ok to me!

Cheers,
Quentin

Reviewed-by on v1 1/4
#12 lore raw
In reply to Trevor Woerner

Hi Trevor,

Quoted 1 line · Trevor Woerner via lists.yoctoproject.org

Separate the entires into lists of 32 vs 64 bit machines,

It would be most welcome to have a comment in linux-yocto_%.bbappend to explain this :)

Quoted 3 lines

then sort each
list.

I did the change manually and ended up with the same diff so:

Thanks!
Quentin

Reviewed-by on v1 2/4
#2 lore raw

Re: [yocto-patches] [meta-rockchip][PATCH 2/4] radxa-zero-3: use non -dev kernel

In reply to Trevor Woerner

Hi Trevor,

Quoted 4 lines · Trevor Woerner via lists.yoctoproject.org

Now that 6.16.y is the preferred version of the linux-yocto kernel, the radxa-zero-3 machine that had been using the linux-yocto-dev kernel can be switched to using the linux-yocto kernel instead.

Thanks!
Quentin

Reviewed-by on v1 3/4
#5 lore raw

Re: [yocto-patches] [meta-rockchip][PATCH 3/4] orangepi-5-plus: use non -dev kernel

In reply to Trevor Woerner

Hi Trevor,

Quoted 4 lines · Trevor Woerner via lists.yoctoproject.org

Now that 6.16.y is the preferred version of the linux-yocto kernel, the orangepi-5-plus machine that had been using the linux-yocto-dev kernel can be switched to using the linux-yocto kernel instead.

Thanks!
Quentin

#9 lore raw

Re: [yocto-patches] [meta-rockchip][PATCH 4/4] nanopc-t6: use non -dev kernel

In reply to Quentin Schulz
Quoted 42 lines · Quentin Schulz via lists.yoctoproject.org

Hi Trevor,

Quoted 29 lines · Trevor Woerner via lists.yoctoproject.org

Now that 6.16.y is the preferred version of the linux-yocto kernel, the nanopc-t6 machine that had been using the linux-yocto-dev kernel can be switched to using the linux-yocto kernel instead.

NOTE: keep the various pieces of linux-yocto-dev infrastructure in place
so it can be used more easily again should it be needed

---
  conf/machine/nanopc-t6.conf                   | 1 -
  recipes-kernel/linux/linux-yocto-dev.bbappend | 4 +---
  recipes-kernel/linux/linux-yocto_%.bbappend   | 1 +
  3 files changed, 2 insertions(+), 4 deletions(-)
conf/machine/nanopc-t6.conf +0 -1
index 5ed413d1c0e5..8d524bd764f6 100644
@@ -5,7 +5,6 @@
  require conf/machine/include/rk3588.inc
-PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-dev"
  KERNEL_DEVICETREE = " \
      rockchip/rk3588-nanopc-t6.dtb \
      rockchip/rk3588-nanopc-t6-lts.dtb \
recipes-kernel/linux/linux-yocto-dev.bbappend +0 -0
index 6f4981fe29e6..e06c8a4f717d 100644

recipes-kernel/linux/linux-yocto-dev.bbappend line 2

Quoted 5 lines
recipes-kernel/linux/linux-yocto-dev.bbappend +1 -3
@@ -1,5 +1,3 @@
  FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-COMPATIBLE_MACHINE:nanopc-t6 = "nanopc-t6"
-
-SRC_URI:append:nanopc-t6 = " file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta"
+SRC_URI:append = " file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta"

Shouldn't we have SRC_URI:append:rockchip here instead to avoid adding it when building non-Rockchip boards while having meta-rockchip layer included in bblayers.conf?

Quoted 1 line

Same remark for the existing SRC_URI:append in linux-yocto_%.bbappend.

Okay, I'll send a new series for this shortly.

Quoted 1 line

Otherwise looks ok to me!

Hmm... you have not provided any sign-off tag. Did you want to?

Quoted 13 lines

Cheers,
Quentin

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#2101): https://lists.yoctoproject.org/g/yocto-patches/message/2101
Mute This Topic: https://lists.yoctoproject.org/mt/114989087/900817
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/yocto-patches/leave/13168745/900817/63955952/xyzzy [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#10 lore raw

Re: [yocto-patches] [meta-rockchip][PATCH 4/4] nanopc-t6: use non -dev kernel

Hi Trevor,

Quoted 43 lines · Trevor Woerner via lists.yoctoproject.org
Quoted 42 lines · Quentin Schulz via lists.yoctoproject.org

Hi Trevor,

Quoted 29 lines · Trevor Woerner via lists.yoctoproject.org

Now that 6.16.y is the preferred version of the linux-yocto kernel, the nanopc-t6 machine that had been using the linux-yocto-dev kernel can be switched to using the linux-yocto kernel instead.

NOTE: keep the various pieces of linux-yocto-dev infrastructure in place
so it can be used more easily again should it be needed

---
   conf/machine/nanopc-t6.conf                   | 1 -
   recipes-kernel/linux/linux-yocto-dev.bbappend | 4 +---
   recipes-kernel/linux/linux-yocto_%.bbappend   | 1 +
   3 files changed, 2 insertions(+), 4 deletions(-)
conf/machine/nanopc-t6.conf +0 -1
index 5ed413d1c0e5..8d524bd764f6 100644
@@ -5,7 +5,6 @@
   require conf/machine/include/rk3588.inc
-PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-dev"
   KERNEL_DEVICETREE = " \
       rockchip/rk3588-nanopc-t6.dtb \
       rockchip/rk3588-nanopc-t6-lts.dtb \
recipes-kernel/linux/linux-yocto-dev.bbappend +0 -0
index 6f4981fe29e6..e06c8a4f717d 100644

recipes-kernel/linux/linux-yocto-dev.bbappend line 2

Quoted 5 lines
recipes-kernel/linux/linux-yocto-dev.bbappend +1 -3
@@ -1,5 +1,3 @@
   FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-COMPATIBLE_MACHINE:nanopc-t6 = "nanopc-t6"
-
-SRC_URI:append:nanopc-t6 = " file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta"
+SRC_URI:append = " file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta"

Shouldn't we have SRC_URI:append:rockchip here instead to avoid adding it when building non-Rockchip boards while having meta-rockchip layer included in bblayers.conf?

Quoted 8 lines
Quoted 1 line

Same remark for the existing SRC_URI:append in linux-yocto_%.bbappend.

Okay, I'll send a new series for this shortly.

Quoted 1 line

Otherwise looks ok to me!

Hmm... you have not provided any sign-off tag. Did you want to?

Nope, I think we really should have SRC_URI:append:rockchip in linux-yocto-dev instead of SRC_URI:append. This is introduced in this series, so I'd prefer to have it fixed before giving my Reviewed-by :)

Quentin

#11 lore raw

Re: [meta-rockchip][PATCH 4/4] nanopc-t6: use non -dev kernel

In reply to Trevor Woerner
Quoted 7 lines · Trevor Woerner

Now that 6.16.y is the preferred version of the linux-yocto kernel, the nanopc-t6 machine that had been using the linux-yocto-dev kernel can be switched to using the linux-yocto kernel instead.

NOTE: keep the various pieces of linux-yocto-dev infrastructure in place
so it can be used more easily again should it be needed

Quoted 6 lines
---
 conf/machine/nanopc-t6.conf                   | 1 -
 recipes-kernel/linux/linux-yocto-dev.bbappend | 4 +---
 recipes-kernel/linux/linux-yocto_%.bbappend   | 1 +
 3 files changed, 2 insertions(+), 4 deletions(-)

Added to meta-rockchip, master branch.

#3 lore raw

Re: [meta-rockchip][PATCH 2/4] radxa-zero-3: use non -dev kernel

In reply to Trevor Woerner
Quoted 10 lines · Trevor Woerner

Now that 6.16.y is the preferred version of the linux-yocto kernel, the radxa-zero-3 machine that had been using the linux-yocto-dev kernel can be switched to using the linux-yocto kernel instead.

---
 conf/machine/include/radxa-zero-3.inc         | 1 -
 recipes-kernel/linux/linux-yocto-dev.bbappend | 2 --
 recipes-kernel/linux/linux-yocto_%.bbappend   | 1 +
 3 files changed, 1 insertion(+), 3 deletions(-)

Added to meta-rockchip, master branch.

#6 lore raw

Re: [meta-rockchip][PATCH 3/4] orangepi-5-plus: use non -dev kernel

In reply to Trevor Woerner
Quoted 10 lines · Trevor Woerner

Now that 6.16.y is the preferred version of the linux-yocto kernel, the orangepi-5-plus machine that had been using the linux-yocto-dev kernel can be switched to using the linux-yocto kernel instead.

---
 conf/machine/orangepi-5-plus.conf             | 1 -
 recipes-kernel/linux/linux-yocto-dev.bbappend | 2 --
 recipes-kernel/linux/linux-yocto_%.bbappend   | 1 +
 3 files changed, 1 insertion(+), 3 deletions(-)

Added to meta-rockchip, master branch.