| Message ID | 20250831114105.27494-4-twoerner@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [meta-rockchip,1/4] linux-yocto bbappend: sort | expand |
Hi Trevor, On 8/31/25 1:41 PM, Trevor Woerner via lists.yoctoproject.org wrote: > 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 > > Signed-off-by: Trevor Woerner <twoerner@gmail.com> > --- > 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(-) > > diff --git a/conf/machine/nanopc-t6.conf b/conf/machine/nanopc-t6.conf > index 5ed413d1c0e5..8d524bd764f6 100644 > --- a/conf/machine/nanopc-t6.conf > +++ b/conf/machine/nanopc-t6.conf > @@ -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 \ > diff --git a/recipes-kernel/linux/linux-yocto-dev.bbappend b/recipes-kernel/linux/linux-yocto-dev.bbappend > index 6f4981fe29e6..e06c8a4f717d 100644 > --- a/recipes-kernel/linux/linux-yocto-dev.bbappend > +++ b/recipes-kernel/linux/linux-yocto-dev.bbappend > @@ -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
On Mon 2025-09-01 @ 01:49:24 PM, Quentin Schulz via lists.yoctoproject.org wrote: > Hi Trevor, > > On 8/31/25 1:41 PM, Trevor Woerner via lists.yoctoproject.org wrote: > > 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 > > > > Signed-off-by: Trevor Woerner <twoerner@gmail.com> > > --- > > 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(-) > > > > diff --git a/conf/machine/nanopc-t6.conf b/conf/machine/nanopc-t6.conf > > index 5ed413d1c0e5..8d524bd764f6 100644 > > --- a/conf/machine/nanopc-t6.conf > > +++ b/conf/machine/nanopc-t6.conf > > @@ -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 \ > > diff --git a/recipes-kernel/linux/linux-yocto-dev.bbappend b/recipes-kernel/linux/linux-yocto-dev.bbappend > > index 6f4981fe29e6..e06c8a4f717d 100644 > > --- a/recipes-kernel/linux/linux-yocto-dev.bbappend > > +++ b/recipes-kernel/linux/linux-yocto-dev.bbappend > > @@ -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. Okay, I'll send a new series for this shortly. > Otherwise looks ok to me! Hmm... you have not provided any sign-off tag. Did you want to? > 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: yocto-patches+owner@lists.yoctoproject.org > Unsubscribe: https://lists.yoctoproject.org/g/yocto-patches/leave/13168745/900817/63955952/xyzzy [twoerner@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- > >
Hi Trevor, On 9/2/25 2:20 PM, Trevor Woerner via lists.yoctoproject.org wrote: > On Mon 2025-09-01 @ 01:49:24 PM, Quentin Schulz via lists.yoctoproject.org wrote: >> Hi Trevor, >> >> On 8/31/25 1:41 PM, Trevor Woerner via lists.yoctoproject.org wrote: >>> 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 >>> >>> Signed-off-by: Trevor Woerner <twoerner@gmail.com> >>> --- >>> 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(-) >>> >>> diff --git a/conf/machine/nanopc-t6.conf b/conf/machine/nanopc-t6.conf >>> index 5ed413d1c0e5..8d524bd764f6 100644 >>> --- a/conf/machine/nanopc-t6.conf >>> +++ b/conf/machine/nanopc-t6.conf >>> @@ -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 \ >>> diff --git a/recipes-kernel/linux/linux-yocto-dev.bbappend b/recipes-kernel/linux/linux-yocto-dev.bbappend >>> index 6f4981fe29e6..e06c8a4f717d 100644 >>> --- a/recipes-kernel/linux/linux-yocto-dev.bbappend >>> +++ b/recipes-kernel/linux/linux-yocto-dev.bbappend >>> @@ -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. > > Okay, I'll send a new series for this shortly. > >> 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
On Sun 2025-08-31 @ 07:41:05 AM, Trevor Woerner wrote: > 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 > > Signed-off-by: Trevor Woerner <twoerner@gmail.com> > --- > 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.
diff --git a/conf/machine/nanopc-t6.conf b/conf/machine/nanopc-t6.conf index 5ed413d1c0e5..8d524bd764f6 100644 --- a/conf/machine/nanopc-t6.conf +++ b/conf/machine/nanopc-t6.conf @@ -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 \ diff --git a/recipes-kernel/linux/linux-yocto-dev.bbappend b/recipes-kernel/linux/linux-yocto-dev.bbappend index 6f4981fe29e6..e06c8a4f717d 100644 --- a/recipes-kernel/linux/linux-yocto-dev.bbappend +++ b/recipes-kernel/linux/linux-yocto-dev.bbappend @@ -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" diff --git a/recipes-kernel/linux/linux-yocto_%.bbappend b/recipes-kernel/linux/linux-yocto_%.bbappend index 45cfb1c10b48..470aeb8f16b1 100644 --- a/recipes-kernel/linux/linux-yocto_%.bbappend +++ b/recipes-kernel/linux/linux-yocto_%.bbappend @@ -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"
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 Signed-off-by: Trevor Woerner <twoerner@gmail.com> --- 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(-)