diff options
| -rw-r--r-- | meta/classes/core-image.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/image.bbclass | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass index 668297bd40..e2ad0fcf31 100644 --- a/meta/classes/core-image.bbclass +++ b/meta/classes/core-image.bbclass @@ -51,8 +51,6 @@ CORE_IMAGE_BASE_INSTALL = '\ task-core-boot \ task-base-extended \ \ - ${@base_contains("IMAGE_FEATURES", "package-management", "", "${ROOTFS_PKGMANAGE_BOOTSTRAP}",d)} \ - \ ${CORE_IMAGE_EXTRA_INSTALL} \ ' diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index a62eb2cd57..533f53ccaf 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -5,7 +5,7 @@ inherit imagetest-${IMAGETEST} LICENSE = "MIT" 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}" INHIBIT_DEFAULT_DEPS = "1" @@ -14,6 +14,9 @@ INHIBIT_DEFAULT_DEPS = "1" IMAGE_FEATURES ?= "" 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 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))}" @@ -52,7 +55,7 @@ PACKAGE_GROUP_doc-pkgs[optional] = "1" IMAGE_INSTALL ?= "" IMAGE_INSTALL[type] = "list" 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}" # Images are generally built explicitly, do not need to be part of world. |