Merge branch 'org.openembedded.dev' of git://git.openembedded.net/openembedded into...

[vuplus_openembedded] / packages / tasks / task-boot.bb

diff --git a/packages/tasks/task-boot.bb b/packages/tasks/task-boot.bb
index 95eb55b..550a86d 100644 (file)
--- a/packages/tasks/task-boot.bb
+++ b/packages/tasks/task-boot.bb
@@ -1,10 +1,7 @@
 DESCRIPTION = "Basic task to get a device booting"
-PR = "r35"
+PR = "r45"
 
-PROVIDES = "${PACKAGES}"
-PACKAGES = 'task-boot'
-
-ALLOW_EMPTY = "1"
+inherit task
 
 # packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH
 #
@@ -26,11 +23,19 @@ DISTRO_INIT_MANAGER ?= "sysvinit sysvinit-pidof"
 DISTRO_LOGIN_MANAGER ?= "tinylogin"
 
 #
+# allow a distro-specific set of initscripts, if required
+#
+DISTRO_INITSCRIPTS ?= "initscripts"
+
+#
 # those ones can be set in machine config to supply packages needed to get machine booting
 #
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
 
+# Make sure we build the kernel
+DEPENDS = "virtual/kernel"
+
 #
 # minimal set of packages - needed to boot
 #
@@ -39,15 +44,17 @@ RDEPENDS_task-boot = "\
     base-files \
     base-passwd \
     busybox \
-    initscripts \
+    ${DISTRO_INITSCRIPTS} \
+    ${@base_contains("MACHINE_FEATURES", "keyboard", "keymaps", "", d)} \
     modutils-initscripts \
     netbase \
     update-alternatives \
     ${DISTRO_DEV_MANAGER} \
     ${DISTRO_INIT_MANAGER} \
     ${DISTRO_LOGIN_MANAGER} \
-    ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}"
+    ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS} \
+    "
 
 RRECOMMENDS_task-boot = "\
-    ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}"
-
+    ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS} \
+    "