summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2008-04-08 15:09:17 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2008-04-08 15:09:17 +0000
commit3e5ee5acdca51af57c7b6ccd2136f7b548a80293 (patch)
tree19fe75453da3e2fff7ed3e51b43ffb24c95ada19 /meta
parent5be12a829a311ebf257eb6e4864b04a706e9b480 (diff)
downloadpoky-3e5ee5acdca51af57c7b6ccd2136f7b548a80293.tar.gz
task-base: sync with OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4200 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/tasks/task-base.bb135
1 files changed, 96 insertions, 39 deletions
diff --git a/meta/packages/tasks/task-base.bb b/meta/packages/tasks/task-base.bb
index d82e79055c..19a3a4f9b5 100644
--- a/meta/packages/tasks/task-base.bb
+++ b/meta/packages/tasks/task-base.bb
@@ -1,58 +1,89 @@
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 = "r50" 2PR = "r66"
3
4inherit task
3 5
4PROVIDES = "${PACKAGES}" 6PROVIDES = "${PACKAGES}"
5PACKAGES = ' \ 7PACKAGES = ' \
6 task-base task-base-dev task-base-dbg\ 8 task-base \
7 task-base-extended task-base-extended-dev task-base-extended-dbg \ 9 task-base-extended \
8 task-distro-base task-distro-base-dev task-distro-base-dbg \ 10 task-distro-base \
9 task-machine-base task-machine-base-dev task-machine-base-dbg \ 11 task-machine-base \
12 \
13 ${@base_contains("MACHINE_FEATURES", "acpi", "task-base-acpi", "",d)} \
14 ${@base_contains("MACHINE_FEATURES", "alsa", "task-base-alsa", "", d)} \
15 ${@base_contains("MACHINE_FEATURES", "apm", "task-base-apm", "", d)} \
16 ${@base_contains("MACHINE_FEATURES", "ext2", "task-base-ext2", "", d)} \
17 ${@base_contains("MACHINE_FEATURES", "vfat", "task-base-vfat", "", d)} \
18 ${@base_contains("MACHINE_FEATURES", "irda", "task-base-irda", "",d)} \
19 ${@base_contains("MACHINE_FEATURES", "keyboard", "task-base-keyboard", "", d)} \
20 ${@base_contains("MACHINE_FEATURES", "pci", "task-base-pci", "",d)} \
21 ${@base_contains("MACHINE_FEATURES", "pcmcia", "task-base-pcmcia", "", d)} \
22 ${@base_contains("MACHINE_FEATURES", "phone", "task-base-phone", "", d)} \
23 ${@base_contains("MACHINE_FEATURES", "screen", "task-base-screen", "", d)} \
24 ${@base_contains("MACHINE_FEATURES", "serial", "task-base-serial", "", d)} \
25 ${@base_contains("MACHINE_FEATURES", "touchscreen", "task-base-touchscreen", "", d)} \
26 ${@base_contains("MACHINE_FEATURES", "usbgadget", "task-base-usbgadget", "", d)} \
27 ${@base_contains("MACHINE_FEATURES", "usbhost", "task-base-usbhost", "", d)} \
10 \ 28 \
11 ${@base_contains("MACHINE_FEATURES", "acpi", "task-base-acpi task-base-acpi-dev task-base-acpi-dbg", "",d)} \ 29 ${@base_contains("MACHINE_FEATURES", "uboot", "task-base-uboot", "",d)} \
12 ${@base_contains("MACHINE_FEATURES", "irda", "task-base-irda task-base-irda-dev task-base-irda-dbg", "",d)} \ 30 ${@base_contains("MACHINE_FEATURES", "redboot", "task-base-redboot", "",d)} \
13 ${@base_contains("MACHINE_FEATURES", "pci", "task-base-pci task-base-pci-dev task-base-pci-dbg", "",d)} \ 31 ${@base_contains("MACHINE_FEATURES", "apex", "task-base-apex", "",d)} \
14 ${@base_contains("MACHINE_FEATURES", "alsa", "task-base-alsa task-base-alsa-dev task-base-alsa-dbg", "", d)} \ 32 \
15 ${@base_contains("MACHINE_FEATURES", "apm", "task-base-apm task-base-apm-dev task-base-apm-dbg", "", d)} \ 33 task-base-bluetooth \
16 ${@base_contains("MACHINE_FEATURES", "ext2", "task-base-ext2 task-base-ext2-dev task-base-ext2-dbg", "", d)} \ 34 task-base-wifi \
17 ${@base_contains("MACHINE_FEATURES", "keyboard", "task-base-keyboard task-base-keyboard-dev task-base-keyboard-dbg", "", d)} \
18 ${@base_contains("MACHINE_FEATURES", "pcmcia", "task-base-pcmcia task-base-pcmcia-dev task-base-pcmcia-dbg", "", d)} \
19 ${@base_contains("MACHINE_FEATURES", "phone", "task-base-phone task-base-phone-dev task-base-phone-dbg", "", d)} \
20 ${@base_contains("MACHINE_FEATURES", "screen", "task-base-screen task-base-screen-dev task-base-screen-dbg", "", d)} \
21 ${@base_contains("MACHINE_FEATURES", "serial", "task-base-serial task-base-serial-dev task-base-serial-dbg", "", d)} \
22 ${@base_contains("MACHINE_FEATURES", "touchscreen", "task-base-touchscreen task-base-touchscreen-dev task-base-touchscreen-dbg", "", d)} \
23 ${@base_contains("MACHINE_FEATURES", "usbgadget", "task-base-usbgadget task-base-usbgadget-dev task-base-usbgadget-dbg", "", d)} \
24 ${@base_contains("MACHINE_FEATURES", "usbhost", "task-base-usbhost task-base-usbhost-dev task-base-usbhost-dbg", "", d)} \
25 task-base-bluetooth task-base-bluetooth-dev task-base-bluetooth-dbg \
26 task-base-wifi task-base-wifi-dev task-base-wifi-dbg \
27 \ 35 \
28 ${@base_contains("DISTRO_FEATURES", "cramfs", "task-base-cramfs task-base-cramfs-dev task-base-cramfs-dbg", "", d)} \ 36 ${@base_contains("DISTRO_FEATURES", "cramfs", "task-base-cramfs", "", d)} \
29 ${@base_contains("DISTRO_FEATURES", "ipsec", "task-base-ipsec task-base-ipsec-dev task-base-ipsec-dbg", "", d)} \ 37 ${@base_contains("DISTRO_FEATURES", "ipsec", "task-base-ipsec", "", d)} \
30 ${@base_contains("DISTRO_FEATURES", "ipv6", "task-base-ipv6 task-base-ipv6-dev task-base-ipv6-dbg", "", d)} \ 38 ${@base_contains("DISTRO_FEATURES", "ipv6", "task-base-ipv6", "", d)} \
31 ${@base_contains("DISTRO_FEATURES", "nfs", "task-base-nfs task-base-nfs-dev task-base-nfs-dbg", "", d)} \ 39 ${@base_contains("DISTRO_FEATURES", "nfs", "task-base-nfs", "", d)} \
32 ${@base_contains("DISTRO_FEATURES", "ppp", "task-base-ppp task-base-ppp-dev task-base-ppp-dbg", "", d)} \ 40 ${@base_contains("DISTRO_FEATURES", "ppp", "task-base-ppp", "", d)} \
33 ${@base_contains("DISTRO_FEATURES", "smbfs", "task-base-smbfs task-base-smbfs-dev task-base-smbfs-dbg", "", d)} \ 41 ${@base_contains("DISTRO_FEATURES", "smbfs", "task-base-smbfs", "", d)} \
34 ${@base_contains("DISTRO_FEATURES", "zeroconf", "task-base-zeroconf task-base-zeroconf-dev task-base-zeroconf-dbg", "", d)} \ 42 ${@base_contains("DISTRO_FEATURES", "raid", "task-base-raid", "",d)} \
35 \ 43 ${@base_contains("DISTRO_FEATURES", "zeroconf", "task-base-zeroconf", "", d)} \
36 task-base-kernel26 task-base-kernel26-dev task-base-kernel26-dbg \ 44 \
45 ${@base_contains("MACHINE_FEATURES","kernel26","task-base-kernel26","task-base-kernel24",d)} \
37 ' 46 '
38 47
39ALLOW_EMPTY = "1" 48ALLOW_EMPTY = "1"
40 49
50#
51# packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH
52#
41PACKAGE_ARCH = "${MACHINE_ARCH}" 53PACKAGE_ARCH = "${MACHINE_ARCH}"
42 54
43# 55#
56# linux-hotplug or none
57#
58HOTPLUG ?= "${@base_contains("MACHINE_FEATURES", "kernel24", "linux-hotplug","",d)} "
59
60#
61# dropbear, openssh or none
62#
63DISTRO_SSH_DAEMON ?= "dropbear"
64
65#
44# pcmciautils for >= 2.6.13-rc1, pcmcia-cs for others 66# pcmciautils for >= 2.6.13-rc1, pcmcia-cs for others
45# 67#
46PCMCIA_MANAGER ?= "${@base_contains('MACHINE_FEATURES', 'kernel26','pcmciautils','pcmcia-cs',d)} " 68PCMCIA_MANAGER ?= "${@base_contains('MACHINE_FEATURES', 'kernel26','pcmciautils','pcmcia-cs',d)} "
47 69
48# 70#
71# those ones can be set in machine config to supply packages needed to get machine booting
72#
73MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
74MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
75
76#
49# task-base contain stuff needed for base system (machine related) 77# task-base contain stuff needed for base system (machine related)
50# 78#
51RDEPENDS_task-base = "\ 79RDEPENDS_task-base = "\
80 task-poky-boot \
52 task-distro-base \ 81 task-distro-base \
53 task-machine-base \ 82 task-machine-base \
83 ${DISTRO_SSH_DAEMON} \
84 ${HOTPLUG} \
54 \ 85 \
55 task-base-kernel26 \ 86 ${@base_contains('MACHINE_FEATURES', 'kernel26','task-base-kernel26','task-base-kernel24',d)} \
56 ${@base_contains('MACHINE_FEATURES', 'apm', 'task-base-apm', '',d)} \ 87 ${@base_contains('MACHINE_FEATURES', 'apm', 'task-base-apm', '',d)} \
57 ${@base_contains('MACHINE_FEATURES', 'acpi', 'task-base-acpi', '',d)} \ 88 ${@base_contains('MACHINE_FEATURES', 'acpi', 'task-base-acpi', '',d)} \
58 ${@base_contains('MACHINE_FEATURES', 'keyboard', 'task-base-keyboard', '',d)} \ 89 ${@base_contains('MACHINE_FEATURES', 'keyboard', 'task-base-keyboard', '',d)} \
@@ -60,6 +91,7 @@ RDEPENDS_task-base = "\
60 \ 91 \
61 ${@base_contains('COMBINED_FEATURES', 'alsa', 'task-base-alsa', '',d)} \ 92 ${@base_contains('COMBINED_FEATURES', 'alsa', 'task-base-alsa', '',d)} \
62 ${@base_contains('COMBINED_FEATURES', 'ext2', 'task-base-ext2', '',d)} \ 93 ${@base_contains('COMBINED_FEATURES', 'ext2', 'task-base-ext2', '',d)} \
94 ${@base_contains('COMBINED_FEATURES', 'vfat', 'task-base-vfat', '',d)} \
63 ${@base_contains('COMBINED_FEATURES', 'irda', 'task-base-irda', '',d)} \ 95 ${@base_contains('COMBINED_FEATURES', 'irda', 'task-base-irda', '',d)} \
64 ${@base_contains('COMBINED_FEATURES', 'pci', 'task-base-pci', '',d)} \ 96 ${@base_contains('COMBINED_FEATURES', 'pci', 'task-base-pci', '',d)} \
65 ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'task-base-pcmcia', '',d)} \ 97 ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'task-base-pcmcia', '',d)} \
@@ -68,12 +100,17 @@ RDEPENDS_task-base = "\
68 ${@base_contains('COMBINED_FEATURES', 'usbhost', 'task-base-usbhost', '',d)} \ 100 ${@base_contains('COMBINED_FEATURES', 'usbhost', 'task-base-usbhost', '',d)} \
69 ${@base_contains('COMBINED_FEATURES', 'bluetooth', 'task-base-bluetooth', '',d)} \ 101 ${@base_contains('COMBINED_FEATURES', 'bluetooth', 'task-base-bluetooth', '',d)} \
70 ${@base_contains('COMBINED_FEATURES', 'wifi', 'task-base-wifi', '',d)} \ 102 ${@base_contains('COMBINED_FEATURES', 'wifi', 'task-base-wifi', '',d)} \
103 ${@base_contains('COMBINED_FEATURES', 'uboot', 'task-base-uboot', '',d)} \
104 ${@base_contains('COMBINED_FEATURES', 'redboot', 'task-base-redboot', '',d)} \
105 ${@base_contains('COMBINED_FEATURES', 'apex', 'task-base-apex', '',d)} \
71 \ 106 \
72 ${@base_contains('DISTRO_FEATURES', 'nfs', 'task-base-nfs', '',d)} \ 107 ${@base_contains('DISTRO_FEATURES', 'nfs', 'task-base-nfs', '',d)} \
108 ${@base_contains('DISTRO_FEATURES', 'cramfs', 'task-base-cramfs', '',d)} \
109 ${@base_contains('DISTRO_FEATURES', 'smbfs', 'task-base-smbfs', '',d)} \
73 ${@base_contains('DISTRO_FEATURES', 'ipv6', 'task-base-ipv6', '',d)} \ 110 ${@base_contains('DISTRO_FEATURES', 'ipv6', 'task-base-ipv6', '',d)} \
74 ${@base_contains('DISTRO_FEATURES', 'ipsec', 'task-base-ipsec', '',d)} \ 111 ${@base_contains('DISTRO_FEATURES', 'ipsec', 'task-base-ipsec', '',d)} \
75 ${@base_contains('DISTRO_FEATURES', 'ppp', 'task-base-ppp', '',d)} \ 112 ${@base_contains('DISTRO_FEATURES', 'ppp', 'task-base-ppp', '',d)} \
76 ${@base_contains('DISTRO_FEATURES', 'smbfs', 'task-base-smbfs', '',d)} \ 113 ${@base_contains('DISTRO_FEATURES', 'raid', 'task-base-raid', '',d)} \
77 ${@base_contains('DISTRO_FEATURES', 'zeroconf', 'task-base-zeroconf', '',d)} \ 114 ${@base_contains('DISTRO_FEATURES', 'zeroconf', 'task-base-zeroconf', '',d)} \
78 " 115 "
79# bluez-dtl1-workaround above is workaround for bitbake not handling DEPENDS on it in 116# bluez-dtl1-workaround above is workaround for bitbake not handling DEPENDS on it in
@@ -109,6 +146,7 @@ python __anonymous () {
109# 146#
110# packages added by distribution 147# packages added by distribution
111# 148#
149DEPENDS_task-distro-base = "${DISTRO_EXTRA_DEPENDS}"
112RDEPENDS_task-distro-base = "${DISTRO_EXTRA_RDEPENDS}" 150RDEPENDS_task-distro-base = "${DISTRO_EXTRA_RDEPENDS}"
113RRECOMMENDS_task-distro-base = "${DISTRO_EXTRA_RRECOMMENDS}" 151RRECOMMENDS_task-distro-base = "${DISTRO_EXTRA_RRECOMMENDS}"
114 152
@@ -118,17 +156,26 @@ RRECOMMENDS_task-distro-base = "${DISTRO_EXTRA_RRECOMMENDS}"
118RDEPENDS_task-machine-base = "${MACHINE_EXTRA_RDEPENDS}" 156RDEPENDS_task-machine-base = "${MACHINE_EXTRA_RDEPENDS}"
119RRECOMMENDS_task-machine-base = "${MACHINE_EXTRA_RRECOMMENDS}" 157RRECOMMENDS_task-machine-base = "${MACHINE_EXTRA_RRECOMMENDS}"
120 158
159RDEPENDS_task-base-kernel24 = "\
160 modutils-depmod"
161
121RDEPENDS_task-base-kernel26 = "\ 162RDEPENDS_task-base-kernel26 = "\
122 sysfsutils \ 163 sysfsutils \
123 module-init-tools" 164 module-init-tools"
124 165
166RRECOMMENDS_task-base-kernel24 = "\
167 kernel-module-input \
168 kernel-module-uinput"
169
125RRECOMMENDS_task-base-kernel26 = "\ 170RRECOMMENDS_task-base-kernel26 = "\
171 kernel-module-nls-utf8 \
126 kernel-module-input \ 172 kernel-module-input \
127 kernel-module-uinput \ 173 kernel-module-uinput \
128 kernel-module-rtc-dev \ 174 kernel-module-rtc-dev \
129 kernel-module-rtc-proc \ 175 kernel-module-rtc-proc \
130 kernel-module-rtc-sysfs \ 176 kernel-module-rtc-sysfs \
131 kernel-module-rtc-sa1100" 177 kernel-module-rtc-sa1100 \
178 kernel-module-unix"
132 179
133RDEPENDS_task-base-keyboard = "\ 180RDEPENDS_task-base-keyboard = "\
134 keymaps" 181 keymaps"
@@ -149,13 +196,16 @@ RDEPENDS_task-base-ext2 = "\
149 e2fsprogs-e2fsck \ 196 e2fsprogs-e2fsck \
150 e2fsprogs-mke2fs" 197 e2fsprogs-mke2fs"
151 198
199RRECOMMENDS_task-base-vfat = "\
200 kernel-module-msdos \
201 kernel-module-vfat \
202 kernel-module-nls-iso8859-1 \
203 kernel-module-nls-cp437"
204
152RDEPENDS_task-base-alsa = "\ 205RDEPENDS_task-base-alsa = "\
153 alsa-utils-alsactl \ 206 alsa-utils-alsactl \
154 alsa-utils-alsamixer" 207 alsa-utils-alsamixer"
155 208
156#
157# alsa-state is machine related so can be missing in feed, OSS support is optional
158#
159RRECOMMENDS_task-base-alsa = "\ 209RRECOMMENDS_task-base-alsa = "\
160 kernel-module-snd-mixer-oss \ 210 kernel-module-snd-mixer-oss \
161 kernel-module-snd-pcm-oss" 211 kernel-module-snd-pcm-oss"
@@ -186,8 +236,12 @@ task-base-pcmcia26 = "\
186 ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-orinoco-cs', '',d)} \ 236 ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-orinoco-cs', '',d)} \
187 ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-spectrum-cs', '',d)}" 237 ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-spectrum-cs', '',d)}"
188 238
239# Provide bluez-utils-compat utils for the time being, the binaries in that package will vanish soon from upstream releases, so beware!
240
189RDEPENDS_task-base-bluetooth = "\ 241RDEPENDS_task-base-bluetooth = "\
190 bluez-utils" 242 bluez-utils \
243 bluez-utils-compat \
244 "
191 245
192RRECOMMENDS_task-base-bluetooth = "\ 246RRECOMMENDS_task-base-bluetooth = "\
193 kernel-module-bluetooth \ 247 kernel-module-bluetooth \
@@ -286,6 +340,7 @@ RRECOMMENDS_task-base-wifi = "\
286 kernel-module-crypto_algapi \ 340 kernel-module-crypto_algapi \
287 kernel-module-cryptomgr \ 341 kernel-module-cryptomgr \
288 kernel-module-michael-mic \ 342 kernel-module-michael-mic \
343 kernel-module-aes-generic \
289 kernel-module-aes" 344 kernel-module-aes"
290 345
291RRECOMMENDS_task-base-smbfs = "\ 346RRECOMMENDS_task-base-smbfs = "\
@@ -307,6 +362,9 @@ RRECOMMENDS_task-base-nfs = "\
307RDEPENDS_task-base-zeroconf = "\ 362RDEPENDS_task-base-zeroconf = "\
308 avahi-daemon" 363 avahi-daemon"
309 364
365RDEPENDS_task-base-raid = "\
366 "
367
310RDEPENDS_task-base-screen = "\ 368RDEPENDS_task-base-screen = "\
311 " 369 "
312 370
@@ -314,8 +372,7 @@ RDEPENDS_task-base-screen = "\
314# GPE/OPIE/OpenMoko provide own touchscreen calibration utils 372# GPE/OPIE/OpenMoko provide own touchscreen calibration utils
315# 373#
316RDEPENDS_task-base-touchscreen = "\ 374RDEPENDS_task-base-touchscreen = "\
317 tslib-tests \ 375 "
318 tslib-calibrate "
319 376
320RDEPENDS_task-base-ipv6 = "\ 377RDEPENDS_task-base-ipv6 = "\
321 " 378 "
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 05:31:20 +0000