diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-08-29 11:38:34 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-04 12:52:55 +0100 |
commit | 272cb74d70686cb7f72005dc25e02f38b46ecd57 (patch) | |
tree | 3a5e4cb0c9a2e407b2d04c78b1eb51d0f429ca64 /meta/recipes-core | |
parent | f1df3f828bfc9e70bf8cf5a7c2e2cf216944785a (diff) | |
download | poky-272cb74d70686cb7f72005dc25e02f38b46ecd57.tar.gz |
Rename task to packagegroup
"Package group" is a much more appropriate name for these than task,
since we use the word task to describe units of work executed by
BitBake.
(From OE-Core rev: 424dcf7046e4ad09dcc664eb1992201195247fcf)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
19 files changed, 426 insertions, 426 deletions
diff --git a/meta/recipes-core/images/build-appliance-image.bb b/meta/recipes-core/images/build-appliance-image.bb index 95909c4b82..42d643634d 100644 --- a/meta/recipes-core/images/build-appliance-image.bb +++ b/meta/recipes-core/images/build-appliance-image.bb | |||
@@ -1,5 +1,5 @@ | |||
1 | DESCRIPTION = "An image you can boot and run using either the VMware Player or VMware Workstation. For more information, see the<a href='http://www.yoctoproject.org/documentation/build-appliance'>Build Appliance page</a>." | 1 | DESCRIPTION = "An image you can boot and run using either the VMware Player or VMware Workstation. For more information, see the<a href='http://www.yoctoproject.org/documentation/build-appliance'>Build Appliance page</a>." |
2 | IMAGE_INSTALL = "task-core-boot task-core-apps-console task-core-ssh-openssh task-self-hosted" | 2 | IMAGE_INSTALL = "packagegroup-core-boot packagegroup-core-apps-console packagegroup-core-ssh-openssh packagegroup-self-hosted" |
3 | 3 | ||
4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
5 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ | 5 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ |
diff --git a/meta/recipes-core/images/core-image-minimal.bb b/meta/recipes-core/images/core-image-minimal.bb index 089a728f88..0d2613e327 100644 --- a/meta/recipes-core/images/core-image-minimal.bb +++ b/meta/recipes-core/images/core-image-minimal.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | DESCRIPTION = "A small image just capable of allowing a device to boot." | 1 | DESCRIPTION = "A small image just capable of allowing a device to boot." |
2 | 2 | ||
3 | IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${CORE_IMAGE_EXTRA_INSTALL}" | 3 | IMAGE_INSTALL = "packagegroup-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${CORE_IMAGE_EXTRA_INSTALL}" |
4 | 4 | ||
5 | IMAGE_LINGUAS = " " | 5 | IMAGE_LINGUAS = " " |
6 | 6 | ||
diff --git a/meta/recipes-core/meta/meta-toolchain-gmae.bb b/meta/recipes-core/meta/meta-toolchain-gmae.bb index 512810b365..5d805742ac 100644 --- a/meta/recipes-core/meta/meta-toolchain-gmae.bb +++ b/meta/recipes-core/meta/meta-toolchain-gmae.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | TOOLCHAIN_TARGET_GMAETASK ?= "task-core-standalone-gmae-sdk-target task-core-standalone-gmae-sdk-target-dbg" | 1 | TOOLCHAIN_TARGET_GMAETASK ?= "packagegroup-core-standalone-gmae-sdk-target packagegroup-core-standalone-gmae-sdk-target-dbg" |
2 | TOOLCHAIN_TARGET_TASK = "${TOOLCHAIN_TARGET_GMAETASK}" | 2 | TOOLCHAIN_TARGET_TASK = "${TOOLCHAIN_TARGET_GMAETASK}" |
3 | TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-gmae-${DISTRO_VERSION}" | 3 | TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-gmae-${DISTRO_VERSION}" |
4 | PROVIDES = "meta-toolchain-sdk" | 4 | PROVIDES = "meta-toolchain-sdk" |
diff --git a/meta/recipes-core/tasks/nativesdk-task-sdk-host.bb b/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb index ea054bc9c9..ea054bc9c9 100644 --- a/meta/recipes-core/tasks/nativesdk-task-sdk-host.bb +++ b/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb | |||
diff --git a/meta/recipes-core/packagegroups/packagegroup-base.bb b/meta/recipes-core/packagegroups/packagegroup-base.bb new file mode 100644 index 0000000000..ea894b2e2b --- /dev/null +++ b/meta/recipes-core/packagegroups/packagegroup-base.bb | |||
@@ -0,0 +1,359 @@ | |||
1 | DESCRIPTION = "Merge machine and distro options to create a basic machine task/package" | ||
2 | LICENSE = "MIT" | ||
3 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ | ||
4 | file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | ||
5 | PR = "r75" | ||
6 | |||
7 | inherit packagegroup | ||
8 | |||
9 | PROVIDES = "${PACKAGES}" | ||
10 | PACKAGES = ' \ | ||
11 | packagegroup-base \ | ||
12 | packagegroup-base-extended \ | ||
13 | packagegroup-distro-base \ | ||
14 | packagegroup-machine-base \ | ||
15 | \ | ||
16 | ${@base_contains("MACHINE_FEATURES", "acpi", "packagegroup-base-acpi", "",d)} \ | ||
17 | ${@base_contains("MACHINE_FEATURES", "alsa", "packagegroup-base-alsa", "", d)} \ | ||
18 | ${@base_contains("MACHINE_FEATURES", "apm", "packagegroup-base-apm", "", d)} \ | ||
19 | ${@base_contains("MACHINE_FEATURES", "ext2", "packagegroup-base-ext2", "", d)} \ | ||
20 | ${@base_contains("MACHINE_FEATURES", "vfat", "packagegroup-base-vfat", "", d)} \ | ||
21 | ${@base_contains("MACHINE_FEATURES", "irda", "packagegroup-base-irda", "",d)} \ | ||
22 | ${@base_contains("MACHINE_FEATURES", "keyboard", "packagegroup-base-keyboard", "", d)} \ | ||
23 | ${@base_contains("MACHINE_FEATURES", "pci", "packagegroup-base-pci", "",d)} \ | ||
24 | ${@base_contains("MACHINE_FEATURES", "pcmcia", "packagegroup-base-pcmcia", "", d)} \ | ||
25 | ${@base_contains("MACHINE_FEATURES", "phone", "packagegroup-base-phone", "", d)} \ | ||
26 | ${@base_contains("MACHINE_FEATURES", "screen", "packagegroup-base-screen", "", d)} \ | ||
27 | ${@base_contains("MACHINE_FEATURES", "serial", "packagegroup-base-serial", "", d)} \ | ||
28 | ${@base_contains("MACHINE_FEATURES", "touchscreen", "packagegroup-base-touchscreen", "", d)} \ | ||
29 | ${@base_contains("MACHINE_FEATURES", "usbgadget", "packagegroup-base-usbgadget", "", d)} \ | ||
30 | ${@base_contains("MACHINE_FEATURES", "usbhost", "packagegroup-base-usbhost", "", d)} \ | ||
31 | \ | ||
32 | ${@base_contains("MACHINE_FEATURES", "uboot", "packagegroup-base-uboot", "",d)} \ | ||
33 | ${@base_contains("MACHINE_FEATURES", "redboot", "packagegroup-base-redboot", "",d)} \ | ||
34 | ${@base_contains("MACHINE_FEATURES", "apex", "packagegroup-base-apex", "",d)} \ | ||
35 | \ | ||
36 | ${@base_contains("DISTRO_FEATURES", "bluetooth", "packagegroup-base-bluetooth", "", d)} \ | ||
37 | ${@base_contains("DISTRO_FEATURES", "wifi", "packagegroup-base-wifi", "", d)} \ | ||
38 | ${@base_contains("DISTRO_FEATURES", "3g", "packagegroup-base-3g", "", d)} \ | ||
39 | ${@base_contains("DISTRO_FEATURES", "cramfs", "packagegroup-base-cramfs", "", d)} \ | ||
40 | ${@base_contains("DISTRO_FEATURES", "ipsec", "packagegroup-base-ipsec", "", d)} \ | ||
41 | ${@base_contains("DISTRO_FEATURES", "ipv6", "packagegroup-base-ipv6", "", d)} \ | ||
42 | ${@base_contains("DISTRO_FEATURES", "nfs", "packagegroup-base-nfs", "", d)} \ | ||
43 | ${@base_contains("DISTRO_FEATURES", "ppp", "packagegroup-base-ppp", "", d)} \ | ||
44 | ${@base_contains("DISTRO_FEATURES", "smbfs", "packagegroup-base-smbfs", "", d)} \ | ||
45 | ${@base_contains("DISTRO_FEATURES", "raid", "packagegroup-base-raid", "",d)} \ | ||
46 | ${@base_contains("DISTRO_FEATURES", "zeroconf", "packagegroup-base-zeroconf", "", d)} \ | ||
47 | \ | ||
48 | ' | ||
49 | |||
50 | ALLOW_EMPTY = "1" | ||
51 | |||
52 | # | ||
53 | # packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH | ||
54 | # | ||
55 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
56 | |||
57 | # | ||
58 | # those ones can be set in machine config to supply packages needed to get machine booting | ||
59 | # | ||
60 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "" | ||
61 | MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" | ||
62 | |||
63 | # | ||
64 | # packagegroup-base contain stuff needed for base system (machine related) | ||
65 | # | ||
66 | RDEPENDS_packagegroup-base = "\ | ||
67 | packagegroup-distro-base \ | ||
68 | packagegroup-machine-base \ | ||
69 | \ | ||
70 | sysfsutils \ | ||
71 | module-init-tools \ | ||
72 | ${@base_contains('MACHINE_FEATURES', 'apm', 'packagegroup-base-apm', '',d)} \ | ||
73 | ${@base_contains('MACHINE_FEATURES', 'acpi', 'packagegroup-base-acpi', '',d)} \ | ||
74 | ${@base_contains('MACHINE_FEATURES', 'keyboard', 'packagegroup-base-keyboard', '',d)} \ | ||
75 | ${@base_contains('MACHINE_FEATURES', 'phone', 'packagegroup-base-phone', '',d)} \ | ||
76 | \ | ||
77 | ${@base_contains('COMBINED_FEATURES', 'alsa', 'packagegroup-base-alsa', '',d)} \ | ||
78 | ${@base_contains('COMBINED_FEATURES', 'ext2', 'packagegroup-base-ext2', '',d)} \ | ||
79 | ${@base_contains('COMBINED_FEATURES', 'vfat', 'packagegroup-base-vfat', '',d)} \ | ||
80 | ${@base_contains('COMBINED_FEATURES', 'irda', 'packagegroup-base-irda', '',d)} \ | ||
81 | ${@base_contains('COMBINED_FEATURES', 'pci', 'packagegroup-base-pci', '',d)} \ | ||
82 | ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'packagegroup-base-pcmcia', '',d)} \ | ||
83 | ${@base_contains('COMBINED_FEATURES', 'usbgadget', 'packagegroup-base-usbgadget', '',d)} \ | ||
84 | ${@base_contains('COMBINED_FEATURES', 'usbhost', 'packagegroup-base-usbhost', '',d)} \ | ||
85 | ${@base_contains('COMBINED_FEATURES', 'bluetooth', 'packagegroup-base-bluetooth', '',d)} \ | ||
86 | ${@base_contains('COMBINED_FEATURES', 'wifi', 'packagegroup-base-wifi', '',d)} \ | ||
87 | ${@base_contains('COMBINED_FEATURES', '3g', 'packagegroup-base-3g', '',d)} \ | ||
88 | ${@base_contains('COMBINED_FEATURES', 'uboot', 'packagegroup-base-uboot', '',d)} \ | ||
89 | ${@base_contains('COMBINED_FEATURES', 'redboot', 'packagegroup-base-redboot', '',d)} \ | ||
90 | ${@base_contains('COMBINED_FEATURES', 'apex', 'packagegroup-base-apex', '',d)} \ | ||
91 | \ | ||
92 | ${@base_contains('DISTRO_FEATURES', 'nfs', 'packagegroup-base-nfs', '',d)} \ | ||
93 | ${@base_contains('DISTRO_FEATURES', 'cramfs', 'packagegroup-base-cramfs', '',d)} \ | ||
94 | ${@base_contains('DISTRO_FEATURES', 'smbfs', 'packagegroup-base-smbfs', '',d)} \ | ||
95 | ${@base_contains('DISTRO_FEATURES', 'ipv6', 'packagegroup-base-ipv6', '',d)} \ | ||
96 | ${@base_contains('DISTRO_FEATURES', 'ipsec', 'packagegroup-base-ipsec', '',d)} \ | ||
97 | ${@base_contains('DISTRO_FEATURES', 'ppp', 'packagegroup-base-ppp', '',d)} \ | ||
98 | ${@base_contains('DISTRO_FEATURES', 'raid', 'packagegroup-base-raid', '',d)} \ | ||
99 | ${@base_contains('DISTRO_FEATURES', 'zeroconf', 'packagegroup-base-zeroconf', '',d)} \ | ||
100 | " | ||
101 | |||
102 | |||
103 | RRECOMMENDS_packagegroup-base = "\ | ||
104 | kernel-module-nls-utf8 \ | ||
105 | kernel-module-input \ | ||
106 | kernel-module-uinput \ | ||
107 | kernel-module-rtc-dev \ | ||
108 | kernel-module-rtc-proc \ | ||
109 | kernel-module-rtc-sysfs \ | ||
110 | kernel-module-unix" | ||
111 | |||
112 | RDEPENDS_packagegroup-base-extended = "\ | ||
113 | packagegroup-base \ | ||
114 | ${ADD_WIFI} \ | ||
115 | ${ADD_BT} \ | ||
116 | ${ADD_3G} \ | ||
117 | " | ||
118 | |||
119 | ADD_WIFI = "" | ||
120 | ADD_BT = "" | ||
121 | ADD_3G = "" | ||
122 | |||
123 | python __anonymous () { | ||
124 | # If Distro want wifi and machine feature wifi/pci/pcmcia/usbhost (one of them) | ||
125 | # then include packagegroup-base-wifi in packagegroup-base | ||
126 | |||
127 | distro_features = set(d.getVar("DISTRO_FEATURES", True).split()) | ||
128 | machine_features= set(d.getVar("MACHINE_FEATURES", True).split()) | ||
129 | |||
130 | if "bluetooth" in distro_features and not "bluetooth" in machine_features and ("pcmcia" in machine_features or "pci" in machine_features or "usbhost" in machine_features): | ||
131 | d.setVar("ADD_BT", "packagegroup-base-bluetooth") | ||
132 | |||
133 | if "wifi" in distro_features and not "wifi" in machine_features and ("pcmcia" in machine_features or "pci" in machine_features or "usbhost" in machine_features): | ||
134 | d.setVar("ADD_WIFI", "packagegroup-base-wifi") | ||
135 | |||
136 | if "3g" in distro_features and not "3g" in machine_features and ("pcmcia" in machine_features or "pci" in machine_features or "usbhost" in machine_features): | ||
137 | d.setVar("ADD_3G", "packagegroup-base-3g") | ||
138 | } | ||
139 | |||
140 | # | ||
141 | # packages added by distribution | ||
142 | # | ||
143 | DEPENDS_packagegroup-distro-base = "${DISTRO_EXTRA_DEPENDS}" | ||
144 | RDEPENDS_packagegroup-distro-base = "${DISTRO_EXTRA_RDEPENDS}" | ||
145 | RRECOMMENDS_packagegroup-distro-base = "${DISTRO_EXTRA_RRECOMMENDS}" | ||
146 | |||
147 | # | ||
148 | # packages added by machine config | ||
149 | # | ||
150 | RDEPENDS_packagegroup-machine-base = "${MACHINE_EXTRA_RDEPENDS}" | ||
151 | RRECOMMENDS_packagegroup-machine-base = "${MACHINE_EXTRA_RRECOMMENDS}" | ||
152 | |||
153 | RDEPENDS_packagegroup-base-keyboard = "\ | ||
154 | keymaps" | ||
155 | |||
156 | RDEPENDS_packagegroup-base-pci = "\ | ||
157 | pciutils" | ||
158 | |||
159 | RDEPENDS_packagegroup-base-acpi = "\ | ||
160 | acpid \ | ||
161 | libacpi " | ||
162 | |||
163 | RDEPENDS_packagegroup-base-apm = "\ | ||
164 | ${VIRTUAL-RUNTIME_apm} \ | ||
165 | apmd" | ||
166 | |||
167 | RDEPENDS_packagegroup-base-ext2 = "\ | ||
168 | hdparm \ | ||
169 | e2fsprogs \ | ||
170 | e2fsprogs-e2fsck \ | ||
171 | e2fsprogs-mke2fs" | ||
172 | |||
173 | RRECOMMENDS_packagegroup-base-vfat = "\ | ||
174 | kernel-module-msdos \ | ||
175 | kernel-module-vfat \ | ||
176 | kernel-module-nls-iso8859-1 \ | ||
177 | kernel-module-nls-cp437" | ||
178 | |||
179 | RDEPENDS_packagegroup-base-alsa = "\ | ||
180 | alsa-utils-alsactl \ | ||
181 | alsa-utils-alsamixer \ | ||
182 | ${VIRTUAL-RUNTIME_alsa-state}" | ||
183 | |||
184 | RRECOMMENDS_packagegroup-base-alsa = "\ | ||
185 | kernel-module-snd-mixer-oss \ | ||
186 | kernel-module-snd-pcm-oss" | ||
187 | |||
188 | RDEPENDS_packagegroup-base-pcmcia = "\ | ||
189 | pcmciautils \ | ||
190 | " | ||
191 | #${@base_contains('DISTRO_FEATURES', 'wifi', 'prism-firmware', '',d)} | ||
192 | #${@base_contains('DISTRO_FEATURES', 'wifi', 'spectrum-fw', '',d)} | ||
193 | |||
194 | |||
195 | RRECOMMENDS_packagegroup-base-pcmcia = "\ | ||
196 | kernel-module-pcmcia \ | ||
197 | kernel-module-airo-cs \ | ||
198 | kernel-module-pcnet-cs \ | ||
199 | kernel-module-serial-cs \ | ||
200 | kernel-module-ide-cs \ | ||
201 | kernel-module-ide-disk \ | ||
202 | ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-hostap-cs', '',d)} \ | ||
203 | ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-orinoco-cs', '',d)} \ | ||
204 | ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-spectrum-cs', '',d)}" | ||
205 | |||
206 | # Provide bluez-utils-compat utils for the time being, the binaries in that package will vanish soon from upstream releases, so beware! | ||
207 | |||
208 | RDEPENDS_packagegroup-base-bluetooth = "\ | ||
209 | bluez4 \ | ||
210 | ${@base_contains('COMBINED_FEATURES', 'alsa', 'libasound-module-bluez', '',d)} \ | ||
211 | " | ||
212 | |||
213 | RRECOMMENDS_packagegroup-base-bluetooth = "\ | ||
214 | kernel-module-bluetooth \ | ||
215 | kernel-module-l2cap \ | ||
216 | kernel-module-rfcomm \ | ||
217 | kernel-module-hci-vhci \ | ||
218 | kernel-module-bnep \ | ||
219 | kernel-module-hidp \ | ||
220 | kernel-module-hci-uart \ | ||
221 | kernel-module-sco \ | ||
222 | ${@base_contains('COMBINED_FEATURES', 'usbhost', 'kernel-module-hci-usb', '',d)} \ | ||
223 | ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluetooth3c-cs', '',d)} \ | ||
224 | ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluecard-cs', '',d)} \ | ||
225 | ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluetoothuart-cs', '',d)} \ | ||
226 | ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-dtl1-cs', '',d)} \ | ||
227 | " | ||
228 | |||
229 | RDEPENDS_packagegroup-base-irda = "\ | ||
230 | irda-utils" | ||
231 | |||
232 | RRECOMMENDS_packagegroup-base-irda = "\ | ||
233 | kernel-module-pxaficp-ir \ | ||
234 | kernel-module-irda \ | ||
235 | kernel-module-ircomm \ | ||
236 | kernel-module-ircomm-tty \ | ||
237 | kernel-module-irlan \ | ||
238 | ${@base_contains('DISTRO_FEATURES', 'ppp', 'kernel-module-irnet', '',d)} \ | ||
239 | kernel-module-irport \ | ||
240 | kernel-module-irtty \ | ||
241 | kernel-module-irtty-sir \ | ||
242 | kernel-module-sir-dev \ | ||
243 | ${@base_contains('COMBINED_FEATURES', 'usbhost', 'kernel-module-ir-usb', '',d)} " | ||
244 | |||
245 | RRECOMMENDS_packagegroup-base-usbgadget = "\ | ||
246 | kernel-module-pxa27x_udc \ | ||
247 | kernel-module-gadgetfs \ | ||
248 | kernel-module-g-file-storage \ | ||
249 | kernel-module-g-serial \ | ||
250 | kernel-module-g-ether" | ||
251 | |||
252 | RDEPENDS_packagegroup-base-usbhost = "\ | ||
253 | usbutils " | ||
254 | |||
255 | RRECOMMENDS_packagegroup-base-usbhost = "\ | ||
256 | kernel-module-uhci-hcd \ | ||
257 | kernel-module-ohci-hcd \ | ||
258 | kernel-module-ehci-hcd \ | ||
259 | kernel-module-usbcore \ | ||
260 | kernel-module-usbhid \ | ||
261 | kernel-module-usbnet \ | ||
262 | kernel-module-sd-mod \ | ||
263 | kernel-module-scsi-mod \ | ||
264 | kernel-module-usbmouse \ | ||
265 | kernel-module-mousedev \ | ||
266 | kernel-module-usbserial \ | ||
267 | kernel-module-usb-storage " | ||
268 | |||
269 | RDEPENDS_packagegroup-base-ppp = "\ | ||
270 | ppp \ | ||
271 | ppp-dialin" | ||
272 | |||
273 | RRECOMMENDS_packagegroup-base-ppp = "\ | ||
274 | kernel-module-ppp-async \ | ||
275 | kernel-module-ppp-deflate \ | ||
276 | kernel-module-ppp-generic \ | ||
277 | kernel-module-ppp-mppe \ | ||
278 | kernel-module-slhc" | ||
279 | |||
280 | RDEPENDS_packagegroup-base-ipsec = "\ | ||
281 | openswan" | ||
282 | |||
283 | RRECOMMENDS_packagegroup-base-ipsec = "\ | ||
284 | kernel-module-ipsec" | ||
285 | |||
286 | # | ||
287 | # packagegroup-base-wifi contain everything needed to get WiFi working | ||
288 | # WEP/WPA connection needs to be supported out-of-box | ||
289 | # | ||
290 | RDEPENDS_packagegroup-base-wifi = "\ | ||
291 | wireless-tools \ | ||
292 | ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'hostap-utils', '',d)} \ | ||
293 | ${@base_contains('COMBINED_FEATURES', 'pci', 'hostap-utils', '',d)} \ | ||
294 | wpa-supplicant" | ||
295 | |||
296 | RRECOMMENDS_packagegroup-base-wifi = "\ | ||
297 | ${@base_contains('COMBINED_FEATURES', 'usbhost', 'kernel-module-zd1211rw', '',d)} \ | ||
298 | kernel-module-ieee80211-crypt \ | ||
299 | kernel-module-ieee80211-crypt-ccmp \ | ||
300 | kernel-module-ieee80211-crypt-tkip \ | ||
301 | kernel-module-ieee80211-crypt-wep \ | ||
302 | kernel-module-ecb \ | ||
303 | kernel-module-arc4 \ | ||
304 | kernel-module-crypto_algapi \ | ||
305 | kernel-module-cryptomgr \ | ||
306 | kernel-module-michael-mic \ | ||
307 | kernel-module-aes-generic \ | ||
308 | kernel-module-aes" | ||
309 | |||
310 | RDEPENDS_packagegroup-base-3g = "\ | ||
311 | ofono" | ||
312 | |||
313 | RRECOMMENDS_packagegroup-base-3g = "\ | ||
314 | kernel-module-cdc-acm \ | ||
315 | kernel-module-cdc-wdm" | ||
316 | |||
317 | RRECOMMENDS_packagegroup-base-smbfs = "\ | ||
318 | kernel-module-cifs \ | ||
319 | kernel-module-smbfs" | ||
320 | |||
321 | RRECOMMENDS_packagegroup-base-cramfs = "\ | ||
322 | kernel-module-cramfs" | ||
323 | |||
324 | # | ||
325 | # packagegroup-base-nfs provides ONLY client support - server is in nfs-utils package | ||
326 | # | ||
327 | RDEPENDS_packagegroup-base-nfs = "\ | ||
328 | portmap" | ||
329 | |||
330 | RRECOMMENDS_packagegroup-base-nfs = "\ | ||
331 | kernel-module-nfs " | ||
332 | |||
333 | RDEPENDS_packagegroup-base-zeroconf = "\ | ||
334 | avahi-daemon" | ||
335 | |||
336 | RDEPENDS_packagegroup-base-raid = "\ | ||
337 | " | ||
338 | |||
339 | RDEPENDS_packagegroup-base-screen = "\ | ||
340 | " | ||
341 | |||
342 | # | ||
343 | # GPE/OPIE/OpenMoko provide own touchscreen calibration utils | ||
344 | # | ||
345 | RDEPENDS_packagegroup-base-touchscreen = "\ | ||
346 | " | ||
347 | |||
348 | RDEPENDS_packagegroup-base-ipv6 = "\ | ||
349 | " | ||
350 | |||
351 | RRECOMMENDS_packagegroup-base-ipv6 = "\ | ||
352 | kernel-module-ipv6 " | ||
353 | |||
354 | RDEPENDS_packagegroup-base-serial = "\ | ||
355 | setserial \ | ||
356 | lrzsz " | ||
357 | |||
358 | RDEPENDS_packagegroup-base-phone = "\ | ||
359 | ofono" | ||
diff --git a/meta/recipes-core/tasks/task-core-boot.bb b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb index 2947509bf5..7e80fffe4a 100644 --- a/meta/recipes-core/tasks/task-core-boot.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb | |||
@@ -25,12 +25,12 @@ VIRTUAL-RUNTIME_initscripts ?= "initscripts" | |||
25 | VIRTUAL-RUNTIME_keymaps ?= "keymaps" | 25 | VIRTUAL-RUNTIME_keymaps ?= "keymaps" |
26 | 26 | ||
27 | PACKAGES = "\ | 27 | PACKAGES = "\ |
28 | task-core-boot \ | 28 | packagegroup-core-boot \ |
29 | task-core-boot-dbg \ | 29 | packagegroup-core-boot-dbg \ |
30 | task-core-boot-dev \ | 30 | packagegroup-core-boot-dev \ |
31 | " | 31 | " |
32 | 32 | ||
33 | RDEPENDS_task-core-boot = "\ | 33 | RDEPENDS_packagegroup-core-boot = "\ |
34 | base-files \ | 34 | base-files \ |
35 | base-passwd \ | 35 | base-passwd \ |
36 | busybox \ | 36 | busybox \ |
@@ -45,5 +45,5 @@ RDEPENDS_task-core-boot = "\ | |||
45 | ${VIRTUAL-RUNTIME_update-alternatives} \ | 45 | ${VIRTUAL-RUNTIME_update-alternatives} \ |
46 | ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}" | 46 | ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}" |
47 | 47 | ||
48 | RRECOMMENDS_task-core-boot = "\ | 48 | RRECOMMENDS_packagegroup-core-boot = "\ |
49 | ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}" | 49 | ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}" |
diff --git a/meta/recipes-core/tasks/task-core-console.bb b/meta/recipes-core/packagegroups/packagegroup-core-console.bb index cb2273294f..fd8eb252db 100644 --- a/meta/recipes-core/tasks/task-core-console.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-console.bb | |||
@@ -9,9 +9,9 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 | |||
9 | PR = "r35" | 9 | PR = "r35" |
10 | 10 | ||
11 | PACKAGES = "\ | 11 | PACKAGES = "\ |
12 | task-core-apps-console \ | 12 | packagegroup-core-apps-console \ |
13 | task-core-apps-console-dbg \ | 13 | packagegroup-core-apps-console-dbg \ |
14 | task-core-apps-console-dev \ | 14 | packagegroup-core-apps-console-dev \ |
15 | " | 15 | " |
16 | 16 | ||
17 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 17 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
@@ -20,7 +20,7 @@ ALLOW_EMPTY = "1" | |||
20 | 20 | ||
21 | SPLASH ?= "psplash" | 21 | SPLASH ?= "psplash" |
22 | 22 | ||
23 | RDEPENDS_task-core-apps-console = "\ | 23 | RDEPENDS_packagegroup-core-apps-console = "\ |
24 | avahi-daemon \ | 24 | avahi-daemon \ |
25 | dbus \ | 25 | dbus \ |
26 | portmap \ | 26 | portmap \ |
diff --git a/meta/recipes-core/tasks/task-core-nfs.bb b/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb index 5c7f45562a..e63753b3e2 100644 --- a/meta/recipes-core/tasks/task-core-nfs.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb | |||
@@ -9,14 +9,14 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 | |||
9 | PR = "r1" | 9 | PR = "r1" |
10 | 10 | ||
11 | PACKAGES = "\ | 11 | PACKAGES = "\ |
12 | task-core-nfs-server \ | 12 | packagegroup-core-nfs-server \ |
13 | task-core-nfs-server-dbg \ | 13 | packagegroup-core-nfs-server-dbg \ |
14 | task-core-nfs-server-dev \ | 14 | packagegroup-core-nfs-server-dev \ |
15 | " | 15 | " |
16 | 16 | ||
17 | ALLOW_EMPTY = "1" | 17 | ALLOW_EMPTY = "1" |
18 | 18 | ||
19 | RDEPENDS_task-core-nfs-server = "\ | 19 | RDEPENDS_packagegroup-core-nfs-server = "\ |
20 | nfs-utils \ | 20 | nfs-utils \ |
21 | nfs-utils-client \ | 21 | nfs-utils-client \ |
22 | " | 22 | " |
@@ -24,5 +24,5 @@ RDEPENDS_task-core-nfs-server = "\ | |||
24 | # rpcinfo can be useful but only with glibc images | 24 | # rpcinfo can be useful but only with glibc images |
25 | GLIBC_DEPENDENCIES = "glibc-utils" | 25 | GLIBC_DEPENDENCIES = "glibc-utils" |
26 | 26 | ||
27 | RRECOMMENDS_task-core-nfs-server_append_libc-glibc = " ${GLIBC_DEPENDENCIES}" | 27 | RRECOMMENDS_packagegroup-core-nfs-server_append_libc-glibc = " ${GLIBC_DEPENDENCIES}" |
28 | 28 | ||
diff --git a/meta/recipes-core/tasks/task-core-sdk.bb b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb index fe952367e4..663f7057de 100644 --- a/meta/recipes-core/tasks/task-core-sdk.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb | |||
@@ -6,18 +6,18 @@ DESCRIPTION = "Software Development Tasks for OpenedHand Poky" | |||
6 | LICENSE = "MIT" | 6 | LICENSE = "MIT" |
7 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ | 7 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ |
8 | file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 8 | file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
9 | DEPENDS = "task-core-console" | 9 | DEPENDS = "packagegroup-core-console" |
10 | PR = "r8" | 10 | PR = "r8" |
11 | 11 | ||
12 | ALLOW_EMPTY = "1" | 12 | ALLOW_EMPTY = "1" |
13 | #PACKAGEFUNCS =+ 'generate_sdk_pkgs' | 13 | #PACKAGEFUNCS =+ 'generate_sdk_pkgs' |
14 | 14 | ||
15 | PACKAGES = "\ | 15 | PACKAGES = "\ |
16 | task-core-sdk \ | 16 | packagegroup-core-sdk \ |
17 | task-core-sdk-dbg \ | 17 | packagegroup-core-sdk-dbg \ |
18 | task-core-sdk-dev" | 18 | packagegroup-core-sdk-dev" |
19 | 19 | ||
20 | RDEPENDS_task-core-sdk = "\ | 20 | RDEPENDS_packagegroup-core-sdk = "\ |
21 | autoconf \ | 21 | autoconf \ |
22 | automake \ | 22 | automake \ |
23 | binutils \ | 23 | binutils \ |
@@ -48,15 +48,15 @@ RDEPENDS_task-core-sdk = "\ | |||
48 | file \ | 48 | file \ |
49 | tcl" | 49 | tcl" |
50 | 50 | ||
51 | RRECOMMENDS_task-core-sdk = "\ | 51 | RRECOMMENDS_packagegroup-core-sdk = "\ |
52 | libgomp \ | 52 | libgomp \ |
53 | libgomp-dev" | 53 | libgomp-dev" |
54 | 54 | ||
55 | #python generate_sdk_pkgs () { | 55 | #python generate_sdk_pkgs () { |
56 | # poky_pkgs = read_pkgdata('task-core', d)['PACKAGES'] | 56 | # poky_pkgs = read_pkgdata('packagegroup-core', d)['PACKAGES'] |
57 | # pkgs = d.getVar('PACKAGES', True).split() | 57 | # pkgs = d.getVar('PACKAGES', True).split() |
58 | # for pkg in poky_pkgs.split(): | 58 | # for pkg in poky_pkgs.split(): |
59 | # newpkg = pkg.replace('task-core', 'task-core-sdk') | 59 | # newpkg = pkg.replace('packagegroup-core', 'packagegroup-core-sdk') |
60 | # | 60 | # |
61 | # # for each of the task packages, add a corresponding sdk task | 61 | # # for each of the task packages, add a corresponding sdk task |
62 | # pkgs.append(newpkg) | 62 | # pkgs.append(newpkg) |
@@ -91,4 +91,4 @@ RRECOMMENDS_task-core-sdk = "\ | |||
91 | # d.setVar('PACKAGES', ' '.join(pkgs)) | 91 | # d.setVar('PACKAGES', ' '.join(pkgs)) |
92 | #} | 92 | #} |
93 | # | 93 | # |
94 | #PACKAGES_DYNAMIC = "task-core-sdk-*" | 94 | #PACKAGES_DYNAMIC = "packagegroup-core-sdk-*" |
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb b/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb new file mode 100644 index 0000000000..9dcc342dc4 --- /dev/null +++ b/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb | |||
@@ -0,0 +1,17 @@ | |||
1 | DESCRIPTION = "Dropbear SSH task for Poky" | ||
2 | LICENSE = "MIT" | ||
3 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ | ||
4 | file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | ||
5 | PR = "r0" | ||
6 | |||
7 | PACKAGES = "\ | ||
8 | packagegroup-core-ssh-dropbear \ | ||
9 | packagegroup-core-ssh-dropbear-dbg \ | ||
10 | packagegroup-core-ssh-dropbear-dev \ | ||
11 | " | ||
12 | |||
13 | ALLOW_EMPTY = "1" | ||
14 | |||
15 | RDEPENDS_packagegroup-core-ssh-dropbear = "dropbear" | ||
16 | RDEPENDS_packagegroup-core-ssh-dropbear-dbg = "dropbear-dbg" | ||
17 | RDEPENDS_packagegroup-core-ssh-dropbear-dev = "dropbear-dev" | ||
diff --git a/meta/recipes-core/tasks/task-core-ssh-openssh.bb b/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb index 794399a2b8..7e85b29ad8 100644 --- a/meta/recipes-core/tasks/task-core-ssh-openssh.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb | |||
@@ -5,13 +5,13 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 | |||
5 | PR = "r0" | 5 | PR = "r0" |
6 | 6 | ||
7 | PACKAGES = "\ | 7 | PACKAGES = "\ |
8 | task-core-ssh-openssh \ | 8 | packagegroup-core-ssh-openssh \ |
9 | task-core-ssh-openssh-dbg \ | 9 | packagegroup-core-ssh-openssh-dbg \ |
10 | task-core-ssh-openssh-dev \ | 10 | packagegroup-core-ssh-openssh-dev \ |
11 | " | 11 | " |
12 | 12 | ||
13 | ALLOW_EMPTY = "1" | 13 | ALLOW_EMPTY = "1" |
14 | 14 | ||
15 | RDEPENDS_task-core-ssh-openssh = "openssh" | 15 | RDEPENDS_packagegroup-core-ssh-openssh = "openssh" |
16 | RDEPENDS_task-core-ssh-openssh-dbg = "openssh-dbg" | 16 | RDEPENDS_packagegroup-core-ssh-openssh-dbg = "openssh-dbg" |
17 | RDEPENDS_task-core-ssh-openssh-dev = "openssh-dev" | 17 | RDEPENDS_packagegroup-core-ssh-openssh-dev = "openssh-dev" |
diff --git a/meta/recipes-core/tasks/task-core-standalone-sdk-target.bb b/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb index 03628a167d..03628a167d 100644 --- a/meta/recipes-core/tasks/task-core-standalone-sdk-target.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb | |||
diff --git a/meta/recipes-core/tasks/task-core-tools-debug.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb index b7eff21622..b7eff21622 100644 --- a/meta/recipes-core/tasks/task-core-tools-debug.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb | |||
diff --git a/meta/recipes-core/tasks/task-core-tools-profile.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb index 30776ef658..30776ef658 100644 --- a/meta/recipes-core/tasks/task-core-tools-profile.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb | |||
diff --git a/meta/recipes-core/tasks/task-core-tools-testapps.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb index bdd0d058f9..bdd0d058f9 100644 --- a/meta/recipes-core/tasks/task-core-tools-testapps.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb | |||
diff --git a/meta/recipes-core/tasks/task-cross-canadian.bb b/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb index 1840301892..6ab4a95846 100644 --- a/meta/recipes-core/tasks/task-cross-canadian.bb +++ b/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb | |||
@@ -1,5 +1,5 @@ | |||
1 | DESCRIPTION = "Host SDK package for cross canadian toolchain" | 1 | DESCRIPTION = "Host SDK package for cross canadian toolchain" |
2 | PN = "task-cross-canadian-${TRANSLATED_TARGET_ARCH}" | 2 | PN = "packagegroup-cross-canadian-${TRANSLATED_TARGET_ARCH}" |
3 | PR = "r0" | 3 | PR = "r0" |
4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
5 | ALLOW_EMPTY = "1" | 5 | ALLOW_EMPTY = "1" |
diff --git a/meta/recipes-core/tasks/task-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb index 4d6ab07964..118ff7d48b 100644 --- a/meta/recipes-core/tasks/task-self-hosted.bb +++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb | |||
@@ -9,25 +9,25 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 | |||
9 | file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 9 | file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
10 | 10 | ||
11 | PACKAGES = "\ | 11 | PACKAGES = "\ |
12 | task-self-hosted \ | 12 | packagegroup-self-hosted \ |
13 | task-self-hosted-debug \ | 13 | packagegroup-self-hosted-debug \ |
14 | task-self-hosted-sdk \ | 14 | packagegroup-self-hosted-sdk \ |
15 | task-self-hosted-extended \ | 15 | packagegroup-self-hosted-extended \ |
16 | task-self-hosted-graphics \ | 16 | packagegroup-self-hosted-graphics \ |
17 | task-self-hosted-host-tools \ | 17 | packagegroup-self-hosted-host-tools \ |
18 | " | 18 | " |
19 | 19 | ||
20 | ALLOW_EMPTY = "1" | 20 | ALLOW_EMPTY = "1" |
21 | 21 | ||
22 | RDEPENDS_task-self-hosted = "\ | 22 | RDEPENDS_packagegroup-self-hosted = "\ |
23 | task-self-hosted-debug \ | 23 | packagegroup-self-hosted-debug \ |
24 | task-self-hosted-sdk \ | 24 | packagegroup-self-hosted-sdk \ |
25 | task-self-hosted-extended \ | 25 | packagegroup-self-hosted-extended \ |
26 | task-self-hosted-graphics \ | 26 | packagegroup-self-hosted-graphics \ |
27 | task-self-hosted-host-tools \ | 27 | packagegroup-self-hosted-host-tools \ |
28 | " | 28 | " |
29 | 29 | ||
30 | RDEPENDS_task-self-hosted-host-tools = "\ | 30 | RDEPENDS_packagegroup-self-hosted-host-tools = "\ |
31 | connman \ | 31 | connman \ |
32 | connman-plugin-ethernet \ | 32 | connman-plugin-ethernet \ |
33 | dhcp-client \ | 33 | dhcp-client \ |
@@ -52,7 +52,7 @@ RDEPENDS_task-self-hosted-host-tools = "\ | |||
52 | " | 52 | " |
53 | 53 | ||
54 | # eglibc-utils: for rpcgen | 54 | # eglibc-utils: for rpcgen |
55 | RDEPENDS_task-self-hosted-sdk = "\ | 55 | RDEPENDS_packagegroup-self-hosted-sdk = "\ |
56 | autoconf \ | 56 | autoconf \ |
57 | automake \ | 57 | automake \ |
58 | binutils \ | 58 | binutils \ |
@@ -85,7 +85,7 @@ RDEPENDS_task-self-hosted-sdk = "\ | |||
85 | sed \ | 85 | sed \ |
86 | " | 86 | " |
87 | 87 | ||
88 | RDEPENDS_task-self-hosted-debug = " \ | 88 | RDEPENDS_packagegroup-self-hosted-debug = " \ |
89 | gdb \ | 89 | gdb \ |
90 | gdbserver \ | 90 | gdbserver \ |
91 | rsync \ | 91 | rsync \ |
@@ -93,7 +93,7 @@ RDEPENDS_task-self-hosted-debug = " \ | |||
93 | tcf-agent" | 93 | tcf-agent" |
94 | 94 | ||
95 | 95 | ||
96 | RDEPENDS_task-self-hosted-extended = "\ | 96 | RDEPENDS_packagegroup-self-hosted-extended = "\ |
97 | bzip2 \ | 97 | bzip2 \ |
98 | chkconfig \ | 98 | chkconfig \ |
99 | chrpath \ | 99 | chrpath \ |
@@ -186,7 +186,7 @@ RDEPENDS_task-self-hosted-extended = "\ | |||
186 | " | 186 | " |
187 | 187 | ||
188 | 188 | ||
189 | RDEPENDS_task-self-hosted-graphics = "\ | 189 | RDEPENDS_packagegroup-self-hosted-graphics = "\ |
190 | builder \ | 190 | builder \ |
191 | libgl \ | 191 | libgl \ |
192 | libgl-dev \ | 192 | libgl-dev \ |
diff --git a/meta/recipes-core/tasks/task-base.bb b/meta/recipes-core/tasks/task-base.bb deleted file mode 100644 index d5dd14079f..0000000000 --- a/meta/recipes-core/tasks/task-base.bb +++ /dev/null | |||
@@ -1,359 +0,0 @@ | |||
1 | DESCRIPTION = "Merge machine and distro options to create a basic machine task/package" | ||
2 | LICENSE = "MIT" | ||
3 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ | ||
4 | file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | ||
5 | PR = "r75" | ||
6 | |||
7 | inherit task | ||
8 | |||
9 | PROVIDES = "${PACKAGES}" | ||
10 | PACKAGES = ' \ | ||
11 | task-base \ | ||
12 | task-base-extended \ | ||
13 | task-distro-base \ | ||
14 | task-machine-base \ | ||
15 | \ | ||
16 | ${@base_contains("MACHINE_FEATURES", "acpi", "task-base-acpi", "",d)} \ | ||
17 | ${@base_contains("MACHINE_FEATURES", "alsa", "task-base-alsa", "", d)} \ | ||
18 | ${@base_contains("MACHINE_FEATURES", "apm", "task-base-apm", "", d)} \ | ||
19 | ${@base_contains("MACHINE_FEATURES", "ext2", "task-base-ext2", "", d)} \ | ||
20 | ${@base_contains("MACHINE_FEATURES", "vfat", "task-base-vfat", "", d)} \ | ||
21 | ${@base_contains("MACHINE_FEATURES", "irda", "task-base-irda", "",d)} \ | ||
22 | ${@base_contains("MACHINE_FEATURES", "keyboard", "task-base-keyboard", "", d)} \ | ||
23 | ${@base_contains("MACHINE_FEATURES", "pci", "task-base-pci", "",d)} \ | ||
24 | ${@base_contains("MACHINE_FEATURES", "pcmcia", "task-base-pcmcia", "", d)} \ | ||
25 | ${@base_contains("MACHINE_FEATURES", "phone", "task-base-phone", "", d)} \ | ||
26 | ${@base_contains("MACHINE_FEATURES", "screen", "task-base-screen", "", d)} \ | ||
27 | ${@base_contains("MACHINE_FEATURES", "serial", "task-base-serial", "", d)} \ | ||
28 | ${@base_contains("MACHINE_FEATURES", "touchscreen", "task-base-touchscreen", "", d)} \ | ||
29 | ${@base_contains("MACHINE_FEATURES", "usbgadget", "task-base-usbgadget", "", d)} \ | ||
30 | ${@base_contains("MACHINE_FEATURES", "usbhost", "task-base-usbhost", "", d)} \ | ||
31 | \ | ||
32 | ${@base_contains("MACHINE_FEATURES", "uboot", "task-base-uboot", "",d)} \ | ||
33 | ${@base_contains("MACHINE_FEATURES", "redboot", "task-base-redboot", "",d)} \ | ||
34 | ${@base_contains("MACHINE_FEATURES", "apex", "task-base-apex", "",d)} \ | ||
35 | \ | ||
36 | ${@base_contains("DISTRO_FEATURES", "bluetooth", "task-base-bluetooth", "", d)} \ | ||
37 | ${@base_contains("DISTRO_FEATURES", "wifi", "task-base-wifi", "", d)} \ | ||
38 | ${@base_contains("DISTRO_FEATURES", "3g", "task-base-3g", "", d)} \ | ||
39 | ${@base_contains("DISTRO_FEATURES", "cramfs", "task-base-cramfs", "", d)} \ | ||
40 | ${@base_contains("DISTRO_FEATURES", "ipsec", "task-base-ipsec", "", d)} \ | ||
41 | ${@base_contains("DISTRO_FEATURES", "ipv6", "task-base-ipv6", "", d)} \ | ||
42 | ${@base_contains("DISTRO_FEATURES", "nfs", "task-base-nfs", "", d)} \ | ||
43 | ${@base_contains("DISTRO_FEATURES", "ppp", "task-base-ppp", "", d)} \ | ||
44 | ${@base_contains("DISTRO_FEATURES", "smbfs", "task-base-smbfs", "", d)} \ | ||
45 | ${@base_contains("DISTRO_FEATURES", "raid", "task-base-raid", "",d)} \ | ||
46 | ${@base_contains("DISTRO_FEATURES", "zeroconf", "task-base-zeroconf", "", d)} \ | ||
47 | \ | ||
48 | ' | ||
49 | |||
50 | ALLOW_EMPTY = "1" | ||
51 | |||
52 | # | ||
53 | # packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH | ||
54 | # | ||
55 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
56 | |||
57 | # | ||
58 | # those ones can be set in machine config to supply packages needed to get machine booting | ||
59 | # | ||
60 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "" | ||
61 | MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" | ||
62 | |||
63 | # | ||
64 | # task-base contain stuff needed for base system (machine related) | ||
65 | # | ||
66 | RDEPENDS_task-base = "\ | ||
67 | task-distro-base \ | ||
68 | task-machine-base \ | ||
69 | \ | ||
70 | sysfsutils \ | ||
71 | module-init-tools \ | ||
72 | ${@base_contains('MACHINE_FEATURES', 'apm', 'task-base-apm', '',d)} \ | ||
73 | ${@base_contains('MACHINE_FEATURES', 'acpi', 'task-base-acpi', '',d)} \ | ||
74 | ${@base_contains('MACHINE_FEATURES', 'keyboard', 'task-base-keyboard', '',d)} \ | ||
75 | ${@base_contains('MACHINE_FEATURES', 'phone', 'task-base-phone', '',d)} \ | ||
76 | \ | ||
77 | ${@base_contains('COMBINED_FEATURES', 'alsa', 'task-base-alsa', '',d)} \ | ||
78 | ${@base_contains('COMBINED_FEATURES', 'ext2', 'task-base-ext2', '',d)} \ | ||
79 | ${@base_contains('COMBINED_FEATURES', 'vfat', 'task-base-vfat', '',d)} \ | ||
80 | ${@base_contains('COMBINED_FEATURES', 'irda', 'task-base-irda', '',d)} \ | ||
81 | ${@base_contains('COMBINED_FEATURES', 'pci', 'task-base-pci', '',d)} \ | ||
82 | ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'task-base-pcmcia', '',d)} \ | ||
83 | ${@base_contains('COMBINED_FEATURES', 'usbgadget', 'task-base-usbgadget', '',d)} \ | ||
84 | ${@base_contains('COMBINED_FEATURES', 'usbhost', 'task-base-usbhost', '',d)} \ | ||
85 | ${@base_contains('COMBINED_FEATURES', 'bluetooth', 'task-base-bluetooth', '',d)} \ | ||
86 | ${@base_contains('COMBINED_FEATURES', 'wifi', 'task-base-wifi', '',d)} \ | ||
87 | ${@base_contains('COMBINED_FEATURES', '3g', 'task-base-3g', '',d)} \ | ||
88 | ${@base_contains('COMBINED_FEATURES', 'uboot', 'task-base-uboot', '',d)} \ | ||
89 | ${@base_contains('COMBINED_FEATURES', 'redboot', 'task-base-redboot', '',d)} \ | ||
90 | ${@base_contains('COMBINED_FEATURES', 'apex', 'task-base-apex', '',d)} \ | ||
91 | \ | ||
92 | ${@base_contains('DISTRO_FEATURES', 'nfs', 'task-base-nfs', '',d)} \ | ||
93 | ${@base_contains('DISTRO_FEATURES', 'cramfs', 'task-base-cramfs', '',d)} \ | ||
94 | ${@base_contains('DISTRO_FEATURES', 'smbfs', 'task-base-smbfs', '',d)} \ | ||
95 | ${@base_contains('DISTRO_FEATURES', 'ipv6', 'task-base-ipv6', '',d)} \ | ||
96 | ${@base_contains('DISTRO_FEATURES', 'ipsec', 'task-base-ipsec', '',d)} \ | ||
97 | ${@base_contains('DISTRO_FEATURES', 'ppp', 'task-base-ppp', '',d)} \ | ||
98 | ${@base_contains('DISTRO_FEATURES', 'raid', 'task-base-raid', '',d)} \ | ||
99 | ${@base_contains('DISTRO_FEATURES', 'zeroconf', 'task-base-zeroconf', '',d)} \ | ||
100 | " | ||
101 | |||
102 | |||
103 | RRECOMMENDS_task-base = "\ | ||
104 | kernel-module-nls-utf8 \ | ||
105 | kernel-module-input \ | ||
106 | kernel-module-uinput \ | ||
107 | kernel-module-rtc-dev \ | ||
108 | kernel-module-rtc-proc \ | ||
109 | kernel-module-rtc-sysfs \ | ||
110 | kernel-module-unix" | ||
111 | |||
112 | RDEPENDS_task-base-extended = "\ | ||
113 | task-base \ | ||
114 | ${ADD_WIFI} \ | ||
115 | ${ADD_BT} \ | ||
116 | ${ADD_3G} \ | ||
117 | " | ||
118 | |||
119 | ADD_WIFI = "" | ||
120 | ADD_BT = "" | ||
121 | ADD_3G = "" | ||
122 | |||
123 | python __anonymous () { | ||
124 | # If Distro want wifi and machine feature wifi/pci/pcmcia/usbhost (one of them) | ||
125 | # then include task-base-wifi in task-base | ||
126 | |||
127 | distro_features = set(d.getVar("DISTRO_FEATURES", True).split()) | ||
128 | machine_features= set(d.getVar("MACHINE_FEATURES", True).split()) | ||
129 | |||
130 | if "bluetooth" in distro_features and not "bluetooth" in machine_features and ("pcmcia" in machine_features or "pci" in machine_features or "usbhost" in machine_features): | ||
131 | d.setVar("ADD_BT", "task-base-bluetooth") | ||
132 | |||
133 | if "wifi" in distro_features and not "wifi" in machine_features and ("pcmcia" in machine_features or "pci" in machine_features or "usbhost" in machine_features): | ||
134 | d.setVar("ADD_WIFI", "task-base-wifi") | ||
135 | |||
136 | if "3g" in distro_features and not "3g" in machine_features and ("pcmcia" in machine_features or "pci" in machine_features or "usbhost" in machine_features): | ||
137 | d.setVar("ADD_3G", "task-base-3g") | ||
138 | } | ||
139 | |||
140 | # | ||
141 | # packages added by distribution | ||
142 | # | ||
143 | DEPENDS_task-distro-base = "${DISTRO_EXTRA_DEPENDS}" | ||
144 | RDEPENDS_task-distro-base = "${DISTRO_EXTRA_RDEPENDS}" | ||
145 | RRECOMMENDS_task-distro-base = "${DISTRO_EXTRA_RRECOMMENDS}" | ||
146 | |||
147 | # | ||
148 | # packages added by machine config | ||
149 | # | ||
150 | RDEPENDS_task-machine-base = "${MACHINE_EXTRA_RDEPENDS}" | ||
151 | RRECOMMENDS_task-machine-base = "${MACHINE_EXTRA_RRECOMMENDS}" | ||
152 | |||
153 | RDEPENDS_task-base-keyboard = "\ | ||
154 | keymaps" | ||
155 | |||
156 | RDEPENDS_task-base-pci = "\ | ||
157 | pciutils" | ||
158 | |||
159 | RDEPENDS_task-base-acpi = "\ | ||
160 | acpid \ | ||
161 | libacpi " | ||
162 | |||
163 | RDEPENDS_task-base-apm = "\ | ||
164 | ${VIRTUAL-RUNTIME_apm} \ | ||
165 | apmd" | ||
166 | |||
167 | RDEPENDS_task-base-ext2 = "\ | ||
168 | hdparm \ | ||
169 | e2fsprogs \ | ||
170 | e2fsprogs-e2fsck \ | ||
171 | e2fsprogs-mke2fs" | ||
172 | |||
173 | RRECOMMENDS_task-base-vfat = "\ | ||
174 | kernel-module-msdos \ | ||
175 | kernel-module-vfat \ | ||
176 | kernel-module-nls-iso8859-1 \ | ||
177 | kernel-module-nls-cp437" | ||
178 | |||
179 | RDEPENDS_task-base-alsa = "\ | ||
180 | alsa-utils-alsactl \ | ||
181 | alsa-utils-alsamixer \ | ||
182 | ${VIRTUAL-RUNTIME_alsa-state}" | ||
183 | |||
184 | RRECOMMENDS_task-base-alsa = "\ | ||
185 | kernel-module-snd-mixer-oss \ | ||
186 | kernel-module-snd-pcm-oss" | ||
187 | |||
188 | RDEPENDS_task-base-pcmcia = "\ | ||
189 | pcmciautils \ | ||
190 | " | ||
191 | #${@base_contains('DISTRO_FEATURES', 'wifi', 'prism-firmware', '',d)} | ||
192 | #${@base_contains('DISTRO_FEATURES', 'wifi', 'spectrum-fw', '',d)} | ||
193 | |||
194 | |||
195 | RRECOMMENDS_task-base-pcmcia = "\ | ||
196 | kernel-module-pcmcia \ | ||
197 | kernel-module-airo-cs \ | ||
198 | kernel-module-pcnet-cs \ | ||
199 | kernel-module-serial-cs \ | ||
200 | kernel-module-ide-cs \ | ||
201 | kernel-module-ide-disk \ | ||
202 | ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-hostap-cs', '',d)} \ | ||
203 | ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-orinoco-cs', '',d)} \ | ||
204 | ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-spectrum-cs', '',d)}" | ||
205 | |||
206 | # Provide bluez-utils-compat utils for the time being, the binaries in that package will vanish soon from upstream releases, so beware! | ||
207 | |||
208 | RDEPENDS_task-base-bluetooth = "\ | ||
209 | bluez4 \ | ||
210 | ${@base_contains('COMBINED_FEATURES', 'alsa', 'libasound-module-bluez', '',d)} \ | ||
211 | " | ||
212 | |||
213 | RRECOMMENDS_task-base-bluetooth = "\ | ||
214 | kernel-module-bluetooth \ | ||
215 | kernel-module-l2cap \ | ||
216 | kernel-module-rfcomm \ | ||
217 | kernel-module-hci-vhci \ | ||
218 | kernel-module-bnep \ | ||
219 | kernel-module-hidp \ | ||
220 | kernel-module-hci-uart \ | ||
221 | kernel-module-sco \ | ||
222 | ${@base_contains('COMBINED_FEATURES', 'usbhost', 'kernel-module-hci-usb', '',d)} \ | ||
223 | ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluetooth3c-cs', '',d)} \ | ||
224 | ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluecard-cs', '',d)} \ | ||
225 | ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluetoothuart-cs', '',d)} \ | ||
226 | ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-dtl1-cs', '',d)} \ | ||
227 | " | ||
228 | |||
229 | RDEPENDS_task-base-irda = "\ | ||
230 | irda-utils" | ||
231 | |||
232 | RRECOMMENDS_task-base-irda = "\ | ||
233 | kernel-module-pxaficp-ir \ | ||
234 | kernel-module-irda \ | ||
235 | kernel-module-ircomm \ | ||
236 | kernel-module-ircomm-tty \ | ||
237 | kernel-module-irlan \ | ||
238 | ${@base_contains('DISTRO_FEATURES', 'ppp', 'kernel-module-irnet', '',d)} \ | ||
239 | kernel-module-irport \ | ||
240 | kernel-module-irtty \ | ||
241 | kernel-module-irtty-sir \ | ||
242 | kernel-module-sir-dev \ | ||
243 | ${@base_contains('COMBINED_FEATURES', 'usbhost', 'kernel-module-ir-usb', '',d)} " | ||
244 | |||
245 | RRECOMMENDS_task-base-usbgadget = "\ | ||
246 | kernel-module-pxa27x_udc \ | ||
247 | kernel-module-gadgetfs \ | ||
248 | kernel-module-g-file-storage \ | ||
249 | kernel-module-g-serial \ | ||
250 | kernel-module-g-ether" | ||
251 | |||
252 | RDEPENDS_task-base-usbhost = "\ | ||
253 | usbutils " | ||
254 | |||
255 | RRECOMMENDS_task-base-usbhost = "\ | ||
256 | kernel-module-uhci-hcd \ | ||
257 | kernel-module-ohci-hcd \ | ||
258 | kernel-module-ehci-hcd \ | ||
259 | kernel-module-usbcore \ | ||
260 | kernel-module-usbhid \ | ||
261 | kernel-module-usbnet \ | ||
262 | kernel-module-sd-mod \ | ||
263 | kernel-module-scsi-mod \ | ||
264 | kernel-module-usbmouse \ | ||
265 | kernel-module-mousedev \ | ||
266 | kernel-module-usbserial \ | ||
267 | kernel-module-usb-storage " | ||
268 | |||
269 | RDEPENDS_task-base-ppp = "\ | ||
270 | ppp \ | ||
271 | ppp-dialin" | ||
272 | |||
273 | RRECOMMENDS_task-base-ppp = "\ | ||
274 | kernel-module-ppp-async \ | ||
275 | kernel-module-ppp-deflate \ | ||
276 | kernel-module-ppp-generic \ | ||
277 | kernel-module-ppp-mppe \ | ||
278 | kernel-module-slhc" | ||
279 | |||
280 | RDEPENDS_task-base-ipsec = "\ | ||
281 | openswan" | ||
282 | |||
283 | RRECOMMENDS_task-base-ipsec = "\ | ||
284 | kernel-module-ipsec" | ||
285 | |||
286 | # | ||
287 | # task-base-wifi contain everything needed to get WiFi working | ||
288 | # WEP/WPA connection needs to be supported out-of-box | ||
289 | # | ||
290 | RDEPENDS_task-base-wifi = "\ | ||
291 | wireless-tools \ | ||
292 | ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'hostap-utils', '',d)} \ | ||
293 | ${@base_contains('COMBINED_FEATURES', 'pci', 'hostap-utils', '',d)} \ | ||
294 | wpa-supplicant" | ||
295 | |||
296 | RRECOMMENDS_task-base-wifi = "\ | ||
297 | ${@base_contains('COMBINED_FEATURES', 'usbhost', 'kernel-module-zd1211rw', '',d)} \ | ||
298 | kernel-module-ieee80211-crypt \ | ||
299 | kernel-module-ieee80211-crypt-ccmp \ | ||
300 | kernel-module-ieee80211-crypt-tkip \ | ||
301 | kernel-module-ieee80211-crypt-wep \ | ||
302 | kernel-module-ecb \ | ||
303 | kernel-module-arc4 \ | ||
304 | kernel-module-crypto_algapi \ | ||
305 | kernel-module-cryptomgr \ | ||
306 | kernel-module-michael-mic \ | ||
307 | kernel-module-aes-generic \ | ||
308 | kernel-module-aes" | ||
309 | |||
310 | RDEPENDS_task-base-3g = "\ | ||
311 | ofono" | ||
312 | |||
313 | RRECOMMENDS_task-base-3g = "\ | ||
314 | kernel-module-cdc-acm \ | ||
315 | kernel-module-cdc-wdm" | ||
316 | |||
317 | RRECOMMENDS_task-base-smbfs = "\ | ||
318 | kernel-module-cifs \ | ||
319 | kernel-module-smbfs" | ||
320 | |||
321 | RRECOMMENDS_task-base-cramfs = "\ | ||
322 | kernel-module-cramfs" | ||
323 | |||
324 | # | ||
325 | # task-base-nfs provides ONLY client support - server is in nfs-utils package | ||
326 | # | ||
327 | RDEPENDS_task-base-nfs = "\ | ||
328 | portmap" | ||
329 | |||
330 | RRECOMMENDS_task-base-nfs = "\ | ||
331 | kernel-module-nfs " | ||
332 | |||
333 | RDEPENDS_task-base-zeroconf = "\ | ||
334 | avahi-daemon" | ||
335 | |||
336 | RDEPENDS_task-base-raid = "\ | ||
337 | " | ||
338 | |||
339 | RDEPENDS_task-base-screen = "\ | ||
340 | " | ||
341 | |||
342 | # | ||
343 | # GPE/OPIE/OpenMoko provide own touchscreen calibration utils | ||
344 | # | ||
345 | RDEPENDS_task-base-touchscreen = "\ | ||
346 | " | ||
347 | |||
348 | RDEPENDS_task-base-ipv6 = "\ | ||
349 | " | ||
350 | |||
351 | RRECOMMENDS_task-base-ipv6 = "\ | ||
352 | kernel-module-ipv6 " | ||
353 | |||
354 | RDEPENDS_task-base-serial = "\ | ||
355 | setserial \ | ||
356 | lrzsz " | ||
357 | |||
358 | RDEPENDS_task-base-phone = "\ | ||
359 | ofono" | ||
diff --git a/meta/recipes-core/tasks/task-core-ssh-dropbear.bb b/meta/recipes-core/tasks/task-core-ssh-dropbear.bb deleted file mode 100644 index 1e7402e11f..0000000000 --- a/meta/recipes-core/tasks/task-core-ssh-dropbear.bb +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | DESCRIPTION = "Dropbear SSH task for Poky" | ||
2 | LICENSE = "MIT" | ||
3 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ | ||
4 | file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | ||
5 | PR = "r0" | ||
6 | |||
7 | PACKAGES = "\ | ||
8 | task-core-ssh-dropbear \ | ||
9 | task-core-ssh-dropbear-dbg \ | ||
10 | task-core-ssh-dropbear-dev \ | ||
11 | " | ||
12 | |||
13 | ALLOW_EMPTY = "1" | ||
14 | |||
15 | RDEPENDS_task-core-ssh-dropbear = "dropbear" | ||
16 | RDEPENDS_task-core-ssh-dropbear-dbg = "dropbear-dbg" | ||
17 | RDEPENDS_task-core-ssh-dropbear-dev = "dropbear-dev" | ||