[oe-commits] org.oe.dev moved COMBINED_FEATURES and rest of task-base calculations from task-base.bb into bitbake.conf

[hrw commit]

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)

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 0db2e15829da3fcad7950973459836e9cd549abe
ViewMTN: http://monotone.openembedded.org/revision.psp?id=0db2e15829da3fcad7950973459836e9cd549abe
Files:
1
conf/bitbake.conf
packages/tasks/task-base.bb
Diffs:

#
# mt diff -r74c74685ac13d0f2534847454c0b79ac380cdb07 -r0db2e15829da3fcad7950973459836e9cd549abe
#
# 
# 
# patch "conf/bitbake.conf"
#  from [764838dba620f39ac9fd91f16b0040b07af788db]
#    to [cd02627f27495f1a995a4dfaa80d96b428a8128b]
# 
# patch "packages/tasks/task-base.bb"
#  from [c89a88cf6ba8bc18094085833bcd23deb292b3e5]
#    to [3b42202cf77f28de30f8fb3e0fd75c39f01af18d]
# 
============================================================
--- conf/bitbake.conf	764838dba620f39ac9fd91f16b0040b07af788db
+++ conf/bitbake.conf	cd02627f27495f1a995a4dfaa80d96b428a8128b
@@ -425,3 +425,28 @@ OES_BITBAKE_CONF = "1"
 # 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)}"
+
============================================================
--- packages/tasks/task-base.bb	c89a88cf6ba8bc18094085833bcd23deb292b3e5
+++ packages/tasks/task-base.bb	3b42202cf77f28de30f8fb3e0fd75c39f01af18d
@@ -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 
 #