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 @@
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r50"
+PR = "r66"
+
+inherit task
 
 PROVIDES = "${PACKAGES}"
 PACKAGES = ' \
-            task-base task-base-dev task-base-dbg\
-            task-base-extended task-base-extended-dev task-base-extended-dbg \
-            task-distro-base task-distro-base-dev task-distro-base-dbg \
-            task-machine-base task-machine-base-dev task-machine-base-dbg \
+            task-base \
+            task-base-extended \
+            task-distro-base \
+            task-machine-base \
+            \
+            ${@base_contains("MACHINE_FEATURES", "acpi", "task-base-acpi", "",d)} \
+            ${@base_contains("MACHINE_FEATURES", "alsa", "task-base-alsa", "", d)} \
+            ${@base_contains("MACHINE_FEATURES", "apm", "task-base-apm", "", d)} \
+            ${@base_contains("MACHINE_FEATURES", "ext2", "task-base-ext2", "", d)} \
+            ${@base_contains("MACHINE_FEATURES", "vfat", "task-base-vfat", "", d)} \
+            ${@base_contains("MACHINE_FEATURES", "irda", "task-base-irda", "",d)} \
+            ${@base_contains("MACHINE_FEATURES", "keyboard", "task-base-keyboard", "", d)} \
+            ${@base_contains("MACHINE_FEATURES", "pci", "task-base-pci", "",d)} \
+            ${@base_contains("MACHINE_FEATURES", "pcmcia", "task-base-pcmcia", "", d)} \
+            ${@base_contains("MACHINE_FEATURES", "phone", "task-base-phone", "", d)} \
+            ${@base_contains("MACHINE_FEATURES", "screen", "task-base-screen", "", d)} \
+            ${@base_contains("MACHINE_FEATURES", "serial", "task-base-serial", "", d)} \
+            ${@base_contains("MACHINE_FEATURES", "touchscreen", "task-base-touchscreen", "", d)} \
+            ${@base_contains("MACHINE_FEATURES", "usbgadget", "task-base-usbgadget", "", d)} \
+            ${@base_contains("MACHINE_FEATURES", "usbhost", "task-base-usbhost", "", d)} \
             \
-            ${@base_contains("MACHINE_FEATURES", "acpi", "task-base-acpi task-base-acpi-dev task-base-acpi-dbg", "",d)} \
-            ${@base_contains("MACHINE_FEATURES", "irda", "task-base-irda task-base-irda-dev task-base-irda-dbg", "",d)} \
-            ${@base_contains("MACHINE_FEATURES", "pci", "task-base-pci task-base-pci-dev task-base-pci-dbg", "",d)} \
-            ${@base_contains("MACHINE_FEATURES", "alsa", "task-base-alsa task-base-alsa-dev task-base-alsa-dbg", "", d)} \
-            ${@base_contains("MACHINE_FEATURES", "apm", "task-base-apm task-base-apm-dev task-base-apm-dbg", "", d)} \
-            ${@base_contains("MACHINE_FEATURES", "ext2", "task-base-ext2 task-base-ext2-dev task-base-ext2-dbg", "", d)} \
-            ${@base_contains("MACHINE_FEATURES", "keyboard", "task-base-keyboard task-base-keyboard-dev task-base-keyboard-dbg", "", d)} \
-            ${@base_contains("MACHINE_FEATURES", "pcmcia", "task-base-pcmcia task-base-pcmcia-dev task-base-pcmcia-dbg", "", d)} \
-            ${@base_contains("MACHINE_FEATURES", "phone", "task-base-phone task-base-phone-dev task-base-phone-dbg", "", d)} \
-            ${@base_contains("MACHINE_FEATURES", "screen", "task-base-screen task-base-screen-dev task-base-screen-dbg", "", d)} \
-            ${@base_contains("MACHINE_FEATURES", "serial", "task-base-serial task-base-serial-dev task-base-serial-dbg", "", d)} \
-            ${@base_contains("MACHINE_FEATURES", "touchscreen", "task-base-touchscreen task-base-touchscreen-dev task-base-touchscreen-dbg", "", d)} \
-            ${@base_contains("MACHINE_FEATURES", "usbgadget", "task-base-usbgadget task-base-usbgadget-dev task-base-usbgadget-dbg", "", d)} \
-            ${@base_contains("MACHINE_FEATURES", "usbhost", "task-base-usbhost task-base-usbhost-dev task-base-usbhost-dbg", "", d)} \
-            task-base-bluetooth task-base-bluetooth-dev task-base-bluetooth-dbg \
-            task-base-wifi task-base-wifi-dev task-base-wifi-dbg \
+            ${@base_contains("MACHINE_FEATURES", "uboot", "task-base-uboot", "",d)} \
+            ${@base_contains("MACHINE_FEATURES", "redboot", "task-base-redboot", "",d)} \
+            ${@base_contains("MACHINE_FEATURES", "apex", "task-base-apex", "",d)} \
+            \
+            task-base-bluetooth \
+            task-base-wifi \
             \
-            ${@base_contains("DISTRO_FEATURES", "cramfs", "task-base-cramfs task-base-cramfs-dev task-base-cramfs-dbg", "", d)} \
-            ${@base_contains("DISTRO_FEATURES", "ipsec", "task-base-ipsec task-base-ipsec-dev task-base-ipsec-dbg", "", d)} \
-            ${@base_contains("DISTRO_FEATURES", "ipv6", "task-base-ipv6 task-base-ipv6-dev task-base-ipv6-dbg", "", d)} \
-            ${@base_contains("DISTRO_FEATURES", "nfs", "task-base-nfs task-base-nfs-dev task-base-nfs-dbg", "", d)} \
-            ${@base_contains("DISTRO_FEATURES", "ppp", "task-base-ppp task-base-ppp-dev task-base-ppp-dbg", "", d)} \
-            ${@base_contains("DISTRO_FEATURES", "smbfs", "task-base-smbfs task-base-smbfs-dev task-base-smbfs-dbg", "", d)} \
-            ${@base_contains("DISTRO_FEATURES", "zeroconf", "task-base-zeroconf task-base-zeroconf-dev task-base-zeroconf-dbg", "", d)} \
-        \
-            task-base-kernel26 task-base-kernel26-dev task-base-kernel26-dbg \
+            ${@base_contains("DISTRO_FEATURES", "cramfs", "task-base-cramfs", "", d)} \
+            ${@base_contains("DISTRO_FEATURES", "ipsec", "task-base-ipsec", "", d)} \
+            ${@base_contains("DISTRO_FEATURES", "ipv6", "task-base-ipv6", "", d)} \
+            ${@base_contains("DISTRO_FEATURES", "nfs", "task-base-nfs", "", d)} \
+            ${@base_contains("DISTRO_FEATURES", "ppp", "task-base-ppp", "", d)} \
+            ${@base_contains("DISTRO_FEATURES", "smbfs", "task-base-smbfs", "", d)} \
+            ${@base_contains("DISTRO_FEATURES", "raid", "task-base-raid", "",d)} \
+            ${@base_contains("DISTRO_FEATURES", "zeroconf", "task-base-zeroconf", "", d)} \
+            \
+            ${@base_contains("MACHINE_FEATURES","kernel26","task-base-kernel26","task-base-kernel24",d)} \
             '
 
 ALLOW_EMPTY = "1"
 
+#
+# packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH
+#
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 #
+# linux-hotplug or none
+#
+HOTPLUG ?= "${@base_contains("MACHINE_FEATURES", "kernel24",  "linux-hotplug","",d)} "
+
+#
+# dropbear, openssh or none
+#
+DISTRO_SSH_DAEMON ?= "dropbear"
+
+#
 # pcmciautils for >= 2.6.13-rc1, pcmcia-cs for others
 #
 PCMCIA_MANAGER ?= "${@base_contains('MACHINE_FEATURES', 'kernel26','pcmciautils','pcmcia-cs',d)} "
 
 #
+# those ones can be set in machine config to supply packages needed to get machine booting
+#
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
+
+#
 # task-base contain stuff needed for base system (machine related)
 #
 RDEPENDS_task-base = "\
+    task-poky-boot \
     task-distro-base \
     task-machine-base \
+    ${DISTRO_SSH_DAEMON} \
+    ${HOTPLUG} \
     \
-    task-base-kernel26 \
+    ${@base_contains('MACHINE_FEATURES', 'kernel26','task-base-kernel26','task-base-kernel24',d)} \
     ${@base_contains('MACHINE_FEATURES', 'apm', 'task-base-apm', '',d)} \
     ${@base_contains('MACHINE_FEATURES', 'acpi', 'task-base-acpi', '',d)} \
     ${@base_contains('MACHINE_FEATURES', 'keyboard', 'task-base-keyboard', '',d)} \
@@ -60,6 +91,7 @@ RDEPENDS_task-base = "\
     \
     ${@base_contains('COMBINED_FEATURES', 'alsa', 'task-base-alsa', '',d)} \
     ${@base_contains('COMBINED_FEATURES', 'ext2', 'task-base-ext2', '',d)} \
+    ${@base_contains('COMBINED_FEATURES', 'vfat', 'task-base-vfat', '',d)} \
     ${@base_contains('COMBINED_FEATURES', 'irda', 'task-base-irda', '',d)} \
     ${@base_contains('COMBINED_FEATURES', 'pci', 'task-base-pci', '',d)} \
     ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'task-base-pcmcia', '',d)} \
@@ -68,12 +100,17 @@ RDEPENDS_task-base = "\
     ${@base_contains('COMBINED_FEATURES', 'usbhost', 'task-base-usbhost', '',d)} \
     ${@base_contains('COMBINED_FEATURES', 'bluetooth', 'task-base-bluetooth', '',d)} \
     ${@base_contains('COMBINED_FEATURES', 'wifi', 'task-base-wifi', '',d)} \
+    ${@base_contains('COMBINED_FEATURES', 'uboot', 'task-base-uboot', '',d)} \
+    ${@base_contains('COMBINED_FEATURES', 'redboot', 'task-base-redboot', '',d)} \
+    ${@base_contains('COMBINED_FEATURES', 'apex', 'task-base-apex', '',d)} \
     \
     ${@base_contains('DISTRO_FEATURES', 'nfs', 'task-base-nfs', '',d)} \
+    ${@base_contains('DISTRO_FEATURES', 'cramfs', 'task-base-cramfs', '',d)} \
+    ${@base_contains('DISTRO_FEATURES', 'smbfs', 'task-base-smbfs', '',d)} \
     ${@base_contains('DISTRO_FEATURES', 'ipv6', 'task-base-ipv6', '',d)} \
     ${@base_contains('DISTRO_FEATURES', 'ipsec', 'task-base-ipsec', '',d)} \
     ${@base_contains('DISTRO_FEATURES', 'ppp', 'task-base-ppp', '',d)} \
-    ${@base_contains('DISTRO_FEATURES', 'smbfs', 'task-base-smbfs', '',d)} \
+    ${@base_contains('DISTRO_FEATURES', 'raid', 'task-base-raid', '',d)} \
     ${@base_contains('DISTRO_FEATURES', 'zeroconf', 'task-base-zeroconf', '',d)} \
     "
 # bluez-dtl1-workaround above is workaround for bitbake not handling DEPENDS on it in
@@ -109,6 +146,7 @@ python __anonymous () {
 #
 # packages added by distribution
 #
+DEPENDS_task-distro-base = "${DISTRO_EXTRA_DEPENDS}"
 RDEPENDS_task-distro-base = "${DISTRO_EXTRA_RDEPENDS}"
 RRECOMMENDS_task-distro-base = "${DISTRO_EXTRA_RRECOMMENDS}"
 
@@ -118,17 +156,26 @@ RRECOMMENDS_task-distro-base = "${DISTRO_EXTRA_RRECOMMENDS}"
 RDEPENDS_task-machine-base = "${MACHINE_EXTRA_RDEPENDS}"
 RRECOMMENDS_task-machine-base = "${MACHINE_EXTRA_RRECOMMENDS}"
 
+RDEPENDS_task-base-kernel24 = "\
+    modutils-depmod"
+
 RDEPENDS_task-base-kernel26 = "\
     sysfsutils \
     module-init-tools"
 
+RRECOMMENDS_task-base-kernel24 = "\
+    kernel-module-input \
+    kernel-module-uinput"
+
 RRECOMMENDS_task-base-kernel26 = "\
+    kernel-module-nls-utf8 \
     kernel-module-input \
     kernel-module-uinput \
     kernel-module-rtc-dev \
     kernel-module-rtc-proc \
     kernel-module-rtc-sysfs \
-    kernel-module-rtc-sa1100"
+    kernel-module-rtc-sa1100 \
+    kernel-module-unix"
 
 RDEPENDS_task-base-keyboard = "\
     keymaps"
@@ -149,13 +196,16 @@ RDEPENDS_task-base-ext2 = "\
     e2fsprogs-e2fsck \
     e2fsprogs-mke2fs"
 
+RRECOMMENDS_task-base-vfat = "\
+    kernel-module-msdos \
+    kernel-module-vfat \
+    kernel-module-nls-iso8859-1 \
+    kernel-module-nls-cp437"
+
 RDEPENDS_task-base-alsa = "\
     alsa-utils-alsactl \
     alsa-utils-alsamixer"
 
-#
-# alsa-state is machine related so can be missing in feed, OSS support is optional
-#
 RRECOMMENDS_task-base-alsa = "\
     kernel-module-snd-mixer-oss \
     kernel-module-snd-pcm-oss"
@@ -186,8 +236,12 @@ task-base-pcmcia26 = "\
     ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-orinoco-cs', '',d)} \
     ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-spectrum-cs', '',d)}"
 
+# Provide bluez-utils-compat utils for the time being, the binaries in that package will vanish soon from upstream releases, so beware! 
+
 RDEPENDS_task-base-bluetooth = "\ 
-    bluez-utils"
+    bluez-utils \
+    bluez-utils-compat \  
+    "
 
 RRECOMMENDS_task-base-bluetooth = "\
     kernel-module-bluetooth \
@@ -286,6 +340,7 @@ RRECOMMENDS_task-base-wifi = "\
     kernel-module-crypto_algapi \
     kernel-module-cryptomgr \
     kernel-module-michael-mic \
+    kernel-module-aes-generic \
     kernel-module-aes"
 
 RRECOMMENDS_task-base-smbfs = "\
@@ -307,6 +362,9 @@ RRECOMMENDS_task-base-nfs = "\
 RDEPENDS_task-base-zeroconf = "\
     avahi-daemon"
 
+RDEPENDS_task-base-raid = "\
+        "
+
 RDEPENDS_task-base-screen = "\
         "
 
@@ -314,8 +372,7 @@ RDEPENDS_task-base-screen = "\
 # GPE/OPIE/OpenMoko provide own touchscreen calibration utils
 #
 RDEPENDS_task-base-touchscreen = "\
-    tslib-tests \
-    tslib-calibrate "
+    "
 
 RDEPENDS_task-base-ipv6 = "\
     "