image.bbclass: fix rootfs generation without package management tools
When building without package management tools the ROOTFS_BOOTSTRAP_INSTALL packages need to be available to provide the bare minimal for rootfs unconfigure postinsts to be on first boot. Those packages where being include in core-image.bbclass' based images however every image needs those available for proper rootfs generation. (From OE-Core rev: 4f2845739fc7a1f2c784f4d3be048ee111e7d093) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
717f9740e5
commit
f9bdcb2eb1
|
@ -51,8 +51,6 @@ CORE_IMAGE_BASE_INSTALL = '\
|
||||||
task-core-boot \
|
task-core-boot \
|
||||||
task-base-extended \
|
task-base-extended \
|
||||||
\
|
\
|
||||||
${@base_contains("IMAGE_FEATURES", "package-management", "", "${ROOTFS_PKGMANAGE_BOOTSTRAP}",d)} \
|
|
||||||
\
|
|
||||||
${CORE_IMAGE_EXTRA_INSTALL} \
|
${CORE_IMAGE_EXTRA_INSTALL} \
|
||||||
'
|
'
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@ inherit imagetest-${IMAGETEST}
|
||||||
|
|
||||||
LICENSE = "MIT"
|
LICENSE = "MIT"
|
||||||
PACKAGES = ""
|
PACKAGES = ""
|
||||||
RDEPENDS += "${IMAGE_INSTALL} ${LINGUAS_INSTALL} ${NORMAL_FEATURE_INSTALL}"
|
RDEPENDS += "${IMAGE_INSTALL} ${LINGUAS_INSTALL} ${NORMAL_FEATURE_INSTALL} ${ROOTFS_BOOTSTRAP_INSTALL}"
|
||||||
RRECOMMENDS += "${NORMAL_FEATURE_INSTALL_OPTIONAL}"
|
RRECOMMENDS += "${NORMAL_FEATURE_INSTALL_OPTIONAL}"
|
||||||
|
|
||||||
INHIBIT_DEFAULT_DEPS = "1"
|
INHIBIT_DEFAULT_DEPS = "1"
|
||||||
|
@ -14,6 +14,9 @@ INHIBIT_DEFAULT_DEPS = "1"
|
||||||
IMAGE_FEATURES ?= ""
|
IMAGE_FEATURES ?= ""
|
||||||
IMAGE_FEATURES[type] = "list"
|
IMAGE_FEATURES[type] = "list"
|
||||||
|
|
||||||
|
# rootfs bootstrap install
|
||||||
|
ROOTFS_BOOTSTRAP_INSTALL = "${@base_contains("IMAGE_FEATURES", "package-management", "", "${ROOTFS_PKGMANAGE_BOOTSTRAP}",d)}"
|
||||||
|
|
||||||
# packages to install from features
|
# packages to install from features
|
||||||
FEATURE_INSTALL = "${@' '.join(oe.packagegroup.required_packages(oe.data.typed_value('IMAGE_FEATURES', d), d))}"
|
FEATURE_INSTALL = "${@' '.join(oe.packagegroup.required_packages(oe.data.typed_value('IMAGE_FEATURES', d), d))}"
|
||||||
FEATURE_INSTALL_OPTIONAL = "${@' '.join(oe.packagegroup.optional_packages(oe.data.typed_value('IMAGE_FEATURES', d), d))}"
|
FEATURE_INSTALL_OPTIONAL = "${@' '.join(oe.packagegroup.optional_packages(oe.data.typed_value('IMAGE_FEATURES', d), d))}"
|
||||||
|
@ -52,7 +55,7 @@ PACKAGE_GROUP_doc-pkgs[optional] = "1"
|
||||||
IMAGE_INSTALL ?= ""
|
IMAGE_INSTALL ?= ""
|
||||||
IMAGE_INSTALL[type] = "list"
|
IMAGE_INSTALL[type] = "list"
|
||||||
IMAGE_BASENAME[export] = "1"
|
IMAGE_BASENAME[export] = "1"
|
||||||
export PACKAGE_INSTALL ?= "${IMAGE_INSTALL} ${FEATURE_INSTALL}"
|
export PACKAGE_INSTALL ?= "${IMAGE_INSTALL} ${ROOTFS_BOOTSTRAP_INSTALL} ${FEATURE_INSTALL}"
|
||||||
PACKAGE_INSTALL_ATTEMPTONLY ?= "${FEATURE_INSTALL_OPTIONAL}"
|
PACKAGE_INSTALL_ATTEMPTONLY ?= "${FEATURE_INSTALL_OPTIONAL}"
|
||||||
|
|
||||||
# Images are generally built explicitly, do not need to be part of world.
|
# Images are generally built explicitly, do not need to be part of world.
|
||||||
|
|
Loading…
Reference in New Issue