Skip to contentSkip to conversation

image.bbclass: fix rootfs generation without package management tools

PATCH Applied Otavio Salvador 2 participants 2 messages Mar 3, 2012 – Mar 13, 2012 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Otavio Salvador

author
#1 lore raw

PATCH 1/1 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.

Signed-off-by Otavio Salvador <[email protected]>
---
 meta/classes/core-image.bbclass |    2 --
 meta/classes/image.bbclass      |    7 +++++--
 2 files changed, 5 insertions(+), 4 deletions(-)
meta/classes/core-image.bbclass +0 -2
index 668297b..e2ad0fc 100644
@@ -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} \
     '
meta/classes/image.bbclass +5 -2
index dfce381..8e9da99 100644
@@ -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.
Signature · 1 line
1.7.2.5
Applied
#2 lore raw
Quoted 50 lines · Otavio Salvador

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.

Signed-off-by Otavio Salvador<[email protected]>
---
  meta/classes/core-image.bbclass |    2 --
  meta/classes/image.bbclass      |    7 +++++--
  2 files changed, 5 insertions(+), 4 deletions(-)
meta/classes/core-image.bbclass +0 -2
index 668297b..e2ad0fc 100644
@@ -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} \
      '
meta/classes/image.bbclass +4 -1
index dfce381..8e9da99 100644
@@ -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))}"

meta/classes/image.bbclass PACKAGE_GROUP_doc-pkgs[optional] = "1" · line 61

Quoted 8 lines
meta/classes/image.bbclass +1 -1
@@ -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.

Merged into OE-Core

Thanks
Sau!