summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnders Darander <anders@chargestorm.se>2011-07-06 08:31:45 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-07 11:13:59 +0100
commit38bd46eaf6c3ece06062550beb376ec0d56fb3e7 (patch)
tree8d6209090b27218f3604d14e13b8f48c9d165c79
parent0849277414d8ec5442ce7069b4cc0984e8d743d1 (diff)
downloadpoky-38bd46eaf6c3ece06062550beb376ec0d56fb3e7.tar.gz
task-base: remove modutils reference.
Also remove the other kernel24 references. Make everything dependent on kernel26 default. Move the RDEPENDS- and RRECOMMENDS_task-base-kernel26 to _task-base. (From OE-Core rev: 030e4d5221631b452e0a00f8a4134b923115249d) Signed-off-by: Anders Darander <anders@chargestorm.se> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/tasks/task-base.bb60
1 files changed, 15 insertions, 45 deletions
diff --git a/meta/recipes-core/tasks/task-base.bb b/meta/recipes-core/tasks/task-base.bb
index 3ff57ff794..527bc6d39e 100644
--- a/meta/recipes-core/tasks/task-base.bb
+++ b/meta/recipes-core/tasks/task-base.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Merge machine and distro options to create a basic machine task/p
2LICENSE = "MIT" 2LICENSE = "MIT"
3LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ 3LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
4 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 4 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
5PR = "r71" 5PR = "r72"
6 6
7inherit task 7inherit task
8 8
@@ -45,7 +45,6 @@ PACKAGES = ' \
45 ${@base_contains("DISTRO_FEATURES", "raid", "task-base-raid", "",d)} \ 45 ${@base_contains("DISTRO_FEATURES", "raid", "task-base-raid", "",d)} \
46 ${@base_contains("DISTRO_FEATURES", "zeroconf", "task-base-zeroconf", "", d)} \ 46 ${@base_contains("DISTRO_FEATURES", "zeroconf", "task-base-zeroconf", "", d)} \
47 \ 47 \
48 ${@base_contains("MACHINE_FEATURES","kernel26","task-base-kernel26","task-base-kernel24",d)} \
49 ' 48 '
50 49
51ALLOW_EMPTY = "1" 50ALLOW_EMPTY = "1"
@@ -56,16 +55,6 @@ ALLOW_EMPTY = "1"
56PACKAGE_ARCH = "${MACHINE_ARCH}" 55PACKAGE_ARCH = "${MACHINE_ARCH}"
57 56
58# 57#
59# linux-hotplug or none
60#
61HOTPLUG ?= "${@base_contains("MACHINE_FEATURES", "kernel24", "linux-hotplug","",d)} "
62
63#
64# pcmciautils for >= 2.6.13-rc1, pcmcia-cs for others
65#
66PCMCIA_MANAGER ?= "${@base_contains('MACHINE_FEATURES', 'kernel26','pcmciautils','pcmcia-cs',d)} "
67
68#
69# those ones can be set in machine config to supply packages needed to get machine booting 58# those ones can be set in machine config to supply packages needed to get machine booting
70# 59#
71MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "" 60MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
@@ -77,9 +66,9 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
77RDEPENDS_task-base = "\ 66RDEPENDS_task-base = "\
78 task-distro-base \ 67 task-distro-base \
79 task-machine-base \ 68 task-machine-base \
80 ${HOTPLUG} \
81 \ 69 \
82 ${@base_contains('MACHINE_FEATURES', 'kernel26','task-base-kernel26','task-base-kernel24',d)} \ 70 sysfsutils \
71 module-init-tools \
83 ${@base_contains('MACHINE_FEATURES', 'apm', 'task-base-apm', '',d)} \ 72 ${@base_contains('MACHINE_FEATURES', 'apm', 'task-base-apm', '',d)} \
84 ${@base_contains('MACHINE_FEATURES', 'acpi', 'task-base-acpi', '',d)} \ 73 ${@base_contains('MACHINE_FEATURES', 'acpi', 'task-base-acpi', '',d)} \
85 ${@base_contains('MACHINE_FEATURES', 'keyboard', 'task-base-keyboard', '',d)} \ 74 ${@base_contains('MACHINE_FEATURES', 'keyboard', 'task-base-keyboard', '',d)} \
@@ -112,6 +101,17 @@ RDEPENDS_task-base = "\
112 " 101 "
113# bluez-dtl1-workaround above is workaround for bitbake not handling DEPENDS on it in 102# bluez-dtl1-workaround above is workaround for bitbake not handling DEPENDS on it in
114 103
104
105RRECOMMENDS_task-base = "\
106 kernel-module-nls-utf8 \
107 kernel-module-input \
108 kernel-module-uinput \
109 kernel-module-rtc-dev \
110 kernel-module-rtc-proc \
111 kernel-module-rtc-sysfs \
112 kernel-module-rtc-sa1100 \
113 kernel-module-unix"
114
115RDEPENDS_task-base-extended = "\ 115RDEPENDS_task-base-extended = "\
116 task-base \ 116 task-base \
117 ${ADD_WIFI} \ 117 ${ADD_WIFI} \
@@ -155,27 +155,6 @@ RRECOMMENDS_task-distro-base = "${DISTRO_EXTRA_RRECOMMENDS}"
155RDEPENDS_task-machine-base = "${MACHINE_EXTRA_RDEPENDS}" 155RDEPENDS_task-machine-base = "${MACHINE_EXTRA_RDEPENDS}"
156RRECOMMENDS_task-machine-base = "${MACHINE_EXTRA_RRECOMMENDS}" 156RRECOMMENDS_task-machine-base = "${MACHINE_EXTRA_RRECOMMENDS}"
157 157
158RDEPENDS_task-base-kernel24 = "\
159 modutils-depmod"
160
161RDEPENDS_task-base-kernel26 = "\
162 sysfsutils \
163 module-init-tools"
164
165RRECOMMENDS_task-base-kernel24 = "\
166 kernel-module-input \
167 kernel-module-uinput"
168
169RRECOMMENDS_task-base-kernel26 = "\
170 kernel-module-nls-utf8 \
171 kernel-module-input \
172 kernel-module-uinput \
173 kernel-module-rtc-dev \
174 kernel-module-rtc-proc \
175 kernel-module-rtc-sysfs \
176 kernel-module-rtc-sa1100 \
177 kernel-module-unix"
178
179RDEPENDS_task-base-keyboard = "\ 158RDEPENDS_task-base-keyboard = "\
180 keymaps" 159 keymaps"
181 160
@@ -214,28 +193,19 @@ RRECOMMENDS_task-base-alsa = "\
214 kernel-module-snd-pcm-oss" 193 kernel-module-snd-pcm-oss"
215 194
216RDEPENDS_task-base-pcmcia = "\ 195RDEPENDS_task-base-pcmcia = "\
217 ${PCMCIA_MANAGER} \ 196 pcmciautils \
218 " 197 "
219#${@base_contains('DISTRO_FEATURES', 'wifi', 'prism-firmware', '',d)} 198#${@base_contains('DISTRO_FEATURES', 'wifi', 'prism-firmware', '',d)}
220#${@base_contains('DISTRO_FEATURES', 'wifi', 'spectrum-fw', '',d)} 199#${@base_contains('DISTRO_FEATURES', 'wifi', 'spectrum-fw', '',d)}
221 200
222 201
223RRECOMMENDS_task-base-pcmcia = "\ 202RRECOMMENDS_task-base-pcmcia = "\
224 ${@base_contains('MACHINE_FEATURES', 'kernel26', '${task-base-pcmcia26}', '${task-base-pcmcia24}',d)} \
225 kernel-module-pcmcia \ 203 kernel-module-pcmcia \
226 kernel-module-airo-cs \ 204 kernel-module-airo-cs \
227 kernel-module-pcnet-cs \ 205 kernel-module-pcnet-cs \
228 kernel-module-serial-cs \ 206 kernel-module-serial-cs \
229 kernel-module-ide-cs \ 207 kernel-module-ide-cs \
230 kernel-module-ide-disk \ 208 kernel-module-ide-disk \
231 "
232
233task-base-pcmcia24 = "\
234 ${@base_contains('DISTRO_FEATURES', 'wifi', 'hostap-modules-cs', '',d)} \
235 ${@base_contains('DISTRO_FEATURES', 'wifi', 'orinoco-modules-cs', '',d)} \
236 "
237
238task-base-pcmcia26 = "\
239 ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-hostap-cs', '',d)} \ 209 ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-hostap-cs', '',d)} \
240 ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-orinoco-cs', '',d)} \ 210 ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-orinoco-cs', '',d)} \
241 ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-spectrum-cs', '',d)}" 211 ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-spectrum-cs', '',d)}"