[oe-commits] org.oe.dev task-boot: split out of task base as per RFC

[koen commit]

task-boot: split out of task base as per RFC

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 61fb94a908eb11cc06b5c0d937667da64fcc801a
ViewMTN: http://monotone.openembedded.org/revision.psp?id=61fb94a908eb11cc06b5c0d937667da64fcc801a
Files:
1
packages/tasks/task-boot.bb
packages/tasks/task-base.bb
Diffs:

#
# mt diff -re0c43526bd0d45cbc6b64e9b70729f49cc2d4319 -r61fb94a908eb11cc06b5c0d937667da64fcc801a
#
# 
# 
# add_file "packages/tasks/task-boot.bb"
#  content [15d3fa7735c0ab3a219dfff42ff540b0c4522a8e]
# 
# patch "packages/tasks/task-base.bb"
#  from [6fdee3b6f767252f69deb3a8c875e7d7668dd786]
#    to [cc21b03ea34f69a2d4ea66e043efbde612643618]
# 
============================================================
--- packages/tasks/task-boot.bb	15d3fa7735c0ab3a219dfff42ff540b0c4522a8e
+++ packages/tasks/task-boot.bb	15d3fa7735c0ab3a219dfff42ff540b0c4522a8e
@@ -0,0 +1,53 @@
+DESCRIPTION = "Basic task to get a device booting"
+PR = "r35"
+
+PROVIDES = "${PACKAGES}"
+PACKAGES = 'task-boot'
+
+ALLOW_EMPTY = "1"
+
+# packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH
+#
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+#
+# udev, devfsd, mdev (from busybox) or none
+#
+DISTRO_DEV_MANAGER ?= "${@base_contains("MACHINE_FEATURES", "kernel26",  "udev","",d)} "
+
+#
+# sysvinit, upstart
+#
+DISTRO_INIT_MANAGER ?= "sysvinit sysvinit-pidof"
+
+#
+# tinylogin, getty
+#
+DISTRO_LOGIN_MANAGER ?= "tinylogin"
+
+#
+# those ones can be set in machine config to supply packages needed to get machine booting
+#
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
+
+#
+# minimal set of packages - needed to boot
+#
+RDEPENDS_task-boot = "\
+    kernel \
+    base-files \
+    base-passwd \
+    busybox \
+    initscripts \
+    modutils-initscripts \
+    netbase \
+    update-alternatives \
+    ${DISTRO_DEV_MANAGER} \
+    ${DISTRO_INIT_MANAGER} \
+    ${DISTRO_LOGIN_MANAGER} \
+    ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}"
+
+RRECOMMENDS_task-boot = "\
+    ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}"
+
============================================================
--- packages/tasks/task-base.bb	6fdee3b6f767252f69deb3a8c875e7d7668dd786
+++ packages/tasks/task-base.bb	cc21b03ea34f69a2d4ea66e043efbde612643618
@@ -1,8 +1,9 @@ PR = "r36"
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
 PR = "r36"
 
+DEPENDS = "task-boot"
 PROVIDES = "${PACKAGES}"
-PACKAGES = 'task-boot \
+PACKAGES = ' \
             task-base \
             task-base-extended \
             task-distro-base \
@@ -43,27 +44,11 @@ PACKAGE_ARCH_task-base = "${MACHINE_ARCH
 # packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH
 #
 PACKAGE_ARCH_task-base = "${MACHINE_ARCH}"
-PACKAGE_ARCH_task-boot = "${MACHINE_ARCH}"
 PACKAGE_ARCH_task-machine-base = "${MACHINE_ARCH}"
 PACKAGE_ARCH_task-base-apm = "${MACHINE_ARCH}"
 PACKAGE_ARCH_task-base-pcmcia = "${MACHINE_ARCH}"
 
 #
-# udev, devfsd, mdev (from busybox) or none
-#
-DISTRO_DEV_MANAGER ?= "${@base_contains("MACHINE_FEATURES", "kernel26",  "udev","",d)} "
-
-#
-# sysvinit, upstart
-#
-DISTRO_INIT_MANAGER ?= "sysvinit sysvinit-pidof"
-
-#
-# tinylogin, getty
-#
-DISTRO_LOGIN_MANAGER ?= "tinylogin"
-
-#
 # linux-hotplug or none
 #
 HOTPLUG ?= "${@base_contains("MACHINE_FEATURES", "kernel24",  "linux-hotplug","",d)} "
@@ -158,26 +143,6 @@ RRECOMMENDS_task-machine-base = "${MACHI
 RDEPENDS_task-machine-base = "${MACHINE_EXTRA_RDEPENDS}"
 RRECOMMENDS_task-machine-base = "${MACHINE_EXTRA_RRECOMMENDS}"
 
-#
-# minimal set of packages - needed to boot
-#
-RDEPENDS_task-boot = "\
-    kernel \
-    base-files \
-    base-passwd \
-    busybox \
-    initscripts \
-    modutils-initscripts \
-    netbase \
-    update-alternatives \
-    ${DISTRO_DEV_MANAGER} \
-    ${DISTRO_INIT_MANAGER} \
-    ${DISTRO_LOGIN_MANAGER} \
-    ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}"
-
-RRECOMMENDS_task-boot = "\
-    ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}"
-
 RDEPENDS_task-base-kernel24 = "\
     modutils-depmod"