From: Uladzimir Bely <ubely@ilbers.de>
To: isar-users@googlegroups.com
Subject: [PATCH v2 4/5] meta-isar: Rework mc:qemuamd64-buster configs
Date: Tue, 28 Sep 2021 09:13:51 +0200 [thread overview]
Message-ID: <20210928071352.31382-5-ubely@ilbers.de> (raw)
In-Reply-To: <20210928071352.31382-1-ubely@ilbers.de>
We remove mc:qemuamd64-buster-tgz config that explicitly creates tgz-img,
and mc:qemuamd64-buster-cpiogz config that createc cpiogz image,
but add these image types to common mc:qemuamd64-buster config.
This gives several output image types for this machine and
allows to test this feature in CI.
Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
---
meta-isar/conf/local.conf.sample | 2 --
meta-isar/conf/multiconfig/qemuamd64-buster-cpiogz.conf | 9 ---------
meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf | 9 ---------
meta-isar/conf/multiconfig/qemuamd64-buster.conf | 2 ++
scripts/ci_build.sh | 5 ++---
5 files changed, 4 insertions(+), 23 deletions(-)
delete mode 100644 meta-isar/conf/multiconfig/qemuamd64-buster-cpiogz.conf
delete mode 100644 meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf
diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample
index 88a8175..d90c739 100644
--- a/meta-isar/conf/local.conf.sample
+++ b/meta-isar/conf/local.conf.sample
@@ -49,8 +49,6 @@ BBMULTICONFIG = " \
qemui386-bullseye \
qemuamd64-stretch \
qemuamd64-buster \
- qemuamd64-buster-tgz \
- qemuamd64-buster-cpiogz \
qemuamd64-bullseye \
container-amd64-stretch \
container-amd64-buster \
diff --git a/meta-isar/conf/multiconfig/qemuamd64-buster-cpiogz.conf b/meta-isar/conf/multiconfig/qemuamd64-buster-cpiogz.conf
deleted file mode 100644
index cadcdac..0000000
--- a/meta-isar/conf/multiconfig/qemuamd64-buster-cpiogz.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-# This software is a part of ISAR.
-# Copyright (c) Siemens AG, 2020
-#
-# SPDX-License-Identifier: MIT
-
-MACHINE ?= "qemuamd64"
-DISTRO ?= "debian-buster"
-
-IMAGE_TYPE = "cpiogz-img"
diff --git a/meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf b/meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf
deleted file mode 100644
index 17de338..0000000
--- a/meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-# This software is a part of ISAR.
-# Copyright (c) Siemens AG, 2018
-#
-# SPDX-License-Identifier: MIT
-
-MACHINE ?= "qemuamd64"
-DISTRO ?= "debian-buster"
-
-IMAGE_TYPE ?= "targz-img"
diff --git a/meta-isar/conf/multiconfig/qemuamd64-buster.conf b/meta-isar/conf/multiconfig/qemuamd64-buster.conf
index 3fabd67..d8139f7 100644
--- a/meta-isar/conf/multiconfig/qemuamd64-buster.conf
+++ b/meta-isar/conf/multiconfig/qemuamd64-buster.conf
@@ -2,3 +2,5 @@
MACHINE ?= "qemuamd64"
DISTRO ?= "debian-buster"
+
+IMAGE_TYPE ?= "wic-img targz-img cpiogz-img"
diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh
index 48a51f2..c39ba3b 100755
--- a/scripts/ci_build.sh
+++ b/scripts/ci_build.sh
@@ -36,8 +36,6 @@ TARGETS_SET="\
mc:qemui386-buster:isar-image-base \
mc:qemuamd64-stretch:isar-image-base \
mc:qemuamd64-buster:isar-image-base \
- mc:qemuamd64-buster-tgz:isar-image-base \
- mc:qemuamd64-buster-cpiogz:isar-image-base \
mc:qemuamd64-buster:isar-initramfs \
mc:qemumipsel-stretch:isar-image-base \
mc:qemumipsel-buster:isar-image-base \
@@ -196,6 +194,7 @@ if [ -n "$REPRO_BUILD" ]; then
sed -i -e 's/ISAR_USE_CACHED_BASE_REPO ?= "1"/#ISAR_USE_CACHED_BASE_REPO ?= "1"/g' conf/local.conf
sed -i -e 's/^BB_NO_NETWORK/#BB_NO_NETWORK/g' conf/local.conf
sed -i -e 's/^BASE_REPO_KEY/#BASE_REPO_KEY/g' conf/local.conf
+
bitbake $BB_ARGS $REPRO_TARGETS_SET
while [ -e bitbake.sock ]; do sleep 1; done
# Enable use of unsigned cached base repository
@@ -205,6 +204,7 @@ if [ -n "$REPRO_BUILD" ]; then
bitbake $BB_ARGS $REPRO_TARGETS_SET
while [ -e bitbake.sock ]; do sleep 1; done
# Disable use of unsigned cached base repository
+
sed -i -e 's/ISAR_USE_CACHED_BASE_REPO ?= "1"/#ISAR_USE_CACHED_BASE_REPO ?= "1"/g' conf/local.conf
sed -i -e 's/^BB_NO_NETWORK/#BB_NO_NETWORK/g' conf/local.conf
# Try to build with changed configuration with no cleanup
@@ -273,4 +273,3 @@ while [ -e bitbake.sock ]; do sleep 1; done
echo 'SDK_FORMATS = "docker-archive"' >> conf/local.conf
bitbake $BB_ARGS -c do_populate_sdk mc:container-amd64-stretch:isar-image-base
while [ -e bitbake.sock ]; do sleep 1; done
-
--
2.20.1
next prev parent reply other threads:[~2021-09-28 7:14 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-28 7:13 [PATCH v2 0/5] Support multiple image types in one build Uladzimir Bely
2021-09-28 7:13 ` [PATCH v2 1/5] image: Make WORKDIR and STAMPs unrelated to IMAGE_TYPE Uladzimir Bely
2021-09-28 7:13 ` [PATCH v2 2/5] wic-img: Set weak default value for WKS_FILE Uladzimir Bely
2021-10-05 8:49 ` Henning Schild
2021-09-28 7:13 ` [PATCH v2 3/5] start_vm: Use the first image type to start VM Uladzimir Bely
2021-10-05 8:52 ` Henning Schild
2021-09-28 7:13 ` Uladzimir Bely [this message]
2021-10-05 8:54 ` [PATCH v2 4/5] meta-isar: Rework mc:qemuamd64-buster configs Henning Schild
2021-09-28 7:13 ` [PATCH v2 5/5] api: Rename IMAGE_TYPE to IMAGE_FSTYPES Uladzimir Bely
2021-10-05 8:56 ` Henning Schild
2021-10-05 9:08 ` [PATCH v2 0/5] Support multiple image types in one build Henning Schild
2021-11-18 13:41 ` Baurzhan Ismagulov
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=20210928071352.31382-5-ubely@ilbers.de \
--to=ubely@ilbers.de \
--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