summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/image.bbclass17
1 files changed, 14 insertions, 3 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 243baa9c35..e057329017 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -6,15 +6,26 @@ inherit imagetest-${IMAGETEST}
6LICENSE = "MIT" 6LICENSE = "MIT"
7PACKAGES = "" 7PACKAGES = ""
8MULTILIB_IMAGE_INSTALL ?= "" 8MULTILIB_IMAGE_INSTALL ?= ""
9RDEPENDS += "${IMAGE_INSTALL} ${LINGUAS_INSTALL} ${MULTILIB_IMAGE_INSTALL}" 9RDEPENDS += "${IMAGE_INSTALL} ${LINGUAS_INSTALL} ${MULTILIB_IMAGE_INSTALL} ${FEATURE_INSTALL}"
10RRECOMMENDS += "${FEATURE_INSTALL_OPTIONAL}"
10 11
11INHIBIT_DEFAULT_DEPS = "1" 12INHIBIT_DEFAULT_DEPS = "1"
12 13
14# IMAGE_FEATURES may contain any available package group
15IMAGE_FEATURES ?= ""
16IMAGE_FEATURES[type] = "list"
17
18# packages to install from features
19FEATURE_INSTALL = "${@' '.join(oe.packagegroup.required_packages(oe.data.typed_value('IMAGE_FEATURES', d), d))}"
20FEATURE_INSTALL_OPTIONAL = "${@' '.join(oe.packagegroup.optional_packages(oe.data.typed_value('IMAGE_FEATURES', d), d))}"
21
13# "export IMAGE_BASENAME" not supported at this time 22# "export IMAGE_BASENAME" not supported at this time
23IMAGE_INSTALL ?= ""
24IMAGE_INSTALL[type] = "list"
14IMAGE_BASENAME[export] = "1" 25IMAGE_BASENAME[export] = "1"
15export PACKAGE_INSTALL ?= "${IMAGE_INSTALL}" 26export PACKAGE_INSTALL ?= "${IMAGE_INSTALL} ${FEATURE_INSTALL}"
16export MULTILIB_PACKAGE_INSTALL ?= "${MULTILIB_IMAGE_INSTALL}" 27export MULTILIB_PACKAGE_INSTALL ?= "${MULTILIB_IMAGE_INSTALL}"
17PACKAGE_INSTALL_ATTEMPTONLY ?= "" 28PACKAGE_INSTALL_ATTEMPTONLY ?= "${FEATURE_INSTALL_OPTIONAL}"
18 29
19# Images are generally built explicitly, do not need to be part of world. 30# Images are generally built explicitly, do not need to be part of world.
20EXCLUDE_FROM_WORLD = "1" 31EXCLUDE_FROM_WORLD = "1"