From: Jan Kiszka <jan.kiszka@siemens.com>
To: isar-users <isar-users@googlegroups.com>,
Anton Mikanovich <amikan@ilbers.de>
Cc: "Cirujano-Cuesta, Silvano" <silvano.cirujano-cuesta@siemens.com>,
"Moessbauer,
Felix (CT RDA IOT SES-DE)" <felix.moessbauer@siemens.com>
Subject: [PATCH v2] meta-isar: Fix container configurations
Date: Mon, 3 May 2021 07:35:35 +0200 [thread overview]
Message-ID: <6531f7bf-ed26-05b2-23e0-934a9015f3a8@siemens.com> (raw)
From: Jan Kiszka <jan.kiszka@siemens.com>
The machine conf was missing the target architecture, and all should in
fact carry that arch (currently only amd64) in their names.
As this avoid building containers for random non-host archs, we can
remove the KFAIL protection from the bullseye variant.
Also fix the copyright headers at this chance and use weak assignments.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
Changes in v2:
- adjust remaining references in local.conf.sample and build.sh
(now passes CI)
meta-isar/conf/local.conf.sample | 6 +++---
meta-isar/conf/machine/container-amd64.conf | 7 +++++++
meta-isar/conf/machine/container.conf | 5 -----
.../multiconfig/container-amd64-bullseye.conf | 7 +++++++
.../multiconfig/container-amd64-buster.conf | 7 +++++++
.../multiconfig/container-amd64-stretch.conf | 7 +++++++
.../conf/multiconfig/container-bullseye.conf | 4 ----
.../conf/multiconfig/container-buster.conf | 4 ----
.../conf/multiconfig/container-stretch.conf | 4 ----
scripts/ci_build.sh | 17 ++++-------------
10 files changed, 35 insertions(+), 33 deletions(-)
create mode 100644 meta-isar/conf/machine/container-amd64.conf
delete mode 100644 meta-isar/conf/machine/container.conf
create mode 100644 meta-isar/conf/multiconfig/container-amd64-bullseye.conf
create mode 100644 meta-isar/conf/multiconfig/container-amd64-buster.conf
create mode 100644 meta-isar/conf/multiconfig/container-amd64-stretch.conf
delete mode 100644 meta-isar/conf/multiconfig/container-bullseye.conf
delete mode 100644 meta-isar/conf/multiconfig/container-buster.conf
delete mode 100644 meta-isar/conf/multiconfig/container-stretch.conf
diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample
index 77585ec..6cf1656 100644
--- a/meta-isar/conf/local.conf.sample
+++ b/meta-isar/conf/local.conf.sample
@@ -51,9 +51,9 @@ BBMULTICONFIG = " \
qemuamd64-buster \
qemuamd64-buster-tgz \
qemuamd64-bullseye \
- container-stretch \
- container-buster \
- container-bullseye \
+ container-amd64-stretch \
+ container-amd64-buster \
+ container-amd64-bullseye \
qemumipsel-stretch \
qemumipsel-buster \
qemumipsel-bullseye \
diff --git a/meta-isar/conf/machine/container-amd64.conf b/meta-isar/conf/machine/container-amd64.conf
new file mode 100644
index 0000000..d2978c4
--- /dev/null
+++ b/meta-isar/conf/machine/container-amd64.conf
@@ -0,0 +1,7 @@
+#
+# Copyright (c) Siemens AG, 2021
+#
+# SPDX-License-Identifier: MIT
+
+DISTRO_ARCH ?= "amd64"
+IMAGE_TYPE ?= "container-img"
diff --git a/meta-isar/conf/machine/container.conf b/meta-isar/conf/machine/container.conf
deleted file mode 100644
index 367d790..0000000
--- a/meta-isar/conf/machine/container.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# This software is a part of ISAR.
-# Copyright (C) 2015-2017 ilbers GmbH
-
-IMAGE_TYPE = "container-img"
-
diff --git a/meta-isar/conf/multiconfig/container-amd64-bullseye.conf b/meta-isar/conf/multiconfig/container-amd64-bullseye.conf
new file mode 100644
index 0000000..0c1b2f2
--- /dev/null
+++ b/meta-isar/conf/multiconfig/container-amd64-bullseye.conf
@@ -0,0 +1,7 @@
+#
+# Copyright (c) Siemens AG, 2021
+#
+# SPDX-License-Identifier: MIT
+
+MACHINE ?= "container-amd64"
+DISTRO ?= "debian-bullseye"
diff --git a/meta-isar/conf/multiconfig/container-amd64-buster.conf b/meta-isar/conf/multiconfig/container-amd64-buster.conf
new file mode 100644
index 0000000..95027f8
--- /dev/null
+++ b/meta-isar/conf/multiconfig/container-amd64-buster.conf
@@ -0,0 +1,7 @@
+#
+# Copyright (c) Siemens AG, 2021
+#
+# SPDX-License-Identifier: MIT
+
+MACHINE ?= "container-amd64"
+DISTRO ?= "debian-buster"
diff --git a/meta-isar/conf/multiconfig/container-amd64-stretch.conf b/meta-isar/conf/multiconfig/container-amd64-stretch.conf
new file mode 100644
index 0000000..76a34d5
--- /dev/null
+++ b/meta-isar/conf/multiconfig/container-amd64-stretch.conf
@@ -0,0 +1,7 @@
+#
+# Copyright (c) Siemens AG, 2021
+#
+# SPDX-License-Identifier: MIT
+
+MACHINE ?= "container-amd64"
+DISTRO ?= "debian-stretch"
diff --git a/meta-isar/conf/multiconfig/container-bullseye.conf b/meta-isar/conf/multiconfig/container-bullseye.conf
deleted file mode 100644
index 200b241..0000000
--- a/meta-isar/conf/multiconfig/container-bullseye.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# This software is a part of ISAR.
-
-MACHINE ?= "container"
-DISTRO ?= "debian-bullseye"
diff --git a/meta-isar/conf/multiconfig/container-buster.conf b/meta-isar/conf/multiconfig/container-buster.conf
deleted file mode 100644
index 78b0324..0000000
--- a/meta-isar/conf/multiconfig/container-buster.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# This software is a part of ISAR.
-
-MACHINE ?= "container"
-DISTRO ?= "debian-buster"
diff --git a/meta-isar/conf/multiconfig/container-stretch.conf b/meta-isar/conf/multiconfig/container-stretch.conf
deleted file mode 100644
index 3ff8bcb..0000000
--- a/meta-isar/conf/multiconfig/container-stretch.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# This software is a part of ISAR.
-
-MACHINE ?= "container"
-DISTRO ?= "debian-stretch"
diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh
index adc22e4..8456d34 100755
--- a/scripts/ci_build.sh
+++ b/scripts/ci_build.sh
@@ -56,12 +56,9 @@ TARGETS_SET_BULLSEYE="\
"
TARGETS_CONTAINERS="\
- mc:container-stretch:isar-image-base \
- mc:container-buster:isar-image-base \
-"
-
-TARGETS_CONTAINERS_BULLSEYE="\
- mc:container-bullseye:isar-image-base \
+ mc:container-amd64-stretch:isar-image-base \
+ mc:container-amd64-buster:isar-image-base \
+ mc:container-amd64-bullseye:isar-image-base \
"
CROSS_TARGETS_SET="\
@@ -262,14 +259,8 @@ sed -i -e 's/\(IMAGE_INSTALL = .*\) example-module-${KERNEL_NAME}\(.*\)/\1\2/g'
sed -i -e 's/\(IMAGE_INSTALL = .*\) enable-fsck\(.*\)/\1\2/g' conf/local.conf
bitbake $BB_ARGS $TARGETS_CONTAINERS
while [ -e bitbake.sock ]; do sleep 1; done
-if bitbake $BB_ARGS $TARGETS_CONTAINERS_BULLSEYE; then
- echo "bullseye container: PASSED"
-else
- echo "bullseye container: KFAIL"
-fi
-while [ -e bitbake.sock ]; do sleep 1; done
# and SDK container image creation
echo 'SDK_FORMATS = "docker-archive"' >> conf/local.conf
-bitbake $BB_ARGS -c do_populate_sdk mc:container-stretch:isar-image-base
+bitbake $BB_ARGS -c do_populate_sdk mc:container-amd64-stretch:isar-image-base
while [ -e bitbake.sock ]; do sleep 1; done
--
2.26.2
--
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux
next reply other threads:[~2021-05-03 5:35 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-03 5:35 Jan Kiszka [this message]
2021-05-07 11:12 ` Anton Mikanovich
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=6531f7bf-ed26-05b2-23e0-934a9015f3a8@siemens.com \
--to=jan.kiszka@siemens.com \
--cc=amikan@ilbers.de \
--cc=felix.moessbauer@siemens.com \
--cc=isar-users@googlegroups.com \
--cc=silvano.cirujano-cuesta@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