From: Tom Zanussi Date: Wed, 29 Aug 2012 21:33:32 +0000 (-0500) Subject: yocto-bsp: include meta-intel.inc if emgd selected X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b9cc7ce3407d3bc3909e7cc57c8a1290cb84a58b;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git yocto-bsp: include meta-intel.inc if emgd selected With move of ia32-base to oe-core, the intel-specific variables were split off into meta-intel.inc, which needs to be included when using components present only in meta-intel. In the case of i386, that's currently just emgd, so conditionally include emgd if emgd is selected as the xserver choice. Signed-off-by: Tom Zanussi Signed-off-by: Saul Wold --- diff --git a/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf b/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf index 2a07889a5fb..1da230629aa 100644 --- a/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf +++ b/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf @@ -20,6 +20,8 @@ require conf/machine/include/tune-atom.inc require conf/machine/include/tune-core2.inc require conf/machine/include/ia32-base.inc +{{ if xserver == "y" and xserver_choice == "xserver_emgd": }} +require conf/machine/include/meta-intel.inc {{ input type:"boolean" name:"xserver" prio:"50" msg:"Do you need support for X? (y/n)" default:"y" }}