summaryrefslogtreecommitdiff
path: root/packages/tasks/task-base.bb
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openembedded.org>2006-11-26 11:34:51 +0000
committerMarcin Juszkiewicz <hrw@openembedded.org>2006-11-26 11:34:51 +0000
commit5cf37f01166d7d9927f19e4e86d2163d35c41ea9 (patch)
tree8186e77142d780a2cb43cb676ae7c0b60c9ea42e /packages/tasks/task-base.bb
parent2162dfe62abe9485fe53a3ee7156fe053a3bb5a5 (diff)
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)
Diffstat (limited to 'packages/tasks/task-base.bb')
-rw-r--r--packages/tasks/task-base.bb22
1 files changed, 0 insertions, 22 deletions
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index 366da828bd..a9b3881444 100644
--- 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
#