Sounds good. I've just kicked a build in our CI with your changes. Will ping you if there are still issues, but I don't expect any.
Thanks! Ted Roth On Tue, Feb 11, 2025 at 4:21 PM Bruce Ashfield <[email protected]> wrote: > > > On Tue, Feb 11, 2025 at 5:52 PM Theodore A. Roth <[email protected]> > wrote: > >> Thanks Bruce! >> >> Works for me if you commit your version. I did see that you removed the >> 6.6 stuff from poky. >> >> Just thought I'd send a patch to make sure you didn't miss something in >> meta-virt or it fell through the cracks. >> >> > It is more that I was debating (with myself, I do that) if I should keep > some parts > of 6.6 around and only remove the bbappend. I decided today after doing > some > re-testing that I'd just drop it all. > > master should be working now. > > Bruce > > > >> Ted Roth >> >> On Tue, Feb 11, 2025 at 2:56 PM Bruce Ashfield <[email protected]> >> wrote: >> >>> I already have this commit prepared, as I was the one that removed the >>> 6.6 kernel :) >>> >>> I just didn't realize it had been merged yet. >>> >>> Bruce >>> >>> On Tue, Feb 11, 2025 at 4:04 PM Theodore A. Roth via >>> lists.yoctoproject.org <[email protected]> wrote: >>> >>>> Upstream poky has dropped support for v6.6 kernels which causes rpi >>>> builds to fail: >>>> >>>> ERROR: No recipes in default available for: >>>> >>>> meta-virtualization/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-yocto_6.6.bbappend >>>> >>>> Signed-off-by: Theodore A. Roth <[email protected]> >>>> Signed-off-by: Theodore A. Roth <[email protected]> >>>> --- >>>> ...6.6.bbappend => linux-yocto_6.12.bbappend} | 2 +- >>>> .../linux/linux-yocto_6.6_virtualization.inc | 4 -- >>>> .../linux/yocto-cfg-fragments-6.6.bb | 37 ------------------- >>>> 3 files changed, 1 insertion(+), 42 deletions(-) >>>> rename >>>> dynamic-layers/raspberrypi/recipes-kernel/linux/{linux-yocto_6.6.bbappend >>>> => linux-yocto_6.12.bbappend} (77%) >>>> delete mode 100644 >>>> recipes-kernel/linux/linux-yocto_6.6_virtualization.inc >>>> delete mode 100644 recipes-kernel/linux/yocto-cfg-fragments-6.6.bb >>>> >>>> diff --git >>>> a/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-yocto_6.6.bbappend >>>> b/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-yocto_6.12.bbappend >>>> similarity index 77% >>>> rename from >>>> dynamic-layers/raspberrypi/recipes-kernel/linux/linux-yocto_6.6.bbappend >>>> rename to >>>> dynamic-layers/raspberrypi/recipes-kernel/linux/linux-yocto_6.12.bbappend >>>> index 2e2f92b6..9d1d49f4 100644 >>>> --- >>>> a/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-yocto_6.6.bbappend >>>> +++ >>>> b/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-yocto_6.12.bbappend >>>> @@ -1,5 +1,5 @@ >>>> # Enable use of the linux-yocto kernel for the Raspberry Pi 4 >>>> -KBRANCH:raspberrypi4-64 ?= "v6.6/standard/bcm-2xxx-rpi" >>>> +KBRANCH:raspberrypi4-64 ?= "v6.12/standard/bcm-2xxx-rpi" >>>> KMACHINE:raspberrypi4-64 ?= "bcm-2xxx-rpi4" >>>> COMPATIBLE_MACHINE:raspberrypi4-64 = "(raspberrypi4-64)" >>>> >>>> diff --git a/recipes-kernel/linux/linux-yocto_6.6_virtualization.inc >>>> b/recipes-kernel/linux/linux-yocto_6.6_virtualization.inc >>>> deleted file mode 100644 >>>> index 59311487..00000000 >>>> --- a/recipes-kernel/linux/linux-yocto_6.6_virtualization.inc >>>> +++ /dev/null >>>> @@ -1,4 +0,0 @@ >>>> -# include the baseline meta virtualization configuration options >>>> -# after this include, we can do version specific things >>>> - >>>> -include linux-yocto_virtualization.inc >>>> diff --git a/recipes-kernel/linux/yocto-cfg-fragments-6.6.bb >>>> b/recipes-kernel/linux/yocto-cfg-fragments-6.6.bb >>>> deleted file mode 100644 >>>> index 6bdc0d03..00000000 >>>> --- a/recipes-kernel/linux/yocto-cfg-fragments-6.6.bb >>>> +++ /dev/null >>>> @@ -1,37 +0,0 @@ >>>> -HOMEPAGE = " >>>> https://git.yoctoproject.org/cgit/cgit.cgi/yocto-kernel-cache/"; >>>> -SUMMARY = "Kernel configuration fragments" >>>> -DESCRIPTION = "Typically used as part of a kernel clone, this is the >>>> standalone \ >>>> -fragment repository. Making it available to other fragment management >>>> schemes \ >>>> -" >>>> -SECTION = "devel" >>>> - >>>> -LICENSE = "MIT" >>>> -LIC_FILES_CHKSUM = >>>> "file://COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" >>>> - >>>> -do_configure[noexec] = "1" >>>> -do_compile[noexec] = "1" >>>> -INHIBIT_DEFAULT_DEPS = "1" >>>> - >>>> -LINUX_VERSION ?= "6.6" >>>> -PV = "v${LINUX_VERSION}+git${SRCREV}" >>>> - >>>> -SRCREV = "4a494b202029e94a72ebb3c3966d9f1d249900f3" >>>> -SRC_URI = "\ >>>> - git:// >>>> git.yoctoproject.org/yocto-kernel-cache;branch=yocto-${LINUX_VERSION} >>>> <http://git.yoctoproject.org/yocto-kernel-cache;branch=yocto-$%7BLINUX_VERSION%7D> >>>> \ >>>> - " >>>> - >>>> -S = "${WORKDIR}/git" >>>> - >>>> -do_install() { >>>> - install -d ${D}${base_prefix}/kcfg >>>> - >>>> - # copy the configuration fragments over to the native deploy >>>> - cp -r ${S}/* ${D}${base_prefix}/kcfg >>>> - # scripts bring in a bash dependency we don't want >>>> - rm -rf ${D}${base_prefix}/kcfg/scripts >>>> -} >>>> - >>>> -FILES:${PN} += "kcfg/" >>>> -SYSROOT_DIRS += "${base_prefix}/kcfg" >>>> -BBCLASSEXTEND = "native nativesdk" >>>> - >>>> -- >>>> 2.34.1 >>>> >>>> >>>> >>>> >>>> >>> >>> -- >>> - Thou shalt not follow the NULL pointer, for chaos and madness await >>> thee at its end >>> - "Use the force Harry" - Gandalf, Star Trek II >>> >>> > > -- > - Thou shalt not follow the NULL pointer, for chaos and madness await thee > at its end > - "Use the force Harry" - Gandalf, Star Trek II > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#9140): https://lists.yoctoproject.org/g/meta-virtualization/message/9140 Mute This Topic: https://lists.yoctoproject.org/mt/111131116/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
