diff options
| -rw-r--r-- | meta/conf/machine/include/qemu.inc | 3 | ||||
| -rw-r--r-- | meta/conf/machine/include/x86-base.inc | 6 | ||||
| -rw-r--r-- | meta/conf/machine/qemuarm.conf | 1 |
3 files changed, 0 insertions, 10 deletions
diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc index 0e4103bad77..9594ccbbab5 100644 --- a/meta/conf/machine/include/qemu.inc +++ b/meta/conf/machine/include/qemu.inc @@ -18,9 +18,6 @@ IMAGE_FSTYPES += "tar.bz2 ext4" # Don't include kernels in standard images RDEPENDS_kernel-base = "" -# Use a common kernel recipe for all QEMU machines -PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" - EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native" # Provide the nfs server kernel module for all qemu images diff --git a/meta/conf/machine/include/x86-base.inc b/meta/conf/machine/include/x86-base.inc index a29641aec44..a22efdc532b 100644 --- a/meta/conf/machine/include/x86-base.inc +++ b/meta/conf/machine/include/x86-base.inc @@ -17,12 +17,6 @@ KERNEL_IMAGETYPE ?= "bzImage" SERIAL_CONSOLE ?= "115200 ttyS0" # -# kernel-related variables -# -PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto" -PREFERRED_VERSION_linux-yocto ??= "4.10%" - -# # XSERVER subcomponents, used to build the XSERVER variable # XSERVER_X86_BASE = "xserver-xorg \ diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf index 6b875e415c3..b9b640f974f 100644 --- a/meta/conf/machine/qemuarm.conf +++ b/meta/conf/machine/qemuarm.conf @@ -16,5 +16,4 @@ QB_MACHINE = "-machine versatilepb" QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,115200 console=tty" # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy QB_OPT_APPEND = "-show-cursor -usb -usbdevice tablet -device virtio-rng-pci" -PREFERRED_VERSION_linux-yocto ??= "4.10%" QB_DTB = "${@base_version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" |