diff options
| author | Phil Blundell <philb@gnu.org> | 2004-12-05 18:51:54 +0000 |
|---|---|---|
| committer | Phil Blundell <philb@gnu.org> | 2004-12-05 18:51:54 +0000 |
| commit | b066accc47f9524fde54efcc106273f8d84a4839 (patch) | |
| tree | b0146ab12bf8055f92a0ccfdc4cbd27f86f28062 | |
| parent | 0be598ee7faa4d4b232e6e378502aaa13cab5943 (diff) | |
remove modutils-modinfo from task-bootstrap
allow MACHINE.conf to control which of modutils-depmod and module-init-tools-depmod is included; default is both
BKrev: 41b358caOFyRowRQOFcc7Y1khQnzlA
| -rw-r--r-- | meta/task-bootstrap.oe | 32 |
1 files changed, 28 insertions, 4 deletions
diff --git a/meta/task-bootstrap.oe b/meta/task-bootstrap.oe index ebcbcc6a4b..cd84ad5904 100644 --- a/meta/task-bootstrap.oe +++ b/meta/task-bootstrap.oe @@ -1,6 +1,6 @@ DESCRIPTION = "Core packages required for a basic installation" MAINTAINER = "Phil Blundell <pb@handhelds.org>" -PR = "r11" +PR = "r13" # The BOOTSTRAP_EXTRA_ variables are often manipulated by the # MACHINE .conf files, so adjust PACKAGE_ARCH accordingly. @@ -9,17 +9,41 @@ PACKAGE_ARCH := "${MACHINE_ARCH}" ALLOW_EMPTY = 1 PACKAGES = "${PN}" +MODUTILS ?= "24 26" + +def bootstrap_modutils_depends(d): + import oe + m = oe.data.getVar('MODUTILS', d, 1) + r = [] + if '24' in m: + r.append('modutils') + if '26' in m: + r.append('module-init-tools') + return ' '.join(r) + +def bootstrap_modutils_rdepends(d): + import oe + m = oe.data.getVar('MODUTILS', d, 1) + r = [] + if '24' in m: + r.append('modutils-depmod') + if '26' in m: + r.append('module-init-tools-depmod') + return ' '.join(r) + DEPENDS = 'base-files base-passwd-3.5.7 \ busybox dropbear hotplug initscripts modutils netbase \ sysvinit tinylogin portmap \ modutils-initscripts \ - ${BOOTSTRAP_EXTRA_DEPENDS}' + ${BOOTSTRAP_EXTRA_DEPENDS} \ + ${@bootstrap_modutils_depends(d)}' RDEPENDS = 'base-files base-passwd busybox \ - hotplug initscripts modutils-depmod modutils-modinfo \ + hotplug initscripts \ netbase sysvinit tinylogin \ modutils-initscripts \ - ${BOOTSTRAP_EXTRA_RDEPENDS}' + ${BOOTSTRAP_EXTRA_RDEPENDS} \ + ${@bootstrap_modutils_rdepends(d)}' RRECOMMENDS = 'dropbear portmap \ ${BOOTSTRAP_EXTRA_RRECOMMENDS}' |