summaryrefslogtreecommitdiffstats
path: root/meta/packages
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2008-03-05 08:58:24 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2008-03-05 08:58:24 +0000
commit1135efbe645dc77892bd1ec289473be9a78767c5 (patch)
tree325f0defcf6d8375d6566c73782c9a7abc775cf5 /meta/packages
parent952fa1e0a0469aa342e12d5c84b4b648f2e5b7ed (diff)
downloadpoky-1135efbe645dc77892bd1ec289473be9a78767c5.tar.gz
task-base: move avahi to 'zeroconf' DISTRO_FEATURE, fix 'smbfs' DISTRO_FEATURE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3914 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/tasks/task-base.bb8
1 files changed, 7 insertions, 1 deletions
diff --git a/meta/packages/tasks/task-base.bb b/meta/packages/tasks/task-base.bb
index c180b31271..c943d7c1ed 100644
--- a/meta/packages/tasks/task-base.bb
+++ b/meta/packages/tasks/task-base.bb
@@ -1,5 +1,5 @@
1DESCRIPTION = "Merge machine and distro options to create a basic machine task/package" 1DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
2PR = "r47" 2PR = "r48"
3 3
4PROVIDES = "${PACKAGES}" 4PROVIDES = "${PACKAGES}"
5PACKAGES = ' \ 5PACKAGES = ' \
@@ -31,6 +31,7 @@ PACKAGES = ' \
31 ${@base_contains("DISTRO_FEATURES", "nfs", "task-base-nfs task-base-nfs-dev task-base-nfs-dbg", "", d)} \ 31 ${@base_contains("DISTRO_FEATURES", "nfs", "task-base-nfs task-base-nfs-dev task-base-nfs-dbg", "", d)} \
32 ${@base_contains("DISTRO_FEATURES", "ppp", "task-base-ppp task-base-ppp-dev task-base-ppp-dbg", "", d)} \ 32 ${@base_contains("DISTRO_FEATURES", "ppp", "task-base-ppp task-base-ppp-dev task-base-ppp-dbg", "", d)} \
33 ${@base_contains("DISTRO_FEATURES", "smbfs", "task-base-smbfs task-base-smbfs-dev task-base-smbfs-dbg", "", d)} \ 33 ${@base_contains("DISTRO_FEATURES", "smbfs", "task-base-smbfs task-base-smbfs-dev task-base-smbfs-dbg", "", d)} \
34 ${@base_contains("DISTRO_FEATURES", "zeroconf", "task-base-zeroconf task-base-zeroconf-dev task-base-zeroconf-dbg", "", d)} \
34 \ 35 \
35 task-base-kernel26 task-base-kernel26-dev task-base-kernel26-dbg \ 36 task-base-kernel26 task-base-kernel26-dev task-base-kernel26-dbg \
36 ' 37 '
@@ -72,6 +73,8 @@ RDEPENDS_task-base = "\
72 ${@base_contains('DISTRO_FEATURES', 'ipv6', 'task-base-ipv6', '',d)} \ 73 ${@base_contains('DISTRO_FEATURES', 'ipv6', 'task-base-ipv6', '',d)} \
73 ${@base_contains('DISTRO_FEATURES', 'ipsec', 'task-base-ipsec', '',d)} \ 74 ${@base_contains('DISTRO_FEATURES', 'ipsec', 'task-base-ipsec', '',d)} \
74 ${@base_contains('DISTRO_FEATURES', 'ppp', 'task-base-ppp', '',d)} \ 75 ${@base_contains('DISTRO_FEATURES', 'ppp', 'task-base-ppp', '',d)} \
76 ${@base_contains('DISTRO_FEATURES', 'smbfs', 'task-base-smbfs', '',d)} \
77 ${@base_contains('DISTRO_FEATURES', 'zeroconf', 'task-base-zeroconf', '',d)} \
75 " 78 "
76# bluez-dtl1-workaround above is workaround for bitbake not handling DEPENDS on it in 79# bluez-dtl1-workaround above is workaround for bitbake not handling DEPENDS on it in
77 80
@@ -295,6 +298,9 @@ RDEPENDS_task-base-nfs = "\
295RRECOMMENDS_task-base-nfs = "\ 298RRECOMMENDS_task-base-nfs = "\
296 kernel-module-nfs " 299 kernel-module-nfs "
297 300
301RDEPENDS_task-base-zeroconf = "\
302 avahi-daemon"
303
298RDEPENDS_task-base-screen = "\ 304RDEPENDS_task-base-screen = "\
299 " 305 "
300 306