linux-yocto bbappend: sort
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
@@ -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
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
@@ -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
@@ -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
@@ -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
Re: [yocto-patches] [meta-rockchip][PATCH 2/4] radxa-zero-3: use non -dev kernel
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
Re: [meta-rockchip][PATCH 2/4] radxa-zero-3: use non -dev kernel
In reply to Trevor WoernerQuoted 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.
Signed-off-by Trevor Woerner <[email protected]>--- 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.
PATCH 3/4 orangepi-5-plus: use non -dev kernel
In reply to Trevor WoernerNow 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
@@ -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
@@ -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
@@ -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
Re: [yocto-patches] [meta-rockchip][PATCH 3/4] orangepi-5-plus: use non -dev kernel
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
Re: [meta-rockchip][PATCH 3/4] orangepi-5-plus: use non -dev kernel
In reply to Trevor WoernerQuoted 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.
Signed-off-by Trevor Woerner <[email protected]>--- 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.
PATCH 4/4 nanopc-t6: use non -dev kernel
In reply to Trevor WoernerNow 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
@@ -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
@@ -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
@@ -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
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 neededSigned-off-by Trevor Woerner <[email protected]>--- 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@@ -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
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
Re: [yocto-patches] [meta-rockchip][PATCH 4/4] nanopc-t6: use non -dev kernel
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 neededSigned-off-by Trevor Woerner <[email protected]>--- 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@@ -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
-0recipes-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]]
-=-=-=-=-=-=-=-=-=-=-=-
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 neededSigned-off-by Trevor Woerner <[email protected]>--- 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@@ -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
-0recipes-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
Re: [meta-rockchip][PATCH 4/4] nanopc-t6: use non -dev kernel
In reply to Trevor WoernerQuoted 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
Signed-off-by Trevor Woerner <[email protected]>--- 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.
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
Quoted 7 lines · Trevor Woerner
Separate the entires into lists of 32 vs 64 bit machines, then sort each list.
Signed-off-by Trevor Woerner <[email protected]>--- recipes-kernel/linux/linux-yocto_%.bbappend | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-)
Added to meta-rockchip, master branch.