diff options
Diffstat (limited to 'packages')
-rw-r--r-- | packages/tasks/task-base.bb | 39 | ||||
-rw-r--r-- | packages/tasks/task-boot.bb | 53 |
2 files changed, 55 insertions, 37 deletions
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index 2b02080c83..d89d781202 100644 --- a/packages/tasks/task-base.bb +++ b/packages/tasks/task-base.bb @@ -1,8 +1,9 @@ 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 = "all" # 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-distro-base = "${DISTRO_EXTRA_RRECOMMENDS}" 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" diff --git a/packages/tasks/task-boot.bb b/packages/tasks/task-boot.bb new file mode 100644 index 0000000000..95eb55b748 --- /dev/null +++ b/packages/tasks/task-boot.bb @@ -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}" + |