summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorAnton Gerasimov <anton@advancedtelematic.com>2016-08-19 18:13:24 +0200
committerAnton Gerasimov <anton@advancedtelematic.com>2016-08-19 18:14:32 +0200
commit2174e75e81397e9c9a99272888a6cc55c494d2f1 (patch)
treeba773f93ee1d41b557be8009b93876bf5ed64eb0 /conf
parent4b9938d16e06ce05b8bdefd1f48f2e9bd85fca5a (diff)
downloadmeta-updater-2174e75e81397e9c9a99272888a6cc55c494d2f1.tar.gz
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 <anton@advancedtelematic.com>
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/qemux86-ota.conf37
1 files changed, 0 insertions, 37 deletions
diff --git a/conf/machine/qemux86-ota.conf b/conf/machine/qemux86-ota.conf
deleted file mode 100644
index 3c58870..0000000
--- a/conf/machine/qemux86-ota.conf
+++ /dev/null
@@ -1,37 +0,0 @@
1#@TYPE: Machine
2#@NAME: common_pc
3#@DESCRIPTION: Machine configuration for running a common x86
4
5PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
6PREFERRED_PROVIDER_virtual/libgl ?= "mesa"
7PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa"
8PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
9
10require conf/machine/include/qemu.inc
11require conf/machine/include/tune-i586.inc
12
13KERNEL_IMAGETYPE = "bzImage"
14
15PREFERRED_PROVIDER_virtual/bootloader = "u-boot-buildrom"
16UBOOT_MACHINE = "qemu-x86_defconfig"
17
18IMAGE_CLASSES += "image_types_ota"
19IMAGE_FSTYPES += "otaimg"
20
21SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1"
22
23XSERVER = "xserver-xorg \
24 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \
25 xf86-input-vmmouse \
26 xf86-input-keyboard \
27 xf86-input-evdev \
28 xf86-video-cirrus \
29 xf86-video-fbdev \
30 xf86-video-vmware"
31
32MACHINE_FEATURES += "x86"
33
34MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d"
35
36MACHINEOVERRIDES .= ":qemux86"
37KMACHINE = "qemux86"