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

Pull request #39: Fix/swu 

Merge in ICO/coreos from fix/swu to master

* commit 'c65869b9c9a667fb689c5d3498ef21117d5ab648':
  fix(do_swuimage): use DEPENDS to get kernel arguments
  fix(coreos-image): COREOS_IMAGE_EXTRACLASSES now work as expected
This commit is contained in:
Samuel Dolt 2023-01-30 13:59:24 +01:00
parent 259dd34e7c c65869b9c9
commit 711b0f08bd
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,7 +19,7 @@ python () {
inherit swupdate-image
# Ensure than variable used in the sw-description files are watched for change
do_swuimage[vardeps] += "COREOS_KERNEL0_FILENAME COREOS_KERNEL1_FILENAME EFIBOOTGUARD_TIMEOUT COREOS_DISK_PARTLABEL_LOOKUP_DIRECTORY"
do_swuimage[vardeps] += "COREOS_KERNEL0_FILENAME COREOS_KERNEL1_FILENAME EFIBOOTGUARD_TIMEOUT COREOS_DISK_PARTLABEL_LOOKUP_DIRECTORY APPEND"
do_swuimage[deptask] += "do_bundle_uki"
SWUPDATE_IMAGES += "${COREOS_KERNEL0_NAME} ${COREOS_KERNEL1_NAME}"

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

@ -91,11 +91,11 @@ IMAGE_ROOTFS_EXTRA_SPACE:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'sys
# Unified kernel image and swupdate support
# ==============================================================================
COREOS_IMAGE_GENERATE_UKI ??= "${@bb.utils.contains('COMBINED_FEATURES', 'efi', '1', '0', d)}"
COREOS_IMAGE_GENERATE_SWU ??= "${@bb.utils.contains('IMAGE_FEATURES', 'swupdate', '1', '0', d)}"
# Support for Unified Kernel Image and Swupdate are optional
COREOS_IMAGE_EXTRACLASSES ??= ""
COREOS_IMAGE_EXTRACLASSES:append = "${@' coreos-image-uki' if d.getVar('COREOS_IMAGE_GENERATE_UKI') == '1' else ''}"
COREOS_IMAGE_EXTRACLASSES:append = "${@' coreos-image-swupdate' if d.getVar('COREOS_IMAGE_GENERATE_SWU') == '1' else ''}"
COREOS_IMAGE_GENERATE_UKI ?= "1"
COREOS_IMAGE_GENERATE_SWU ?= "1"
COREOS_IMAGE_EXTRACLASSES += "${@'coreos-image-uki' if d.getVar('COREOS_IMAGE_GENERATE_UKI') == '1' else ''}"
COREOS_IMAGE_EXTRACLASSES += "${@'coreos-image-swupdate' if d.getVar('COREOS_IMAGE_GENERATE_SWU') == '1' else ''}"
inherit ${COREOS_IMAGE_EXTRACLASSES}

4
layers/meta-belden-coreos/files/sw-description
View File

@ -31,7 +31,7 @@ software =
bootenv: (
{
name = "kernelparams";
value = "root=PARTLABEL=platform0 @@WKS_KERNEL_ARGS@@";
value = "root=PARTLABEL=platform0 @@APPEND@@";
},
{
name = "watchdog_timeout_sec";
@ -71,7 +71,7 @@ software =
bootenv: (
{
name = "kernelparams";
value = "root=PARTLABEL=platform1 @@WKS_KERNEL_ARGS@@";
value = "root=PARTLABEL=platform1 @@APPEND@@";
},
{
name = "watchdog_timeout_sec";