Merge bk://oe-devel@oe-devel.bkbits.net/openembedded

into cwiiisdesktop.(none):/home/cwiiis/oe/openembedded

2005/01/25 18:14:20+00:00 (none)!cwiiis
Change the DEFAULT_PREFERENCE of task-bootstrap-unionroot (it shouldn't be the default).

BKrev: 41f68ca0j5WZH5LrX77IxRuNsGYHtA

diff --git a/packages/meta/task-bootstrap-unionroot.bb b/packages/meta/task-bootstrap-unionroot.bb
index e69de29..c5edb56 100644 (file)
--- a/packages/meta/task-bootstrap-unionroot.bb
+++ b/packages/meta/task-bootstrap-unionroot.bb
@@ -0,0 +1,60 @@
+DESCRIPTION = "Core packages required for a basic installation with unionroot"
+MAINTAINER = "Chris Lord <cwiiis@handhelds.org>"
+PROVIDES = "task-bootstrap"
+PN = "task-bootstrap"
+PV = "1.0unionroot"
+DEFAULT_PREFERENCE = "-1"
+
+# The BOOTSTRAP_EXTRA_ variables are often manipulated by the
+# MACHINE .conf files, so adjust PACKAGE_ARCH accordingly.
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+ALLOW_EMPTY = 1
+PACKAGES = "${PN}"
+
+MODUTILS ?= "24 26"
+
+def bootstrap_modutils_depends(d):
+       import bb
+       m = bb.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 bb
+        m = bb.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_modutils_depends(d)} \
+       unionfs-modules \
+       unionfs-utils \
+       unionroot \
+       unionroot-utils'
+
+RDEPENDS = 'base-files base-passwd busybox \
+       hotplug initscripts \
+       netbase sysvinit sysvinit-pidof tinylogin \
+       modutils-initscripts \
+       ${BOOTSTRAP_EXTRA_RDEPENDS} \
+       ${@bootstrap_modutils_rdepends(d)} \
+       unionfs-modules \
+       unionfs-utils \
+       unionroot \
+       unionroot-utils'
+
+RRECOMMENDS = 'dropbear portmap \
+       ${BOOTSTRAP_EXTRA_RRECOMMENDS}'