summaryrefslogtreecommitdiffstats
path: root/meta-yocto
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2015-12-18 16:56:18 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-07 13:50:54 +0000
commit685daeb6e265ddbd28be0ef44dcc356727b99375 (patch)
tree1ecbdf8f7858f572cff831a1c9b3f70b2dbc293d /meta-yocto
parent2c5e7e04f1983d640d74c03fa065bd4264d960cf (diff)
downloadpoky-685daeb6e265ddbd28be0ef44dcc356727b99375.tar.gz
poky-685daeb6e265ddbd28be0ef44dcc356727b99375.tar.bz2
poky-685daeb6e265ddbd28be0ef44dcc356727b99375.zip
conf/local.conf.sample: comment out ASSUME_PROVIDED=libsdl-native
Ubuntu 15.10 and Debian testing can't build qemu-native against the host libsdl. Now that libsdl-native is buildable, comment out the ASSUME_PROVIDED which meant it wouldn't be used. [ YOCTO #8553 ] (From meta-yocto rev: 759accbfca46de058ce402938713189dab22a70c) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-yocto')
-rw-r--r--meta-yocto/conf/local.conf.sample7
1 files changed, 4 insertions, 3 deletions
diff --git a/meta-yocto/conf/local.conf.sample b/meta-yocto/conf/local.conf.sample
index 371349d3f2..7a0dde5a8c 100644
--- a/meta-yocto/conf/local.conf.sample
+++ b/meta-yocto/conf/local.conf.sample
@@ -223,11 +223,12 @@ BB_DISKMON_DIRS = "\
# 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.
+# seen. The two lines below enable the SDL backend too. By default libsdl-native will
+# be built, if you want to use your host's libSDL instead of the minimal libsdl built
+# by libsdl-native then uncomment the ASSUME_PROVIDED line below.
PACKAGECONFIG_append_pn-qemu-native = " sdl"
PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl"
-ASSUME_PROVIDED += "libsdl-native"
+#ASSUME_PROVIDED += "libsdl-native"
# CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to