task-base/task-poky-boot: Use MACHINE_ESSENTIAL variables correctly

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2136 311d38ba-8fff-0310-9ca6-ca027cbcb966

2 files changed, 8 insertions, 7 deletions

diff --git a/meta/packages/tasks/task-base.bb b/meta/packages/tasks/task-base.bb
index 37150e485f..4edf22787c 100644
--- a/meta/packages/tasks/task-base.bb
+++ b/meta/packages/tasks/task-base.bb
@@ -52,12 +52,6 @@ PACKAGE_ARCH_task-base-pcmcia = "${MACHINE_ARCH}"
 PCMCIA_MANAGER ?= "${@base_contains('MACHINE_FEATURES', 'kernel26','pcmciautils','pcmcia-cs',d)} "
 
 #
-# those ones can be set in machine config to supply packages needed to get machine booting
-#
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
-
-#
 # task-base contain stuff needed for base system (machine related)
 #
 RDEPENDS_task-base = "\
diff --git a/meta/packages/tasks/task-poky-boot.bb b/meta/packages/tasks/task-poky-boot.bb
index 3285f3f96c..e4db9cdc7a 100644
--- a/meta/packages/tasks/task-poky-boot.bb
+++ b/meta/packages/tasks/task-poky-boot.bb
@@ -5,9 +5,13 @@
 DESCRIPTION = "Task for OpenedHand Poky - minimal bootable image"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 ALLOW_EMPTY = "1"
-PR = "r1"
+PR = "r2"
 
+#
+# Set by the machine configuration with packages essential for device bootup
+#
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
 
 RDEPENDS_task-poky-boot = "\
     base-files \
@@ -21,3 +25,6 @@ RDEPENDS_task-poky-boot = "\
     udev \
     update-alternatives \
     ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}"
+
+RRECOMMENDS_task-poky-boot = "\
+    ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}"
\ No newline at end of file