diff options
Diffstat (limited to 'meta/classes/image.bbclass')
-rw-r--r-- | meta/classes/image.bbclass | 7 |
1 files changed, 5 insertions, 2 deletions
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} | |||
5 | 5 | ||
6 | LICENSE = "MIT" | 6 | LICENSE = "MIT" |
7 | PACKAGES = "" | 7 | PACKAGES = "" |
8 | RDEPENDS += "${IMAGE_INSTALL} ${LINGUAS_INSTALL} ${NORMAL_FEATURE_INSTALL}" | 8 | RDEPENDS += "${IMAGE_INSTALL} ${LINGUAS_INSTALL} ${NORMAL_FEATURE_INSTALL} ${ROOTFS_BOOTSTRAP_INSTALL}" |
9 | RRECOMMENDS += "${NORMAL_FEATURE_INSTALL_OPTIONAL}" | 9 | RRECOMMENDS += "${NORMAL_FEATURE_INSTALL_OPTIONAL}" |
10 | 10 | ||
11 | INHIBIT_DEFAULT_DEPS = "1" | 11 | INHIBIT_DEFAULT_DEPS = "1" |
@@ -14,6 +14,9 @@ INHIBIT_DEFAULT_DEPS = "1" | |||
14 | IMAGE_FEATURES ?= "" | 14 | IMAGE_FEATURES ?= "" |
15 | IMAGE_FEATURES[type] = "list" | 15 | IMAGE_FEATURES[type] = "list" |
16 | 16 | ||
17 | # rootfs bootstrap install | ||
18 | ROOTFS_BOOTSTRAP_INSTALL = "${@base_contains("IMAGE_FEATURES", "package-management", "", "${ROOTFS_PKGMANAGE_BOOTSTRAP}",d)}" | ||
19 | |||
17 | # packages to install from features | 20 | # packages to install from features |
18 | FEATURE_INSTALL = "${@' '.join(oe.packagegroup.required_packages(oe.data.typed_value('IMAGE_FEATURES', d), d))}" | 21 | FEATURE_INSTALL = "${@' '.join(oe.packagegroup.required_packages(oe.data.typed_value('IMAGE_FEATURES', d), d))}" |
19 | FEATURE_INSTALL_OPTIONAL = "${@' '.join(oe.packagegroup.optional_packages(oe.data.typed_value('IMAGE_FEATURES', d), d))}" | 22 | 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" | |||
52 | IMAGE_INSTALL ?= "" | 55 | IMAGE_INSTALL ?= "" |
53 | IMAGE_INSTALL[type] = "list" | 56 | IMAGE_INSTALL[type] = "list" |
54 | IMAGE_BASENAME[export] = "1" | 57 | IMAGE_BASENAME[export] = "1" |
55 | export PACKAGE_INSTALL ?= "${IMAGE_INSTALL} ${FEATURE_INSTALL}" | 58 | export PACKAGE_INSTALL ?= "${IMAGE_INSTALL} ${ROOTFS_BOOTSTRAP_INSTALL} ${FEATURE_INSTALL}" |
56 | PACKAGE_INSTALL_ATTEMPTONLY ?= "${FEATURE_INSTALL_OPTIONAL}" | 59 | PACKAGE_INSTALL_ATTEMPTONLY ?= "${FEATURE_INSTALL_OPTIONAL}" |
57 | 60 | ||
58 | # Images are generally built explicitly, do not need to be part of world. | 61 | # Images are generally built explicitly, do not need to be part of world. |