2 files changed, 2 insertions, 3 deletions

diff --git a/meta/classes/poky-image.bbclass b/meta/classes/poky-image.bbclass
index aaeaee7ea6..3170011be9 100644
--- a/meta/classes/poky-image.bbclass
+++ b/meta/classes/poky-image.bbclass
@@ -25,7 +25,6 @@
 
 DISTRO_TASKS += '\
     ${@base_contains("IMAGE_FEATURES", "dbg-pkgs", "task-poky-boot-dbg task-base-dbg", "",d)} \
-    ${@base_contains("IMAGE_FEATURES", "dev-pkgs", "task-poky-boot-dev task-base-dev", "",d)} \
     \
     ${@base_contains("IMAGE_FEATURES", "apps-console-core", "task-poky-apps-console", "",d)} \
     ${@base_contains("IMAGE_FEATURES", ["apps-console-core", "dbg-pkgs"], "task-poky-apps-console-dbg", "",d)} \
diff --git a/meta/packages/tasks/task-base.bb b/meta/packages/tasks/task-base.bb
index fe77116b2c..adde754f9f 100644
--- a/meta/packages/tasks/task-base.bb
+++ b/meta/packages/tasks/task-base.bb
@@ -3,9 +3,9 @@
 #
 
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r8"
+PR = "r9"
 
-PACKAGES = "task-base"
+PACKAGES = "task-base task-base-dbg"
 
 ALLOW_EMPTY = "1"