| Message ID | 20210527131741.8828-3-Quirin.Gylstorff@siemens.com (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | Add ci for secure-boot and swupdate | expand |
On 27.05.21 15:17, Q. Gylstorff wrote: > From: Quirin Gylstorff <quirin.gylstorff@siemens.com> > > This fixes an error if swupdate.yml is used together with > the secureboot options. > > Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> > --- > kas/opt/efibootguard.yml | 2 ++ > kas/opt/swupdate.yml | 4 ++-- > 2 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/kas/opt/efibootguard.yml b/kas/opt/efibootguard.yml > index 544c740..d5a0e39 100644 > --- a/kas/opt/efibootguard.yml > +++ b/kas/opt/efibootguard.yml > @@ -23,4 +23,6 @@ local_conf_header: > efibootguard-wic: | > WDOG_TIMEOUT = "0" > WICVARS += "WDOG_TIMEOUT" > + IMAGE_TYPE ?= "wic-img" > + WKS_FILE ?= "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks" > > diff --git a/kas/opt/swupdate.yml b/kas/opt/swupdate.yml > index e622972..bd0f6e4 100644 > --- a/kas/opt/swupdate.yml > +++ b/kas/opt/swupdate.yml > @@ -19,5 +19,5 @@ local_conf_header: > IMAGE_INSTALL_append = " swupdate" > > wic-swu: | > - IMAGE_TYPE ?= "wic-swu-img" > - WKS_FILE = "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks" > + IMAGE_TYPE = "wic-swu-img" Why no weak assignment here but above? Jan > + WKS_FILE ?= "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks" >
diff --git a/kas/opt/efibootguard.yml b/kas/opt/efibootguard.yml index 544c740..d5a0e39 100644 --- a/kas/opt/efibootguard.yml +++ b/kas/opt/efibootguard.yml @@ -23,4 +23,6 @@ local_conf_header: efibootguard-wic: | WDOG_TIMEOUT = "0" WICVARS += "WDOG_TIMEOUT" + IMAGE_TYPE ?= "wic-img" + WKS_FILE ?= "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks" diff --git a/kas/opt/swupdate.yml b/kas/opt/swupdate.yml index e622972..bd0f6e4 100644 --- a/kas/opt/swupdate.yml +++ b/kas/opt/swupdate.yml @@ -19,5 +19,5 @@ local_conf_header: IMAGE_INSTALL_append = " swupdate" wic-swu: | - IMAGE_TYPE ?= "wic-swu-img" - WKS_FILE = "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks" + IMAGE_TYPE = "wic-swu-img" + WKS_FILE ?= "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks"