summaryrefslogtreecommitdiffstats
path: root/meta-yocto
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-02-29 16:02:26 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-11 11:00:21 +0000
commit5f27b611cd463422bfedecc31ded7319aa6c548d (patch)
tree7900a99a234cc037ef6e633d797c38a3a45ae582 /meta-yocto
parent6e32be7c7b19b649e5cac8407650979aae65ef26 (diff)
downloadpoky-5f27b611cd463422bfedecc31ded7319aa6c548d.tar.gz
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) (From meta-yocto rev: 32a797541bec9c8b13955f5a060558fe64c4fefc) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> 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 bf6dd90cc8..72c16b25de 100644
--- a/meta-yocto/conf/local.conf.sample
+++ b/meta-yocto/conf/local.conf.sample
@@ -225,11 +225,12 @@ BB_DISKMON_DIRS = "\
225# Qemu configuration 225# Qemu configuration
226# 226#
227# By default qemu will build with a builtin VNC server where graphical output can be 227# By default qemu will build with a builtin VNC server where graphical output can be
228# seen. The two lines below enable the SDL backend too. This assumes there is a 228# seen. The two lines below enable the SDL backend too. By default libsdl-native will
229# libsdl library available on your build system. 229# be built, if you want to use your host's libSDL instead of the minimal libsdl built
230# by libsdl-native then uncomment the ASSUME_PROVIDED line below.
230PACKAGECONFIG_append_pn-qemu-native = " sdl" 231PACKAGECONFIG_append_pn-qemu-native = " sdl"
231PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl" 232PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl"
232ASSUME_PROVIDED += "libsdl-native" 233#ASSUME_PROVIDED += "libsdl-native"
233 234
234 235
235# CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to 236# CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to