6 files changed, 26 insertions, 14 deletions
diff --git a/packages/tasks/task-opie-16mb.bb b/packages/tasks/task-opie-16mb.bb
index 610e06ffb0..7758b9a141 100644
--- a/packages/tasks/task-opie-16mb.bb
+++ b/packages/tasks/task-opie-16mb.bb
@@ -1,10 +1,9 @@
 DESCRIPTION = "Tasks for small OPIE image"
 SECTION = "opie/base"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-ALLOW_EMPTY = "1"
 LICENSE = "MIT"
+PR = "r1"
 
-PR = "r0"
+inherit task
 
 PACKAGES = "task-opie-16mb-base \
             task-opie-16mb-applets \
@@ -33,6 +32,8 @@ RDEPENDS_task-opie-16mb-applets = "opie-aboutapplet opie-clockapplet opie-suspen
     ${@base_contains("COMBINED_FEATURES", "pcmcia", "opie-pcmciaapplet", "",d)} \
     ${@base_contains("MACHINE_FEATURES", "keyboard", "opie-vtapplet opie-logoutapplet", "",d)}"
 
+PACKAGE_ARCH_task-opie-16mb-applets = "${MACHINE_ARCH}"
+
 #
 # clamshell models can benefit from the autorotate applet
 #
diff --git a/packages/tasks/task-opie-all.bb b/packages/tasks/task-opie-all.bb
index 8e8d3aa9dc..4666b4ab8d 100644
--- a/packages/tasks/task-opie-all.bb
+++ b/packages/tasks/task-opie-all.bb
@@ -1,8 +1,9 @@
 DESCRIPTION = "Tasks for OPIE stuff"
 SECTION = "opie/base"
-ALLOW_EMPTY = "1"
 LICENSE = "MIT"
-PR = "r1"
+PR = "r2"
+
+inherit task
 
 PACKAGES = "task-opie-applets task-opie-inputmethods task-opie-styles \
             task-opie-decorations task-opie-multimedia task-opie-wlan \
diff --git a/packages/tasks/task-opie-apps.bb b/packages/tasks/task-opie-apps.bb
index 1c03dcc9d9..2f9cc27962 100644
--- a/packages/tasks/task-opie-apps.bb
+++ b/packages/tasks/task-opie-apps.bb
@@ -1,8 +1,9 @@
 DESCRIPTION = "Tasks for OPIE stuff"
 SECTION = "opie/base"
-ALLOW_EMPTY = "1"
 LICENSE = "MIT"
 
+inherit task
+
 PACKAGES = "task-opie-apps task-opie-extra-apps"
 
 RDEPENDS_task-opie-apps = "opie-advancedfm opie-bartender opie-calculator \
diff --git a/packages/tasks/task-opie-games.bb b/packages/tasks/task-opie-games.bb
index 70d2f39b29..4449c7aaae 100644
--- a/packages/tasks/task-opie-games.bb
+++ b/packages/tasks/task-opie-games.bb
@@ -1,7 +1,9 @@
 DESCRIPTION = "Tasks for OPIE stuff"
 SECTION = "opie/base"
-ALLOW_EMPTY = "1"
 LICENSE = "MIT"
+PR = "r1"
+
+inherit task
 
 PACKAGES = "task-opie-games task-opie-extra-games"
 
diff --git a/packages/tasks/task-opie.bb b/packages/tasks/task-opie.bb
index 018ed9a9c8..0f7285236e 100644
--- a/packages/tasks/task-opie.bb
+++ b/packages/tasks/task-opie.bb
@@ -1,11 +1,12 @@
 DESCRIPTION = "Tasks for OPIE stuff"
 SECTION = "opie/base"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-ALLOW_EMPTY = "1"
 LICENSE = "MIT"
-PROVIDES = "task-opie-everything"
 
-PR = "r11"
+PR = "r12"
+
+inherit task
+
+PROVIDES = "task-opie-everything"
 
 PACKAGES = "task-opie-base \
             task-opie-base-applets task-opie-base-apps \
@@ -32,6 +33,8 @@ RDEPENDS_task-opie-base = "opie-init opie-alarm opie-qcop opie-qss opie-quicklau
 RRECOMMENDS_task-opie-base = "opie-taskbar-images-${MACHINE_DISPLAY_WIDTH_PIXELS}x${MACHINE_DISPLAY_HEIGHT_PIXELS} \
                               opie-taskbar-images-${MACHINE_DISPLAY_HEIGHT_PIXELS}x${MACHINE_DISPLAY_WIDTH_PIXELS}"
 
+PACKAGE_ARCH_task-opie-base = "${MACHINE_ARCH}"
+
 #
 # things for reasonable bootstrap image
 #
@@ -44,6 +47,8 @@ RDEPENDS_task-opie-base-applets = "opie-aboutapplet opie-clockapplet opie-suspen
     ${@base_contains("COMBINED_FEATURES", "pcmcia", "opie-pcmciaapplet", "",d)} \
     ${@base_contains("MACHINE_FEATURES", "keyboard", "opie-vtapplet opie-logoutapplet", "",d)}"
 
+PACKAGE_ARCH_task-opie-base-applets = "${MACHINE_ARCH}"
+
 #
 # clamshell models can benefit from the autorotate applet
 #
@@ -69,6 +74,8 @@ RDEPENDS_task-opie-extra-settings = "opie-language opie-doctab opie-mediummount
     ${@base_contains("DISTRO_FEATURES", "ppp", "opie-networksettings-pppplugin", "",d)} \
 			    "
 
+PACKAGE_ARCH_task-opie-extra-settings = "${MACHINE_ARCH}"
+
 RDEPENDS_task-opie-base-decorations = "opie-deco-flat opie-deco-liquid opie-deco-polished"
 
 RDEPENDS_task-opie-base-styles = "opie-style-flat opie-style-fresh opie-style-web opie-style-phase"
diff --git a/packages/tasks/task-qpe.bb b/packages/tasks/task-qpe.bb
index 3fff3cbeb9..347a4525b8 100644
--- a/packages/tasks/task-qpe.bb
+++ b/packages/tasks/task-qpe.bb
@@ -1,9 +1,9 @@
 DESCRIPTION = "Tasks for programs running on Qt/Embedded based Palmtop Environents like Opie and Qtopia."
 SECTION = "opie/base"
-ALLOW_EMPTY = "1"
-PACKAGE_ARCH = "all"
 LICENSE = "MIT"
-PR = "r9"
+PR = "r10"
+
+inherit task
 
 PACKAGES = "task-qpe-applets task-qpe-games task-qpe-inputmethods \
 	task-qpe-multimedia task-qpe-emulators task-qpe-applications \