merge of '8dccbf106093aaa7b62b2a96962945185534c923'

     and 'c50825ba187c292f591cf43c91216cebffb5e290'

11 files changed, 68 insertions, 15 deletions

diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index 8f2f7935eb..77aa07de00 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 = "r57"
+PR = "r62"
 
 inherit task
 
@@ -168,7 +168,8 @@ RRECOMMENDS_task-base-kernel26 = "\
     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"
@@ -344,6 +345,8 @@ RRECOMMENDS_task-base-wifi = "\
     kernel-module-ieee80211-crypt-wep \
     kernel-module-ecb \
     kernel-module-arc4 \
+    kernel-module-crypto_algapi \
+    kernel-module-cryptomgr \
     kernel-module-michael-mic \
     kernel-module-aes"
 
diff --git a/packages/tasks/task-devimage.bb b/packages/tasks/task-devimage.bb
index 9da765ee94..f2d25e32ac 100644
--- a/packages/tasks/task-devimage.bb
+++ b/packages/tasks/task-devimage.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Image for development testing"
-PR = "r2"
+PR = "r4"
 LICENSE = "MIT"
 
 inherit task
@@ -19,8 +19,10 @@ RDEPENDS = "\
     "
 
 RRECOMMENDS = "\
+    kernel-image \
     kernel-module-msdos \
     kernel-module-vfat \
     kernel-modules \
     ${DEVIMAGE_EXTRA_RRECOMMENDS} \
     "
+PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/packages/tasks/task-java-gtk.bb b/packages/tasks/task-java-gtk.bb
new file mode 100644
index 0000000000..b4f75920f3
--- /dev/null
+++ b/packages/tasks/task-java-gtk.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Task package for Java GTK applications"
+PR = "r0"
+LICENSE = "MIT"
+
+inherit task
+
+RDEPENDS_${PN} = "\
+    classpath-awt \
+    librxtx-java \
+    librxtx-jni \
+    libswt3.4-gtk-java \
+    logic-analyzer \
+ "
diff --git a/packages/tasks/task-java.bb b/packages/tasks/task-java.bb
new file mode 100644
index 0000000000..be94662d40
--- /dev/null
+++ b/packages/tasks/task-java.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "Base task package for Java"
+PR = "r2"
+LICENSE = "MIT"
+
+inherit task
+
+RDEPENDS_${PN} = "\
+    cacao \
+    classpath-awt \
+    java2-runtime \
+    librxtx-java \
+ "
diff --git a/packages/tasks/task-openmoko-python-devel.bb b/packages/tasks/task-openmoko-python-devel.bb
index 37d64847f6..a5baed0024 100644
--- a/packages/tasks/task-openmoko-python-devel.bb
+++ b/packages/tasks/task-openmoko-python-devel.bb
@@ -1,11 +1,12 @@
 DESCRIPTION = "OpenMoko: Python Development Tools"
 SECTION = "openmoko/devel"
 LICENSE = "MIT"
-PR = "r1"
+PR = "r3"
 
 inherit task
 
 RDEPENDS_task-openmoko-python-devel = "\
-  python-efl \
+  task-python-efl \
   python-pygtk \
+  python-lightmediascanner \
 "
diff --git a/packages/tasks/task-opie-all.bb b/packages/tasks/task-opie-all.bb
index 4666b4ab8d..5487985fd4 100644
--- a/packages/tasks/task-opie-all.bb
+++ b/packages/tasks/task-opie-all.bb
@@ -50,8 +50,7 @@ RDEPENDS_task-opie-settings = "opie-appearance opie-aqpkg opie-backup opie-butto
                       opie-formatter opie-language opie-launcher-settings \

                       opie-light-and-power opie-mediummount opie-networksettings \

                       opie-packagemanager opie-security opie-sshkeys opie-sysinfo \

-                      opie-systemtime opie-usermanager opie-icon-reload \

-                      opie-vmemo-settings"

+                      opie-systemtime opie-icon-reload opie-vmemo-settings"

 

 RDEPENDS_task-opie-pim = "task-opie-base-pim task-opie-todayplugins task-opie-datebookplugins \

                  opie-mail opie-pimconverter"

diff --git a/packages/tasks/task-python-efl-examples.bb b/packages/tasks/task-python-efl-examples.bb
new file mode 100644
index 0000000000..e78a4cabae
--- /dev/null
+++ b/packages/tasks/task-python-efl-examples.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Python Examples for the Enlightenment Foundation Libraries"
+LICENSE = "MIT"
+SECTION = "devel/python"
+RDEPENDS = "\
+  task-python-efl \
+  python-ecore-examples \
+  python-emotion-examples \
+  python-edje-examples \
+  python-epsilon-examples \
+  python-math python-textutils \
+"
+PR = "ml3"
+
+ALLOW_EMPTY = "1"
diff --git a/packages/tasks/task-python-efl.bb b/packages/tasks/task-python-efl.bb
new file mode 100644
index 0000000000..1c7f23a1eb
--- /dev/null
+++ b/packages/tasks/task-python-efl.bb
@@ -0,0 +1,7 @@
+DESCRIPTION = "Python Bindings to the Enlightenment Foundation Libraries"
+LICENSE = "MIT"
+SECTION = "devel/python"
+RDEPENDS = "python-evas python-ecore python-emotion python-edje python-epsilon python-edbus"
+PR = "ml2"
+
+ALLOW_EMPTY = "1"
diff --git a/packages/tasks/task-python-everything.bb b/packages/tasks/task-python-everything.bb
index 61daa7e089..18455f5b96 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 = "ml24"
+PR = "ml26"
 
 RDEPENDS = "\
 		python-ao 		\
@@ -30,6 +30,7 @@ RDEPENDS = "\
 		python-itools		\
 		python-logilab-common		\
 		python-libgmail		\
+		python-lightmediascanner \
 		python-lxml		\
 		python-mad		\
 		python-numarray		\
@@ -74,6 +75,7 @@ RDEPENDS = "\
 		python-soappy		\
 		python-spydi		\
 		python-spyro		\
+		python-sqlalchemy	\
 		python-sqlobject	\
 		python-sword		\
 		python-tlslite		\
diff --git a/packages/tasks/task-qpe.bb b/packages/tasks/task-qpe.bb
index 347a4525b8..c13b5d48ef 100644
--- a/packages/tasks/task-qpe.bb
+++ b/packages/tasks/task-qpe.bb
@@ -136,7 +136,7 @@ RDEPENDS_task-qpe-fonts = "\
     qpf-helvetica \
     qpf-unifont \
     qpf-utopia \
-    terminus"
+    qpf-terminus"
 
 RDEPENDS_task-qpe-settings += "\
     qclockchange"
diff --git a/packages/tasks/task-slugos.bb b/packages/tasks/task-slugos.bb
index 4b8fde02c0..01cdaa21b4 100644
--- a/packages/tasks/task-slugos.bb
+++ b/packages/tasks/task-slugos.bb
@@ -6,7 +6,7 @@
 DESCRIPTION = "Task packages for the SlugOS distribution"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r15"
+PR = "r17"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 ALLOW_EMPTY = "1"
 
@@ -67,6 +67,7 @@ kernel-module-ext3 \
 kernel-module-vfat \
 kernel-module-nls-cp437 \
 kernel-module-nls-utf8 \
+kernel-module-nfs \
 "
 
 # Add daemon required for HW RNG support
@@ -84,8 +85,10 @@ kernel-module-uhci-hcd \
 "
 
 # Add modules required for IDE support
-# SLUGOS_STANDARD_RRECOMMENDS += "\
-# "
+SLUGOS_STANDARD_RRECOMMENDS += "\
+kernel-module-libata \
+kernel-module-pata-artop \
+"
 
 # Add modules required for Network support
 SLUGOS_STANDARD_RRECOMMENDS += "\
@@ -100,12 +103,9 @@ kernel-module-via-velocity \
 #
 # portmap \
 # kexec-tools \
-# kernel-module-nfs \
 # kernel-module-isofs \
 # kernel-module-udf \
 # kernel-module-loop \
-# kernel-module-libata \
-# kernel-module-pata-artop \
 # kernel-module-netconsole \
 # wpa-supplicant \
 # zd1211-firmware kernel-module-zd1211rw \