summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-15 16:30:29 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-16 12:12:39 +0000
commite70913733a216b312ca11082ae55b0b9ed56ec45 (patch)
tree4d730a1b671bab98081d423ca721838a7e951f34 /meta
parent154f5782d95b4bca8e574d3d3fde170ce3d196ae (diff)
downloadopenembedded-core-contrib-e70913733a216b312ca11082ae55b0b9ed56ec45.tar.gz
qemu/local.conf.sample: Add sdl PACKAGECONFIG
Currently the SDL configuration option for qemu floats. This is confusing to new users and makes the build non-determinstic. This patch adds a PACKAGECONFIG option, defaulting to off and adds documentation to local.conf.sample leaving it on by default since this is the configuration our quick start assumes. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/local.conf.sample11
-rw-r--r--meta/recipes-devtools/qemu/qemu.inc1
2 files changed, 12 insertions, 0 deletions
diff --git a/meta/conf/local.conf.sample b/meta/conf/local.conf.sample
index e9551b58f9..c977129139 100644
--- a/meta/conf/local.conf.sample
+++ b/meta/conf/local.conf.sample
@@ -207,6 +207,17 @@ BB_DISKMON_DIRS = "\
#file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \
#file://.* file:///some/local/dir/sstate/PATH"
+
+#
+# Qemu configuration
+#
+# By default qemu will build with a builtin VNC server where graphical output can be
+# seen. The two lines below enable the SDL backend too. This assumes there is a
+# libsdl library available on your build system.
+PACKAGECONFIG_pn-qemu-native = "sdl"
+ASSUME_PROVIDED += "libsdl-native"
+
+
# CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to
# track the version of this file when it was generated. This can safely be ignored if
# this doesn't mean anything to you.
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index 319dcde991..230fdaf96c 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -93,6 +93,7 @@ PACKAGECONFIG[uuid] = "--enable-uuid,--disable-uuid,util-linux,"
PACKAGECONFIG[curses] = "--enable-curses,--disable-curses,ncurses,"
PACKAGECONFIG[gtk+] = "--enable-gtk,--disable-gtk,gtk+ libvte,"
PACKAGECONFIG[libcap-ng] = "--enable-cap-ng,--disable-cap-ng,libcap-ng,"
+PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,libsdl,"
# Qemu target will not build in world build for ARM or Mips
BROKEN_qemuarm = "1"