summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2012-03-03 04:12:18 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-13 11:45:08 +0000
commitf9bdcb2eb122aa91dd9e203bc3a63a246c3d4d37 (patch)
tree5883ad4cad8cddf01f3cd7cd19087c60d6f45396 /meta/classes
parent717f9740e5c5f6c9c55c3a031e55bb2ab4d08dd1 (diff)
downloadpoky-f9bdcb2eb122aa91dd9e203bc3a63a246c3d4d37.tar.gz
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>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/core-image.bbclass2
-rw-r--r--meta/classes/image.bbclass7
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 = '\
51 task-core-boot \ 51 task-core-boot \
52 task-base-extended \ 52 task-base-extended \
53 \ 53 \
54 ${@base_contains("IMAGE_FEATURES", "package-management", "", "${ROOTFS_PKGMANAGE_BOOTSTRAP}",d)} \
55 \
56 ${CORE_IMAGE_EXTRA_INSTALL} \ 54 ${CORE_IMAGE_EXTRA_INSTALL} \
57 ' 55 '
58 56
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
6LICENSE = "MIT" 6LICENSE = "MIT"
7PACKAGES = "" 7PACKAGES = ""
8RDEPENDS += "${IMAGE_INSTALL} ${LINGUAS_INSTALL} ${NORMAL_FEATURE_INSTALL}" 8RDEPENDS += "${IMAGE_INSTALL} ${LINGUAS_INSTALL} ${NORMAL_FEATURE_INSTALL} ${ROOTFS_BOOTSTRAP_INSTALL}"
9RRECOMMENDS += "${NORMAL_FEATURE_INSTALL_OPTIONAL}" 9RRECOMMENDS += "${NORMAL_FEATURE_INSTALL_OPTIONAL}"
10 10
11INHIBIT_DEFAULT_DEPS = "1" 11INHIBIT_DEFAULT_DEPS = "1"
@@ -14,6 +14,9 @@ INHIBIT_DEFAULT_DEPS = "1"
14IMAGE_FEATURES ?= "" 14IMAGE_FEATURES ?= ""
15IMAGE_FEATURES[type] = "list" 15IMAGE_FEATURES[type] = "list"
16 16
17# rootfs bootstrap install
18ROOTFS_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
18FEATURE_INSTALL = "${@' '.join(oe.packagegroup.required_packages(oe.data.typed_value('IMAGE_FEATURES', d), d))}" 21FEATURE_INSTALL = "${@' '.join(oe.packagegroup.required_packages(oe.data.typed_value('IMAGE_FEATURES', d), d))}"
19FEATURE_INSTALL_OPTIONAL = "${@' '.join(oe.packagegroup.optional_packages(oe.data.typed_value('IMAGE_FEATURES', d), d))}" 22FEATURE_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"
52IMAGE_INSTALL ?= "" 55IMAGE_INSTALL ?= ""
53IMAGE_INSTALL[type] = "list" 56IMAGE_INSTALL[type] = "list"
54IMAGE_BASENAME[export] = "1" 57IMAGE_BASENAME[export] = "1"
55export PACKAGE_INSTALL ?= "${IMAGE_INSTALL} ${FEATURE_INSTALL}" 58export PACKAGE_INSTALL ?= "${IMAGE_INSTALL} ${ROOTFS_BOOTSTRAP_INSTALL} ${FEATURE_INSTALL}"
56PACKAGE_INSTALL_ATTEMPTONLY ?= "${FEATURE_INSTALL_OPTIONAL}" 59PACKAGE_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.