LM
/
coreos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(coreos-image.bbclass): use coreos specific package-group for IMAGE_INSTALL

This commit is contained in:
Samuel Dolt 2023-03-13 11:11:31 +01:00
parent 05f53a8804
commit 958f5d244b
3 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
layers/meta-belden-coreos/classes/coreos-image.bbclass
View File

@ -64,17 +64,9 @@ PACKAGE_EXCLUDE_COMPLEMENTARY:append = "${@bb.utils.contains_any('PACKAGE_INSTAL
# IMAGE_FEATURES_CONFLICTS_foo = 'bar1 bar2'
# An error exception would be raised if both image features foo and bar1(or bar2) are included
# packagegroup-core-boot will install the EFI_PROVIDER package if EFI is in Machine
# feature. We use this variable to install more EFI related tools
COREOS_IMAGE_EFI_PROVIDER_EXTRA = " \
${@'efibootguard-tools' if d.getVar('EFI_PROVIDER') == 'efibootguard' else ''} \
"
COREOS_IMAGE_BASE_INSTALL = "\
packagegroup-core-boot \
packagegroup-base-extended \
${@bb.utils.contains("MACHINE_FEATURES", "efi", "${COREOS_IMAGE_EFI_PROVIDER_EXTRA}", "", d)} \
os-release \
packagegroup-coreos-boot \
packagegroup-coreos-base \
"
COREOS_IMAGE_EXTRA_INSTALL ?= ""

21
layers/meta-belden-coreos/recipes-core/packagegroups/packagegroup-coreos-base.bb Normal file
View File

@ -0,0 +1,21 @@
SUMMARY = "Merge machine and distro options to create a basic machine task/package"
PR = "r1"
#
# packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH
#
PACKAGE_ARCH = "${MACHINE_ARCH}"
inherit packagegroup
# packagroup-coreos-boot will ensure that EFI_PROVIDER is installed
# But we want to have Linux user space tools installed as well here
COREOS_IMAGE_EFI_PROVIDER_EXTRA = " \
${@'efibootguard-tools' if d.getVar('EFI_PROVIDER') == 'efibootguard' else ''} \
"
RDEPENDS:${PN} = "\
packagegroup-core-base-extended \
os-release \
${@bb.utils.contains("MACHINE_FEATURES", "efi", "${COREOS_IMAGE_EFI_PROVIDER_EXTRA}", "", d)} \
"

13
layers/meta-belden-coreos/recipes-core/packagegroups/packagegroup-coreos-boot.bb Normal file
View File

@ -0,0 +1,13 @@
SUMMARY = "Minimal boot requirements"
DESCRIPTION = "The minimal set of packages required to boot CoreOS"
PR = "r1"
# packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH
# As we expect this group to become machine dependants it's already set
PACKAGE_ARCH = "${MACHINE_ARCH}"
inherit packagegroup
RDEPENDS:${PN} = "\
packagegroup-core-boot \
"