On Tue, 2023-10-10 at 19:11 -0600, Alejandro Enedino Hernandez Samaniego wrote: > > > > > On 10/6/23 05:36, Richard Purdie wrote: > > > > > > Drop the version overrides for the kernel for the x86 and arm > > machines > > so we can go back to following the distro versions. The reasons for > > these versions is mostly historical at this point as the issues > > were > > resolved. > > > > Signed-off-by: Richard Purdie <[email protected]> > > --- > > meta/conf/machine/include/x86/x86-base.inc | 1 - > > meta/conf/machine/qemuarm.conf | 4 ---- > > meta/conf/machine/qemuarmv5.conf | 1 - > > 3 files changed, 6 deletions(-) > > > > diff --git a/meta/conf/machine/include/x86/x86-base.inc > > b/meta/conf/machine/include/x86/x86-base.inc > > index 050c20af70c..fc6c39148db 100644 > > --- a/meta/conf/machine/include/x86/x86-base.inc > > +++ b/meta/conf/machine/include/x86/x86-base.inc > > @@ -18,7 +18,6 @@ SERIAL_CONSOLES ?= "115200;ttyS0" > > # kernel-related variables > > # > > PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto" > > -PREFERRED_VERSION_linux-yocto ??= "6.4%" > > > > # > > # XSERVER subcomponents, used to build the XSERVER variable > > diff --git a/meta/conf/machine/qemuarm.conf > > b/meta/conf/machine/qemuarm.conf > > index 04216cdc2e0..881733eb2da 100644 > > --- a/meta/conf/machine/qemuarm.conf > > +++ b/meta/conf/machine/qemuarm.conf > > @@ -28,8 +28,4 @@ QB_ROOTFS_OPT = "-drive > > id=disk0,file=@ROOTFS@,if=none,format=raw -device virtio > > QB_SERIAL_OPT = "-device virtio-serial-device -chardev > > null,id=virtcon -device virtconsole,chardev=virtcon" > > QB_TCPSERIAL_OPT = "-device virtio-serial-device -chardev > > socket,id=virtcon,port=@PORT@,host=127.0.0.1 -device > > virtconsole,chardev=virtcon" > > > > -# 6.4 causes Xorg to fail to read the virtio framebuffer so stick > > with 6.1 until > > -# that is resolved. > > -PREFERRED_VERSION_linux-yocto ??= "6.1%" > > - > > KMACHINE:qemuarm = "qemuarma15" > > diff --git a/meta/conf/machine/qemuarmv5.conf > > b/meta/conf/machine/qemuarmv5.conf > > index deb4869c0aa..f0a86f1e4c7 100644 > > --- a/meta/conf/machine/qemuarmv5.conf > > +++ b/meta/conf/machine/qemuarmv5.conf > > @@ -16,5 +16,4 @@ QB_GRAPHICS = "-device virtio-gpu-pci" > > QB_OPT_APPEND = "-device qemu-xhci -device usb-tablet -device usb- > > kbd" > > QB_DTB = > > "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', > > '4.7', '', 'zImage-versatile-pb.dtb', d)}" > > > > > > Removing this bit results in the above line causing an > ExpansionError, since > PREFERRED_VERSION_linux-yocto isnt defined anywhere anymore (if not > using poky.conf) > > What would be the right approach to solve this issue?, Should QB_DTB > be depending on such variable?
4.7 is old enough we can probably just drop the conditional now? Cheers, Richard
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#188972): https://lists.openembedded.org/g/openembedded-core/message/188972 Mute This Topic: https://lists.openembedded.org/mt/101795562/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
