propagate from branch 'org.openembedded.dev' (head acccc4840b95c279164a3eeacf893200164bdc65)

            to branch 'org.openembedded.dev.avr32' (head 4a915ee0a28076c53049330f3f2e58c7b85ef7a8)

11 files changed, 97 insertions, 68 deletions

diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index 412254d944..33d93f2921 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r44"
+PR = "r50"
 
 inherit task
 
@@ -11,43 +11,43 @@ PACKAGES = ' \
             task-distro-base \
             task-machine-base \
             \
-            task-base-acpi \
-            task-base-alsa \
-            task-base-apm \
+            ${@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", "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", "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-ext2 \
-            task-base-irda \
-            task-base-keyboard \
-            task-base-pci \
-            task-base-pcmcia \
-            task-base-phone \
-            task-base-screen \
-            task-base-serial \
-            task-base-touchscreen \
-            task-base-usbgadget \
-            task-base-usbhost \
             task-base-wifi \
             \
-            task-base-cramfs \
-            task-base-ipsec \
-            task-base-ipv6 \
-            task-base-nfs \
-            task-base-ppp \
-            task-base-smbfs \
-	    \
+            ${@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("MACHINE_FEATURES","kernel26","task-base-kernel26","task-base-kernel24",d)} \
-	    '
+            '
 
 #
 # packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH
 #
-PACKAGE_ARCH_task-base = "${MACHINE_ARCH}"
-PACKAGE_ARCH_task-machine-base = "${MACHINE_ARCH}"
-PACKAGE_ARCH_task-base-apm = "${MACHINE_ARCH}"
-PACKAGE_ARCH_task-base-bluetooth = "${MACHINE_ARCH}"
-PACKAGE_ARCH_task-base-irda = "${MACHINE_ARCH}"
-PACKAGE_ARCH_task-base-pcmcia = "${MACHINE_ARCH}"
-PACKAGE_ARCH_task-base-wifi = "${MACHINE_ARCH}"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 #
 # linux-hotplug or none
@@ -96,6 +96,7 @@ RDEPENDS_task-base = "\
     ${@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)} \
@@ -159,6 +160,7 @@ RRECOMMENDS_task-base-kernel24 = "\
     kernel-module-uinput"
 
 RRECOMMENDS_task-base-kernel26 = "\
+    kernel-module-nls-utf8 \
     kernel-module-input \
     kernel-module-uinput \
     kernel-module-rtc-dev \
@@ -298,6 +300,9 @@ RDEPENDS_task-base-uboot = "\
 RDEPENDS_task-base-redboot = "\
     fis"
 
+RDEPENDS_task-base-apex = "\
+    apex-env"
+
 RDEPENDS_task-base-ppp = "\
     ppp \
     ppp-dialin"
diff --git a/packages/tasks/task-boot.bb b/packages/tasks/task-boot.bb
index fb09ad1a83..0435c2aa62 100644
--- a/packages/tasks/task-boot.bb
+++ b/packages/tasks/task-boot.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Basic task to get a device booting"
-PR = "r41"
+PR = "r42"
 
 inherit task
 
diff --git a/packages/tasks/task-devimage.bb b/packages/tasks/task-devimage.bb
new file mode 100644
index 0000000000..bd0c15e70f
--- /dev/null
+++ b/packages/tasks/task-devimage.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "Image for development testing"
+PR = "r1"
+LICENSE = "MIT"
+
+inherit task
+
+DEVIMAGE_EXTRA_RDEPENDS ?= ""
+DEVIMAGE_EXTRA_RRECOMMENDS ?= ""
+
+RDEPENDS = "\
+    devimage \
+    busybox dropbear udev \
+    util-linux-mount \
+    module-init-tools pcmciautils \
+    wireless-tools wpa-supplicant \
+    irda-utils acx-firmware \
+    ${DEVIMAGE_EXTRA_RDEPENDS} \
+    "
+
+RRECOMMENDS = "\
+    kernel-module-msdos \
+    kernel-module-vfat \
+    kernel-modules \
+    ${DEVIMAGE_EXTRA_RRECOMMENDS} \
+    "
diff --git a/packages/tasks/task-gpe-sectest.bb b/packages/tasks/task-gpe-sectest.bb
deleted file mode 100644
index b647c6136b..0000000000
--- a/packages/tasks/task-gpe-sectest.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-DESCRIPTION = "Security testing task packages for GPE Palmtop Environment"
-PR = "r6"
-LICENSE = "MIT"
-
-inherit task
-
-RDEPENDS_${PN} = "\
-    nmap \
-    ettercap \
-    stunnel \
-    curl \
-    dsniff \
-    prismstumbler \
-    tcpdump \
-    kismet \
-    hydra \
-    thcrut"
-
diff --git a/packages/tasks/task-mipl.bb b/packages/tasks/task-mipl.bb
new file mode 100644
index 0000000000..9e2dce52f1
--- /dev/null
+++ b/packages/tasks/task-mipl.bb
@@ -0,0 +1,16 @@
+# Tasks for IPv6 Mobility extensions, needs:
+# CONFIG_IPV6_MIP6=y
+# CONFIG_IPV6=y
+# in the kernel .config
+
+DESCRIPTION = "Mobile ipv6 extensions"
+
+inherit task
+
+PACKAGE_ARCH = "all"
+
+RDEPENDS = "mipv6"
+RRECOMMENDS = "kernel-module-ipv6 \
+               kernel-module-mip6 \
+              "
+
diff --git a/packages/tasks/task-native-sdk.bb b/packages/tasks/task-native-sdk.bb
index b164363612..b840254176 100644
--- a/packages/tasks/task-native-sdk.bb
+++ b/packages/tasks/task-native-sdk.bb
@@ -3,7 +3,8 @@ LICENSE = "MIT"
 DEPENDS = "gcc binutils make patch patchutils diffstat diffutils automake flex bison gawk sed grep"
 RDEPENDS = "gcc-symlinks g++-symlinks binutils-symlinks make libc6-dev \
 	    flex flex-dev bison gawk sed grep autoconf automake make \
-	    patch patchutils diffstat diffutils libgcc-s-dev libstdc++-dev"
+	    patch patchutils diffstat diffutils libstdc++-dev"
+PR = "r2"
 
 ALLOW_EMPTY = "1"
 PACKAGES = "${PN}"
diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb
index 2df8c6c293..76e0b843f7 100644
--- a/packages/tasks/task-openmoko.bb
+++ b/packages/tasks/task-openmoko.bb
@@ -2,10 +2,12 @@ DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
 PROVIDES = "task-openmoko-everything"
-PR = "r66"
+PR = "r71"
 
 inherit task
 
+XSERVER ?= "xserver-kdrive-fbdev"
+
 PACKAGES = "\
   task-openmoko-linux \
   task-openmoko-ui \
@@ -46,6 +48,7 @@ RDEPENDS_task-openmoko-linux = "\
 # task-openmoko-ui
 #
 DESCRIPTION_task-openmoko-ui = "OpenMoko: The X11/Gtk+2 based native User Interface"
+PACKAGE_ARCH_task-openmoko-ui = "${MACHINE_ARCH}"
 RDEPENDS_task-openmoko-ui = "\
   gdk-pixbuf-loader-png \
   gdk-pixbuf-loader-gif \
@@ -54,12 +57,10 @@ RDEPENDS_task-openmoko-ui = "\
   pango-module-basic-x \
   pango-module-basic-fc \
   gtk+ \
-  matchbox-common \
   matchbox-wm \
-  xserver-kdrive-fbdev \
+  ${XSERVER} \
   xserver-kdrive-common \
   xserver-nodm-init \
-  ttf-bitstream-vera \
   xauth \
   xhost \
   xset \
@@ -141,7 +142,7 @@ RDEPENDS_task-openmoko-pim = "\
   openmoko-appmanager2 \
   openmoko-tasks2 \
   openmoko-mediaplayer2 \
-#  openmoko-messages \
+  openmoko-messages2 \
 "
 
 #
diff --git a/packages/tasks/task-opie-16mb.bb b/packages/tasks/task-opie-16mb.bb
index 7758b9a141..9d8295d0ca 100644
--- a/packages/tasks/task-opie-16mb.bb
+++ b/packages/tasks/task-opie-16mb.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Tasks for small OPIE image"
 SECTION = "opie/base"
 LICENSE = "MIT"
-PR = "r1"
+PR = "r3"
 
 inherit task
 
@@ -17,7 +17,7 @@ PACKAGES = "task-opie-16mb-base \
 # Dependencies to get the launcher up and running
 #
 RDEPENDS_task-opie-16mb-base = "opie-init opie-alarm opie-qcop opie-qss opie-quicklauncher \
-                           opie-taskbar opie-pics opie-sounds opie-freetype \
+                           opie-taskbar opie-pics opie-sounds opie-freetype opie-taskbar-images-320x240 \
                            ttf-dejavu-sans ttf-dejavu-sans-mono"
 
 #
diff --git a/packages/tasks/task-python-everything.bb b/packages/tasks/task-python-everything.bb
index 09367a931f..a1d9f444b1 100644
--- a/packages/tasks/task-python-everything.bb
+++ b/packages/tasks/task-python-everything.bb
@@ -1,7 +1,7 @@
 DESCRIPTION= "Everything Python"
 HOMEPAGE = "http://www.vanille.de/projects/python.spy"
 LICENSE = "MIT"
-PR = "ml20"
+PR = "ml21"
 
 RDEPENDS = "\
 		python-ao 		\
@@ -9,10 +9,7 @@ RDEPENDS = "\
 		python-constraint	\
 		python-dbus			\
 		python-dialog		\
-		python-evas			\
-		python-ecore		\
-		python-emotion		\
-		python-edje			\
+		python-efl			\
 		python-pycurl		\
 		python-fam			\
 		python-fnorb		\
@@ -52,6 +49,7 @@ RDEPENDS = "\
 		python-pyiw		\
 		python-pylinda		\
 		python-pylint		\
+		python-pyqt			\
 		python-pyraf		\
 		python-pyreverse	\
 		python-pyrex		\
@@ -74,6 +72,7 @@ RDEPENDS = "\
 		python-spydi		\
 		python-spyro		\
 		python-sqlobject	\
+		python-sword		\
 		python-tlslite		\
 		python-urwid		\
 		python-vmaps		\
@@ -88,9 +87,7 @@ BROKEN_PACKAGES = "\
 		python-egenix-mx-base \
 		python-gammu \
 		python-m2crypto \
-		python-sword \
 		python-mysqldb \
-        python-pyqt     \
         python-pyqwt        \
 "
 
diff --git a/packages/tasks/task-python-sharprom_20060425.bb b/packages/tasks/task-python-sharprom_20060425.bb
index 25841b357a..5dbd59d18a 100644
--- a/packages/tasks/task-python-sharprom_20060425.bb
+++ b/packages/tasks/task-python-sharprom_20060425.bb
@@ -20,7 +20,6 @@ RDEPENDS = "\
 		python-ao 		\
 		python-constraint	\
 		python-dialog		\
-		python-egenix-mx-base   \
 		python-fnorb		\
 		python-fpconst		\
 		python-gnosis		\
@@ -28,7 +27,7 @@ RDEPENDS = "\
 		python-irclib		\
 		python-itools		\
 		python-libgmail		\
-		python-logilab		\
+		python-logilab-common	\
 		python-lxml		\
 		python-mad		\
 		python-native		\
@@ -53,7 +52,6 @@ RDEPENDS = "\
 		python-pyweather	\
 		python-pyxml		\
 		python-pyxmlrpc		\
-		python-quicklauncher    \
 		python-scapy		\
 		python-scons		\
 		python-sip		\
@@ -70,6 +68,7 @@ RDEPENDS = "\
 		twisted			\
 		zope"
 
+#fixme add python-egenix-mx-base if brought in from nonworking
 #fixme add python-pycap once libdnet is in again
 #fixme add python-pyx once kpathwhich-native is there
 #fixme add packages dynamically
diff --git a/packages/tasks/task-toolchain-openmoko-sdk.bb b/packages/tasks/task-toolchain-openmoko-sdk.bb
index 062b05519b..bcb2d370a6 100644
--- a/packages/tasks/task-toolchain-openmoko-sdk.bb
+++ b/packages/tasks/task-toolchain-openmoko-sdk.bb
@@ -1,8 +1,9 @@
 DESCRIPTION = "Packages for a standalone OpenMoko SDK or external toolchain"
-PR = "r1"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
+PR = "r2"
+
 PACKAGES = "${PN}"
 
 RDEPENDS_${PN} = "\
@@ -25,4 +26,6 @@ RDEPENDS_${PN} = "\
     libmokoui2-dev \
     libmokopanelui2-dev \
     libmokojournal2-dev \
+    openmoko-sample2-src \
+    openmoko-toolchain-scripts \
 "