From: Quirin Gylstorff <Quirin.Gylstorff@siemens.com>
To: cip-dev@lists.cip-project.org, felix.moessbauer@siemens.com,
jan.kiszka@siemens.com
Subject: [cip-dev][isar-cip-core][PATCH v2 1/4] core/images/swupdate.inc: Move image_uuid to swupdate.inc
Date: Fri, 9 Dec 2022 15:58:24 +0100 [thread overview]
Message-ID: <20221209145827.1309521-2-Quirin.Gylstorff@siemens.com> (raw)
In-Reply-To: <20221209145827.1309521-1-Quirin.Gylstorff@siemens.com>
From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
Prerequisite for the changes to check the uuid.
Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
kas/opt/ebg-swu.yml | 2 +-
recipes-core/images/image-uuid.inc | 12 ------------
recipes-core/images/swupdate.inc | 1 +
3 files changed, 2 insertions(+), 13 deletions(-)
delete mode 100644 recipes-core/images/image-uuid.inc
diff --git a/kas/opt/ebg-swu.yml b/kas/opt/ebg-swu.yml
index ce37c36..6aa411b 100644
--- a/kas/opt/ebg-swu.yml
+++ b/kas/opt/ebg-swu.yml
@@ -20,7 +20,7 @@ local_conf_header:
SWUPDATE_BOOTLOADER = "efibootguard"
IMAGE_INSTALL_remove = "u-boot-script"
ebg_swu_image_options: |
- CIP_IMAGE_OPTIONS_append = " efibootguard.inc image-uuid.inc"
+ CIP_IMAGE_OPTIONS_append = " efibootguard.inc"
initramfs: |
INITRAMFS_INSTALL_append = " initramfs-abrootfs-hook"
firmware-binaries: |
diff --git a/recipes-core/images/image-uuid.inc b/recipes-core/images/image-uuid.inc
deleted file mode 100644
index 5e5a727..0000000
--- a/recipes-core/images/image-uuid.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# CIP Core, generic profile
-#
-# Copyright (c) Siemens AG, 2022
-#
-# Authors:
-# Jan Kiszka <jan.kiszka@siemens.com>
-#
-# SPDX-License-Identifier: MIT
-#
-
-inherit image_uuid
diff --git a/recipes-core/images/swupdate.inc b/recipes-core/images/swupdate.inc
index edc41a0..6cf9bb1 100644
--- a/recipes-core/images/swupdate.inc
+++ b/recipes-core/images/swupdate.inc
@@ -9,6 +9,7 @@
# SPDX-License-Identifier: MIT
#
+inherit image_uuid
inherit swupdate
inherit read-only-rootfs
--
2.35.1
next prev parent reply other threads:[~2022-12-09 14:58 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-09 14:58 [cip-dev][isar-cip-core][PATCH v2 0/4] SWUpdate abort on installing indentical image Quirin Gylstorff
2022-12-09 14:58 ` Quirin Gylstorff [this message]
2022-12-09 14:58 ` [cip-dev][isar-cip-core][PATCH v2 2/4] swupdate-handler-roundrobin: Increase revision for configfilecheck Quirin Gylstorff
2022-12-13 12:49 ` Jan Kiszka
2022-12-13 13:01 ` Jan Kiszka
2022-12-09 14:58 ` [cip-dev][isar-cip-core][PATCH v2 3/4] image_uuid: read target_image_uuid Quirin Gylstorff
2022-12-09 14:58 ` [cip-dev][isar-cip-core][PATCH v2 4/4] recipe-core/images: Integrate configfilecheck into sw-description Quirin Gylstorff
2022-12-13 13:01 ` [cip-dev][isar-cip-core][PATCH v2 0/4] SWUpdate abort on installing indentical image Jan Kiszka
2022-12-13 15:18 ` Regarding commit eb69c07eca22ffd8621d9de9378e4b3ce7965190 Biju Das
2022-12-13 15:34 ` Biju Das
2022-12-13 15:51 ` Pavel Machek
2022-12-13 16:06 ` Pavel Machek
2022-12-13 16:08 ` Biju Das
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=20221209145827.1309521-2-Quirin.Gylstorff@siemens.com \
--to=quirin.gylstorff@siemens.com \
--cc=cip-dev@lists.cip-project.org \
--cc=felix.moessbauer@siemens.com \
--cc=jan.kiszka@siemens.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).