From: Felix Moessbauer <felix.moessbauer@siemens.com>
To: isar-users@googlegroups.com
Cc: henning.schild@siemens.com, adriaan.schmidt@siemens.com,
Felix Moessbauer <felix.moessbauer@siemens.com>
Subject: [PATCH v4 2/2] Ensure generation of /etc/os-release is idempotent
Date: Thu, 4 Nov 2021 12:05:07 +0100 [thread overview]
Message-ID: <20211104110507.2358692-3-felix.moessbauer@siemens.com> (raw)
In-Reply-To: <20211104110507.2358692-1-felix.moessbauer@siemens.com>
Prior to this patch, the generation of the os-release file
was not idempotent as there was a name-glitch in VARIAN_VERSION.
By that, the script did not detect an existing VARIANT_VERSION
and add one additional one per invocation.
Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
---
meta/classes/image-postproc-extension.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/image-postproc-extension.bbclass b/meta/classes/image-postproc-extension.bbclass
index 6e6b257..87749c8 100644
--- a/meta/classes/image-postproc-extension.bbclass
+++ b/meta/classes/image-postproc-extension.bbclass
@@ -27,7 +27,7 @@ update_etc_os_release() {
sudo tee -a '${IMAGE_ROOTFS}/etc/os-release'
fi
if [ -n "${OS_RELEASE_VARIANT_VERSION}" ]; then
- sudo sed -i '/^ISAR_IMAGE_VERSION=.*/d' '${IMAGE_ROOTFS}/etc/os-release'
+ sudo sed -i '/^VARIANT_VERSION=.*/d' '${IMAGE_ROOTFS}/etc/os-release'
echo "VARIANT_VERSION=\"${PV}\"" | \
sudo tee -a '${IMAGE_ROOTFS}/etc/os-release'
fi
--
2.30.2
next prev parent reply other threads:[~2021-11-04 11:05 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-04 11:05 [PATCH v4 0/2] Improve handling of ISAR_RELEASE_CMD Felix Moessbauer
2021-11-04 11:05 ` [PATCH v4 1/2] always invoke ISAR_RELEASE_CMD to invalidate downstream tasks on change Felix Moessbauer
2021-11-04 11:05 ` Felix Moessbauer [this message]
2021-11-04 13:12 ` [PATCH v4 0/2] Improve handling of ISAR_RELEASE_CMD Henning Schild
2021-11-16 18:09 ` Anton Mikanovich
2021-11-17 10:45 ` Moessbauer, Felix
2021-11-17 13:05 ` Anton Mikanovich
2021-11-17 15:57 ` Moessbauer, Felix
2021-11-17 16:39 ` Baurzhan Ismagulov
2021-11-22 15:28 ` Anton Mikanovich
2021-11-24 9:30 ` Schmidt, Adriaan
2021-11-24 10:15 ` Moessbauer, Felix
2021-11-24 11:25 ` Jan Kiszka
2021-11-24 11:54 ` Anton Mikanovich
2021-11-24 12:11 ` Henning Schild
2021-11-29 9:09 ` Anton Mikanovich
2021-11-29 9:50 ` Henning Schild
2021-11-29 9:55 ` Anton Mikanovich
2021-11-29 13:04 ` Anton Mikanovich
2021-11-29 13:18 ` Henning Schild
2021-11-29 14:20 ` Anton Mikanovich
2021-11-30 10:03 ` Moessbauer, Felix
2021-12-01 10:39 ` Anton Mikanovich
2021-12-02 14:55 ` Anton Mikanovich
2021-12-03 9:51 ` Moessbauer, Felix
2021-11-24 11:53 ` Anton Mikanovich
2021-11-24 12:35 ` Henning Schild
2021-11-24 12:52 ` Anton Mikanovich
2021-11-17 16:54 ` Henning Schild
2021-11-18 8:36 ` Moessbauer, Felix
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=20211104110507.2358692-3-felix.moessbauer@siemens.com \
--to=felix.moessbauer@siemens.com \
--cc=adriaan.schmidt@siemens.com \
--cc=henning.schild@siemens.com \
--cc=isar-users@googlegroups.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