From 69d6b7adc9aef8d39ca66ef8688ac968876ae040 Mon Sep 17 00:00:00 2001 From: Anton Gerasimov Date: Fri, 19 Aug 2016 18:13:24 +0200 Subject: Replaced functionality in qemux86-ota machine with algsetup.sh feature. otaimg is now a live image. Bug-AGL: SPEC-236 Change-Id: I5a56ffbdb098c1b4eb33fceeae32e28611b83fb7 Signed-off-by: Anton Gerasimov --- meta-sota/conf/machine/qemux86-ota.conf | 37 --------------------------------- 1 file changed, 37 deletions(-) delete mode 100644 meta-sota/conf/machine/qemux86-ota.conf (limited to 'meta-sota/conf/machine') diff --git a/meta-sota/conf/machine/qemux86-ota.conf b/meta-sota/conf/machine/qemux86-ota.conf deleted file mode 100644 index 3c58870..0000000 --- a/meta-sota/conf/machine/qemux86-ota.conf +++ /dev/null @@ -1,37 +0,0 @@ -#@TYPE: Machine -#@NAME: common_pc -#@DESCRIPTION: Machine configuration for running a common x86 - -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" -PREFERRED_PROVIDER_virtual/libgl ?= "mesa" -PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa" -PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" - -require conf/machine/include/qemu.inc -require conf/machine/include/tune-i586.inc - -KERNEL_IMAGETYPE = "bzImage" - -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-buildrom" -UBOOT_MACHINE = "qemu-x86_defconfig" - -IMAGE_CLASSES += "image_types_ota" -IMAGE_FSTYPES += "otaimg" - -SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1" - -XSERVER = "xserver-xorg \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \ - xf86-input-vmmouse \ - xf86-input-keyboard \ - xf86-input-evdev \ - xf86-video-cirrus \ - xf86-video-fbdev \ - xf86-video-vmware" - -MACHINE_FEATURES += "x86" - -MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" - -MACHINEOVERRIDES .= ":qemux86" -KMACHINE = "qemux86" -- cgit 1.2.3-korg