diff options
| author | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-03-05 08:58:24 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-03-05 08:58:24 +0000 |
| commit | 1135efbe645dc77892bd1ec289473be9a78767c5 (patch) | |
| tree | 325f0defcf6d8375d6566c73782c9a7abc775cf5 /meta | |
| parent | 952fa1e0a0469aa342e12d5c84b4b648f2e5b7ed (diff) | |
| download | openembedded-core-1135efbe645dc77892bd1ec289473be9a78767c5.tar.gz openembedded-core-1135efbe645dc77892bd1ec289473be9a78767c5.tar.bz2 openembedded-core-1135efbe645dc77892bd1ec289473be9a78767c5.zip | |
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')
| -rw-r--r-- | meta/packages/tasks/task-base.bb | 8 |
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 @@ DESCRIPTION = "Merge machine and distro options to create a basic machine task/package" -PR = "r47" +PR = "r48" PROVIDES = "${PACKAGES}" PACKAGES = ' \ @@ -31,6 +31,7 @@ PACKAGES = ' \ ${@base_contains("DISTRO_FEATURES", "nfs", "task-base-nfs task-base-nfs-dev task-base-nfs-dbg", "", d)} \ ${@base_contains("DISTRO_FEATURES", "ppp", "task-base-ppp task-base-ppp-dev task-base-ppp-dbg", "", d)} \ ${@base_contains("DISTRO_FEATURES", "smbfs", "task-base-smbfs task-base-smbfs-dev task-base-smbfs-dbg", "", d)} \ + ${@base_contains("DISTRO_FEATURES", "zeroconf", "task-base-zeroconf task-base-zeroconf-dev task-base-zeroconf-dbg", "", d)} \ \ task-base-kernel26 task-base-kernel26-dev task-base-kernel26-dbg \ ' @@ -72,6 +73,8 @@ RDEPENDS_task-base = "\ ${@base_contains('DISTRO_FEATURES', 'ipv6', 'task-base-ipv6', '',d)} \ ${@base_contains('DISTRO_FEATURES', 'ipsec', 'task-base-ipsec', '',d)} \ ${@base_contains('DISTRO_FEATURES', 'ppp', 'task-base-ppp', '',d)} \ + ${@base_contains('DISTRO_FEATURES', 'smbfs', 'task-base-smbfs', '',d)} \ + ${@base_contains('DISTRO_FEATURES', 'zeroconf', 'task-base-zeroconf', '',d)} \ " # bluez-dtl1-workaround above is workaround for bitbake not handling DEPENDS on it in @@ -295,6 +298,9 @@ RDEPENDS_task-base-nfs = "\ RRECOMMENDS_task-base-nfs = "\ kernel-module-nfs " +RDEPENDS_task-base-zeroconf = "\ + avahi-daemon" + RDEPENDS_task-base-screen = "\ " |