From 5cf37f01166d7d9927f19e4e86d2163d35c41ea9 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Sun, 26 Nov 2006 11:34:51 +0000 Subject: moved COMBINED_FEATURES and rest of task-base calculations from task-base.bb into bitbake.conf - without this move we can not use COMBINED_FEATURES (and other task-base variables) in other recipes (like we do not in wpa-supplicant 0.5.5) --- conf/bitbake.conf | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'conf') diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 8c84ad282c..f49f26b7da 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -425,3 +425,28 @@ IMAGE_ROOTFS_SIZE_ext2.gz ?= "65536" # Magic Cookie for SANITY CHECK ################################################################## OES_BITBAKE_CONF = "1" + +################################################################## +# Task-base stuff +################################################################## + +MACHINE_FEATURES ?= "kernel26" +DISTRO_FEATURES ?= "" + +DISTRO_EXTRA_RDEPENDS ?= "" +DISTRO_EXTRA_RRECOMMENDS ?= "" +MACHINE_EXTRA_RDEPENDS ?= "" +MACHINE_EXTRA_RRECOMMENDS ?= "" +MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "" +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" + +COMBINED_FEATURES = "\ + ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "alsa", d)} \ + ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "bluetooth", d)} \ + ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "ext2", d)} \ + ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "irda", d)} \ + ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "pcmcia", d)} \ + ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "pci", d)} \ + ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbgadget", d)} \ + ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbhost", d)}" + -- cgit v1.2.3