diff mbox series

[isar-cip-dev] Uprevision the ISAR to latest one

Message ID 20211006101422.1976005-1-Srinuvasan_A@mentor.com (mailing list archive)
State New
Headers show
Series [isar-cip-dev] Uprevision the ISAR to latest one | expand

Commit Message

Srinuvasan A Oct. 6, 2021, 10:14 a.m. UTC
From: Srinuvasan A <srinuvasan_a@mentor.com>

Update to latest ISAR.

When we build the images with efibootguard wic plugin it is expecting
the KERNEL_IMAGE and INITRD_IMAGE variable, but it is removed in
Upstream ISAR due to cleanup the unused variables.

Ref: https://github.com/ilbers/isar/commit/6fa0197ac36a86b2ae5c27f5b7804dd9a46d3c0b

But those variables we used in downstream layer with efibootguard wic
plugin hence added required WIC variables in efibootguard.yml to genereate successful wic images.

Signed-off-by: Srinuvasan A <srinuvasan_a@mentor.com>
---
 kas-cip.yml              | 2 +-
 kas/opt/efibootguard.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Jan Kiszka Oct. 6, 2021, 5:44 p.m. UTC | #1
On 06.10.21 12:14, Srinuvasan A wrote:
> From: Srinuvasan A <srinuvasan_a@mentor.com>
> 
> Update to latest ISAR.
> 
> When we build the images with efibootguard wic plugin it is expecting
> the KERNEL_IMAGE and INITRD_IMAGE variable, but it is removed in
> Upstream ISAR due to cleanup the unused variables.
> 
> Ref: https://github.com/ilbers/isar/commit/6fa0197ac36a86b2ae5c27f5b7804dd9a46d3c0b
> 
> But those variables we used in downstream layer with efibootguard wic
> plugin hence added required WIC variables in efibootguard.yml to genereate successful wic images.
> 
> Signed-off-by: Srinuvasan A <srinuvasan_a@mentor.com>
> ---
>  kas-cip.yml              | 2 +-
>  kas/opt/efibootguard.yml | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/kas-cip.yml b/kas-cip.yml
> index 8522957..4eadaa7 100644
> --- a/kas-cip.yml
> +++ b/kas-cip.yml
> @@ -22,7 +22,7 @@ repos:
>  
>    isar:
>      url: https://github.com/ilbers/isar.git
> -    refspec: 03124cca669f50b682336a0bdf4ede5a4238e144
> +    refspec: 9b31dae3284127d4aed4b9331af1b1c3c31152f5
>      layers:
>        meta:
>  
> diff --git a/kas/opt/efibootguard.yml b/kas/opt/efibootguard.yml
> index 705a76d..580c315 100644
> --- a/kas/opt/efibootguard.yml
> +++ b/kas/opt/efibootguard.yml
> @@ -22,7 +22,7 @@ local_conf_header:
>  
>    efibootguard-wic: |
>      WDOG_TIMEOUT ?= "60"
> -    WICVARS += "WDOG_TIMEOUT"
> +    WICVARS += "WDOG_TIMEOUT KERNEL_IMAGE INITRD_IMAGE"
>      IMAGE_TYPE ?= "wic-img"
>      WKS_FILE ?= "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks"
>  
> 

Thanks, applied.

Jan
diff mbox series

Patch

diff --git a/kas-cip.yml b/kas-cip.yml
index 8522957..4eadaa7 100644
--- a/kas-cip.yml
+++ b/kas-cip.yml
@@ -22,7 +22,7 @@  repos:
 
   isar:
     url: https://github.com/ilbers/isar.git
-    refspec: 03124cca669f50b682336a0bdf4ede5a4238e144
+    refspec: 9b31dae3284127d4aed4b9331af1b1c3c31152f5
     layers:
       meta:
 
diff --git a/kas/opt/efibootguard.yml b/kas/opt/efibootguard.yml
index 705a76d..580c315 100644
--- a/kas/opt/efibootguard.yml
+++ b/kas/opt/efibootguard.yml
@@ -22,7 +22,7 @@  local_conf_header:
 
   efibootguard-wic: |
     WDOG_TIMEOUT ?= "60"
-    WICVARS += "WDOG_TIMEOUT"
+    WICVARS += "WDOG_TIMEOUT KERNEL_IMAGE INITRD_IMAGE"
     IMAGE_TYPE ?= "wic-img"
     WKS_FILE ?= "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks"