From ef3d1ab94f4c0ce22b8d1a77ca6ab54ead9c1aaf Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Tue, 21 Jun 2016 12:03:03 +0200 Subject: [PATCH] meta-digi: do not use system libsdl-native Using native libsdl from the system is showing problems in newer versions of some operating systems (e.g. ubuntu 15.10). The default in Yocto 2.0 has changed to build a native libsdl and use it instead of the one in the system. This commit synchronizes the config templates to the latest in Yocto 2.0. https://jira.digi.com/browse/DEL-2586 Signed-off-by: Javier Viguera --- sdk/config/ccardimx28js/local.conf.sample | 7 ++++--- sdk/config/ccimx6sbc/local.conf.sample | 7 ++++--- sdk/config/ccimx6ulstarter/local.conf.sample | 7 ++++--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/sdk/config/ccardimx28js/local.conf.sample b/sdk/config/ccardimx28js/local.conf.sample index 1bfcd50e6..fa3340fd4 100644 --- a/sdk/config/ccardimx28js/local.conf.sample +++ b/sdk/config/ccardimx28js/local.conf.sample @@ -247,11 +247,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 diff --git a/sdk/config/ccimx6sbc/local.conf.sample b/sdk/config/ccimx6sbc/local.conf.sample index f8f337e5d..31908c8dc 100644 --- a/sdk/config/ccimx6sbc/local.conf.sample +++ b/sdk/config/ccimx6sbc/local.conf.sample @@ -232,11 +232,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 diff --git a/sdk/config/ccimx6ulstarter/local.conf.sample b/sdk/config/ccimx6ulstarter/local.conf.sample index b3fbcc609..16ad9f0c1 100644 --- a/sdk/config/ccimx6ulstarter/local.conf.sample +++ b/sdk/config/ccimx6ulstarter/local.conf.sample @@ -232,11 +232,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