moved COMBINED_FEATURES and rest of task-base calculations from task-base.bb into...

- 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)

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 8c84ad2..f49f26b 100644 (file)
--- 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)}"
+

diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index 366da82..a9b3881 100644 (file)
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -40,30 +40,8 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 # usbgadget
 # usbhost
 
-
-MACHINE_FEATURES ?= "kernel26"
-DISTRO_FEATURES ?= ""
 DISTRO_CORE_PACKAGE ?= "task-base-core-default"
 
-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)}"
-
-
 #
 # task-base 
 #