21 files changed, 36 insertions, 31 deletions
diff --git a/recipes/tasks/task-devimage.bb b/recipes/tasks/task-devimage.bb
index 1eff219563..0c8fdea32c 100644
--- a/recipes/tasks/task-devimage.bb
+++ b/recipes/tasks/task-devimage.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Image for development testing"
-PR = "r5"
+PR = "r6"
 LICENSE = "MIT"
 
 inherit task
diff --git a/recipes/tasks/task-efl.bb b/recipes/tasks/task-efl.bb
index 21763108d2..30befa47f1 100644
--- a/recipes/tasks/task-efl.bb
+++ b/recipes/tasks/task-efl.bb
@@ -14,6 +14,6 @@ RDEPENDS_${PN} = "\
   ewl \
   epdf \
 "
-PR = "r1"
+PR = "r2"
 
 ALLOW_EMPTY = "1"
diff --git a/recipes/tasks/task-mamona-base.bb b/recipes/tasks/task-mamona-base.bb
index 1c3f2264a1..f50c897e3c 100644
--- a/recipes/tasks/task-mamona-base.bb
+++ b/recipes/tasks/task-mamona-base.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "task mamona base"
 LICENSE = "MIT"
-PR = "r3"
+PR = "r4"
 ALLOW_EMPTY = "1"
 
 PACKAGES = "${PN}"
diff --git a/recipes/tasks/task-mamona-devel.bb b/recipes/tasks/task-mamona-devel.bb
index 012ea3f5da..879c00c7af 100644
--- a/recipes/tasks/task-mamona-devel.bb
+++ b/recipes/tasks/task-mamona-devel.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Necessary packages for development at runtime environment"
 LICENSE = "MIT"
-PR = "r3"
+PR = "r4"
 ALLOW_EMPTY = "1"
 
 PACKAGES = "${PN}"
diff --git a/recipes/tasks/task-mamona-python.bb b/recipes/tasks/task-mamona-python.bb
index d8b06706e4..4503627d28 100644
--- a/recipes/tasks/task-mamona-python.bb
+++ b/recipes/tasks/task-mamona-python.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Task mamona: Python Applicattions"
 LICENSE = "MIT"
-PR = "r0"
+PR = "r1"
 
 PACKAGES = "${PN}"
 
diff --git a/recipes/tasks/task-mamona-sdk-noemu.bb b/recipes/tasks/task-mamona-sdk-noemu.bb
index 31e7215ae5..e360c510e4 100644
--- a/recipes/tasks/task-mamona-sdk-noemu.bb
+++ b/recipes/tasks/task-mamona-sdk-noemu.bb
@@ -1,9 +1,9 @@
-PR = "r2"
+PR = "r3"
 
 require mamona-sdk.inc
 
-RCONFLICTS = "task-mamona-sdk"
-RREPLACES = "task-mamona-sdk"
+RCONFLICTS_${PN} = "task-mamona-sdk"
+RREPLACES_${PN} = "task-mamona-sdk"
 
 RDEPENDS_${PN} += "\
   bash-noemu \
diff --git a/recipes/tasks/task-mamona-sdk.bb b/recipes/tasks/task-mamona-sdk.bb
index d2b1fcac75..f1c83b93c7 100644
--- a/recipes/tasks/task-mamona-sdk.bb
+++ b/recipes/tasks/task-mamona-sdk.bb
@@ -1,9 +1,9 @@
-PR = "r4"
+PR = "r5"
 
 include mamona-sdk.inc
 
-RCONFLICTS = "task-mamona-sdk-noemu"
-RREPLACES = "task-mamona-sdk-noemu"
+RCONFLICTS_${PN} = "task-mamona-sdk-noemu"
+RREPLACES_${PN} = "task-mamona-sdk-noemu"
 
 RDEPENDS_${PN} += "\
   bash \
diff --git a/recipes/tasks/task-mamona-systemtap.bb b/recipes/tasks/task-mamona-systemtap.bb
index d57716194c..84182d6573 100644
--- a/recipes/tasks/task-mamona-systemtap.bb
+++ b/recipes/tasks/task-mamona-systemtap.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Task Mamona: Necessary packages for running a systemtap enabled system"
-PR = "r1"
+PR = "r2"
 ALLOW_EMPTY = "1"
 
 PACKAGES = "${PN}"
diff --git a/recipes/tasks/task-mamona-wm.bb b/recipes/tasks/task-mamona-wm.bb
index cfa0ecee46..49d3a6a8ab 100644
--- a/recipes/tasks/task-mamona-wm.bb
+++ b/recipes/tasks/task-mamona-wm.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Task mamona: Window Manager"
 LICENSE = "MIT"
-PR = "r2"
+PR = "r3"
 ALLOW_EMPTY = "1"
 
 PACKAGES = "${PN}"
diff --git a/recipes/tasks/task-mamona.bb b/recipes/tasks/task-mamona.bb
index 9448eb096a..e77704c7a0 100644
--- a/recipes/tasks/task-mamona.bb
+++ b/recipes/tasks/task-mamona.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Task mamona: Build and Install Mamona Platform"
 LICENSE = "MIT"
-PR = "r5"
+PR = "r6"
 ALLOW_EMPTY = "1"
 
 PACKAGES = "${PN}"
diff --git a/recipes/tasks/task-openprotium.bb b/recipes/tasks/task-openprotium.bb
index 68e093e823..2cfe30dda1 100644
--- a/recipes/tasks/task-openprotium.bb
+++ b/recipes/tasks/task-openprotium.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Basic image for openprotium"
 HOMEPAGE = "http://www.openprotium.org"
 ALLOW_EMPTY = "1"
-PR = "r2"
+PR = "r3"
 
 inherit task
 
diff --git a/recipes/tasks/task-python-efl-examples.bb b/recipes/tasks/task-python-efl-examples.bb
index 3bd4b58a58..ad6c90ec4a 100644
--- a/recipes/tasks/task-python-efl-examples.bb
+++ b/recipes/tasks/task-python-efl-examples.bb
@@ -8,6 +8,6 @@ RDEPENDS_${PN} = "\
   python-edje-examples \
   python-math python-textutils \
 "
-PR = "ml4.1"
+PR = "ml5"
 
 ALLOW_EMPTY = "1"
diff --git a/recipes/tasks/task-python-efl.bb b/recipes/tasks/task-python-efl.bb
index fc22f108b5..c52cc9cd7a 100644
--- a/recipes/tasks/task-python-efl.bb
+++ b/recipes/tasks/task-python-efl.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Python Bindings to the Enlightenment Foundation Libraries"
 LICENSE = "MIT"
 SECTION = "devel/python"
-PR = "ml4.1"
+PR = "ml5"
 
 ALLOW_EMPTY = "1"
 
diff --git a/recipes/tasks/task-python-everything.bb b/recipes/tasks/task-python-everything.bb
index b6b327fa52..3d2e17968a 100644
--- a/recipes/tasks/task-python-everything.bb
+++ b/recipes/tasks/task-python-everything.bb
@@ -2,7 +2,7 @@ DESCRIPTION= "Everything Python"
 HOMEPAGE = "http://www.vanille.de/projects/python.spy"
 LICENSE = "MIT"
 PV = "2.6"
-PR = "ml44"
+PR = "ml45"
 
 RDEPENDS_${PN} = "\
   python-ao \
diff --git a/recipes/tasks/task-python-sharprom_20060425.bb b/recipes/tasks/task-python-sharprom_20060425.bb
index 4aac5e9e04..16038adaa9 100644
--- a/recipes/tasks/task-python-sharprom_20060425.bb
+++ b/recipes/tasks/task-python-sharprom_20060425.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Everything Python for SharpROM"
 HOMEPAGE = "http://www.vanille.de/projects/python.spy"
 LICENSE = "MIT"
-PR = "ml6"
+PR = "ml7"
 
 NONWORKING = "\
 		python-codes		\
diff --git a/recipes/tasks/task-sdk-base.bb b/recipes/tasks/task-sdk-base.bb
index 5143470bd5..da984c07ad 100644
--- a/recipes/tasks/task-sdk-base.bb
+++ b/recipes/tasks/task-sdk-base.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Basic SDK development packages"
-PR = "r2"
+PR = "r3"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
diff --git a/recipes/tasks/task-sdk-gpephone.bb b/recipes/tasks/task-sdk-gpephone.bb
index 2641adb6fe..df5bca7d68 100644
--- a/recipes/tasks/task-sdk-gpephone.bb
+++ b/recipes/tasks/task-sdk-gpephone.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "SDK task for GPE Phone Edition"
-PR = "r0"
+PR = "r1"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
diff --git a/recipes/tasks/task-sdk-sbox-gpe.bb b/recipes/tasks/task-sdk-sbox-gpe.bb
index 51ab447050..8daca11a46 100644
--- a/recipes/tasks/task-sdk-sbox-gpe.bb
+++ b/recipes/tasks/task-sdk-sbox-gpe.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "SDK task for Scratchbox rootstraps incuding GPE/GTK bits"
-PR = "r0"
+PR = "r1"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
diff --git a/recipes/tasks/task-sdk-sbox.bb b/recipes/tasks/task-sdk-sbox.bb
index 3226e374ea..bf7540268f 100644
--- a/recipes/tasks/task-sdk-sbox.bb
+++ b/recipes/tasks/task-sdk-sbox.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "SDK task for Scratchbox rootstraps"
-PR = "r7"
+PR = "r8"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
diff --git a/recipes/tasks/task-self-hosting.bb b/recipes/tasks/task-self-hosting.bb
index 5ee20d5ea1..96f204f140 100644
--- a/recipes/tasks/task-self-hosting.bb
+++ b/recipes/tasks/task-self-hosting.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "All tools needed for OpenEmbedded build"
 SECTION = "devel"
 LICENSE = "MIT"
 RDEPENDS_${PN} = "task-native-sdk python-modules bash texinfo cvs subversion git"
-PR = "r1"
+PR = "r2"
 
 #
 # quilt-native REQ bash and perl/perl-modules
diff --git a/recipes/tasks/task-slugos.bb b/recipes/tasks/task-slugos.bb
index 69bf6caf11..c0077793b3 100644
--- a/recipes/tasks/task-slugos.bb
+++ b/recipes/tasks/task-slugos.bb
@@ -6,7 +6,7 @@
 DESCRIPTION = "Task packages for the SlugOS distribution"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r25"
+PR = "r27"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 COMPATIBLE_MACHINE = "(nslu2|ixp4xx|sheevaplug)"
 ALLOW_EMPTY = "1"
@@ -74,12 +74,16 @@ kernel-module-ohci-hcd \
 kernel-module-uhci-hcd \
 "
 
+## Commented out MJW - due to space considerations;
+## add this back in as soon as cleanup tasks manage
+## to recover sufficient flash space.
 # Add packages and modules required for RAID-1 support
-SLUGOS_STANDARD_RRECOMMENDS += "\
-mdadm \
-kernel-module-md-mod \
-kernel-module-raid1 \
-"
+#SLUGOS_STANDARD_RRECOMMENDS += "\
+#mdadm \
+#kernel-module-md-mod \
+#kernel-module-raid1 \
+#"
+## End - MJW
 
 # Add the machine-specific RRECOMMENDS_${PN} stuff -- kernel modules required for
 # network support.
@@ -139,7 +143,8 @@ RDEPENDS_${PN} += "\
 
 DISTRO_EXTRA_RRECOMMENDS ?= ""
 RRECOMMENDS_${PN} += "\
-	openssh \
+	openssh-keygen \
+	openssh-sshd \
 	${SLUGOS_STANDARD_RRECOMMENDS} \
         ${SLUGOS_MACHINE_RRECOMMENDS} \
 	${DISTRO_EXTRA_RRECOMMENDS}"