All of lore.kernel.org
 help / color / mirror / Atom feed
From: Srinuvasan A <Srinuvasan_A@mentor.com>
To: <cip-dev@lists.cip-project.org>
Cc: Srinuvasan A <srinuvasan_a@mentor.com>
Subject: [isar-cip-dev] [PATCH] Uprevision the ISAR to latest one
Date: Wed, 6 Oct 2021 15:44:22 +0530	[thread overview]
Message-ID: <20211006101422.1976005-1-Srinuvasan_A@mentor.com> (raw)

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"
 
-- 
2.25.1



WARNING: multiple messages have this Message-ID (diff)
From: "Srinuvasan A" <srinuvasan_a@mentor.com>
To: <cip-dev@lists.cip-project.org>
Cc: Srinuvasan A <srinuvasan_a@mentor.com>
Subject: [cip-dev] [isar-cip-dev] [PATCH] Uprevision the ISAR to latest one
Date: Wed, 6 Oct 2021 15:44:22 +0530	[thread overview]
Message-ID: <20211006101422.1976005-1-Srinuvasan_A@mentor.com> (raw)
Message-ID: <20211006101422.QmLVbhCDQekIN7px6u0Kqwl3M1U0uhft10caExsgjFk@z> (raw)

[-- Attachment #1: Type: text/plain, Size: 1443 bytes --]

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"
 
-- 
2.25.1


[-- Attachment #2: Type: text/plain, Size: 429 bytes --]


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#6792): https://lists.cip-project.org/g/cip-dev/message/6792
Mute This Topic: https://lists.cip-project.org/mt/86115871/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/10495289/4520388/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-


             reply	other threads:[~2021-10-06 10:14 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-06 10:14 Srinuvasan A [this message]
2021-10-06 10:14 ` [cip-dev] [isar-cip-dev] [PATCH] Uprevision the ISAR to latest one Srinuvasan A
2021-10-06 17:44 ` Jan Kiszka
2021-10-06 17:44   ` [cip-dev] " Jan Kiszka

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211006101422.1976005-1-Srinuvasan_A@mentor.com \
    --to=srinuvasan_a@mentor.com \
    --cc=cip-dev@lists.cip-project.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.