From: Henning Schild <henning.schild@siemens.com>
To: isar-users@googlegroups.com
Cc: Henning Schild <henning.schild@siemens.com>
Subject: [PATCH] conf: add new debian version "bookworm"
Date: Tue, 14 Sep 2021 12:35:30 +0200 [thread overview]
Message-ID: <20210914103530.27482-1-henning.schild@siemens.com> (raw)
Add all configuration files and CI targets.
Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
meta-isar/conf/local.conf.sample | 6 +++++
.../multiconfig/container-amd64-bookworm.conf | 7 ++++++
.../conf/multiconfig/qemuamd64-bookworm.conf | 4 ++++
.../conf/multiconfig/qemuarm-bookworm.conf | 4 ++++
.../conf/multiconfig/qemuarm64-bookworm.conf | 6 +++++
.../conf/multiconfig/qemui386-bookworm.conf | 4 ++++
.../conf/multiconfig/qemumipsel-bookworm.conf | 5 +++++
meta/conf/distro/debian-bookworm.conf | 19 ++++++++++++++++
meta/conf/distro/debian-bookworm.list | 8 +++++++
scripts/ci_build.sh | 22 ++++++++++++-------
10 files changed, 77 insertions(+), 8 deletions(-)
create mode 100644 meta-isar/conf/multiconfig/container-amd64-bookworm.conf
create mode 100644 meta-isar/conf/multiconfig/qemuamd64-bookworm.conf
create mode 100644 meta-isar/conf/multiconfig/qemuarm-bookworm.conf
create mode 100644 meta-isar/conf/multiconfig/qemuarm64-bookworm.conf
create mode 100644 meta-isar/conf/multiconfig/qemui386-bookworm.conf
create mode 100644 meta-isar/conf/multiconfig/qemumipsel-bookworm.conf
create mode 100644 meta/conf/distro/debian-bookworm.conf
create mode 100644 meta/conf/distro/debian-bookworm.list
diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample
index 96a8beb31196..734bf5bc70fe 100644
--- a/meta-isar/conf/local.conf.sample
+++ b/meta-isar/conf/local.conf.sample
@@ -41,22 +41,28 @@ BBMULTICONFIG = " \
qemuarm-stretch \
qemuarm-buster \
qemuarm-bullseye \
+ qemuarm-bookworm \
qemuarm64-stretch \
qemuarm64-buster \
qemuarm64-bullseye \
+ qemuarm64-bookworm \
qemui386-stretch \
qemui386-buster \
qemui386-bullseye \
+ qemui386-bookworm \
qemuamd64-stretch \
qemuamd64-buster \
qemuamd64-buster-tgz \
qemuamd64-bullseye \
+ qemuamd64-bookworm \
container-amd64-stretch \
container-amd64-buster \
container-amd64-bullseye \
+ container-amd64-bookworm \
qemumipsel-stretch \
qemumipsel-buster \
qemumipsel-bullseye \
+ qemumipsel-bookworm \
qemuriscv64-sid-ports \
bananapi-buster \
de0-nano-soc-buster \
diff --git a/meta-isar/conf/multiconfig/container-amd64-bookworm.conf b/meta-isar/conf/multiconfig/container-amd64-bookworm.conf
new file mode 100644
index 000000000000..f5e53996f80d
--- /dev/null
+++ b/meta-isar/conf/multiconfig/container-amd64-bookworm.conf
@@ -0,0 +1,7 @@
+#
+# Copyright (c) Siemens AG, 2021
+#
+# SPDX-License-Identifier: MIT
+
+MACHINE ?= "container-amd64"
+DISTRO ?= "debian-bookworm"
diff --git a/meta-isar/conf/multiconfig/qemuamd64-bookworm.conf b/meta-isar/conf/multiconfig/qemuamd64-bookworm.conf
new file mode 100644
index 000000000000..a5ad814f443a
--- /dev/null
+++ b/meta-isar/conf/multiconfig/qemuamd64-bookworm.conf
@@ -0,0 +1,4 @@
+# This software is a part of ISAR.
+
+MACHINE ?= "qemuamd64"
+DISTRO ?= "debian-bookworm"
diff --git a/meta-isar/conf/multiconfig/qemuarm-bookworm.conf b/meta-isar/conf/multiconfig/qemuarm-bookworm.conf
new file mode 100644
index 000000000000..081923651188
--- /dev/null
+++ b/meta-isar/conf/multiconfig/qemuarm-bookworm.conf
@@ -0,0 +1,4 @@
+# This software is a part of ISAR.
+
+MACHINE ?= "qemuarm"
+DISTRO ?= "debian-bookworm"
diff --git a/meta-isar/conf/multiconfig/qemuarm64-bookworm.conf b/meta-isar/conf/multiconfig/qemuarm64-bookworm.conf
new file mode 100644
index 000000000000..4bbaa849678b
--- /dev/null
+++ b/meta-isar/conf/multiconfig/qemuarm64-bookworm.conf
@@ -0,0 +1,6 @@
+# This software is a part of ISAR.
+# Copyright (C) 2017 ilbers GmbH
+# Copyright (c) Siemens AG, 2019
+
+MACHINE ?= "qemuarm64"
+DISTRO ?= "debian-bookworm"
diff --git a/meta-isar/conf/multiconfig/qemui386-bookworm.conf b/meta-isar/conf/multiconfig/qemui386-bookworm.conf
new file mode 100644
index 000000000000..a71732be2a26
--- /dev/null
+++ b/meta-isar/conf/multiconfig/qemui386-bookworm.conf
@@ -0,0 +1,4 @@
+# This software is a part of ISAR.
+
+MACHINE ?= "qemui386"
+DISTRO ?= "debian-bookworm"
diff --git a/meta-isar/conf/multiconfig/qemumipsel-bookworm.conf b/meta-isar/conf/multiconfig/qemumipsel-bookworm.conf
new file mode 100644
index 000000000000..7016c1ec92a4
--- /dev/null
+++ b/meta-isar/conf/multiconfig/qemumipsel-bookworm.conf
@@ -0,0 +1,5 @@
+# This software is a part of ISAR.
+# Copyright (C) 2019 Mentor Graphics, a Siemens busines
+
+MACHINE ?= "qemumipsel"
+DISTRO ?= "debian-bookworm"
diff --git a/meta/conf/distro/debian-bookworm.conf b/meta/conf/distro/debian-bookworm.conf
new file mode 100644
index 000000000000..c83d6588374d
--- /dev/null
+++ b/meta/conf/distro/debian-bookworm.conf
@@ -0,0 +1,19 @@
+# This software is a part of ISAR.
+
+require debian-common.conf
+
+BASE_DISTRO_CODENAME = "bookworm"
+
+HOST_DISTRO ?= "debian-${BASE_DISTRO_CODENAME}"
+
+DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh"
+DISTRO_KERNELS ?= "4kc-malta 5kc-malta 686-pae 686 alpha-generic alpha-smp \
+ amd64 arm64 armmp-lpae armmp cloud-amd64 cloud-arm64 itanium \
+ loongson-3 m68k marvell mckinley mips32r6 mips32r6el mips64r6 \
+ mips64r6el octeon parisc parisc64 powerpc-smp powerpc powerpc64 \
+ powerpc64le riscv64 rpi rt-686-pae rt-amd64 rt-arm64 rt-armmp \
+ s390x sh7751r sh7785lcr sparc64-smp sparc64"
+
+IMAGE_PREINSTALL += "init"
+
+WIC_IMAGER_INSTALL += "python3-distutils"
diff --git a/meta/conf/distro/debian-bookworm.list b/meta/conf/distro/debian-bookworm.list
new file mode 100644
index 000000000000..a17c87c47f58
--- /dev/null
+++ b/meta/conf/distro/debian-bookworm.list
@@ -0,0 +1,8 @@
+deb http://deb.debian.org/debian bookworm main contrib non-free
+deb-src http://deb.debian.org/debian bookworm main contrib non-free
+
+deb http://deb.debian.org/debian-security/ bookworm-security/updates main contrib non-free
+deb-src http://deb.debian.org/debian-security/ bookworm-security/updates main contrib non-free
+
+deb http://deb.debian.org/debian bookworm-updates main contrib non-free
+deb-src http://deb.debian.org/debian bookworm-updates main contrib non-free
diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh
index 837cd6783622..7921218f90f9 100755
--- a/scripts/ci_build.sh
+++ b/scripts/ci_build.sh
@@ -48,17 +48,22 @@ TARGETS_SET="\
# mc:qemuarm64-buster:isar-image-base
# mc:qemuarm64-bullseye:isar-image-base
-TARGETS_SET_BULLSEYE="\
+TARGETS_SET_RECENT="\
mc:qemuamd64-bullseye:isar-image-base \
+ mc:qemuamd64-bookworm:isar-image-base \
mc:qemuarm-bullseye:isar-image-base \
+ mc:qemuarm-bookworm:isar-image-base \
mc:qemui386-bullseye:isar-image-base \
+ mc:qemui386-bookworm:isar-image-base \
mc:qemumipsel-bullseye:isar-image-base \
+ mc:qemumipsel-bookworm:isar-image-base \
"
TARGETS_CONTAINERS="\
mc:container-amd64-stretch:isar-image-base \
mc:container-amd64-buster:isar-image-base \
mc:container-amd64-bullseye:isar-image-base \
+ mc:container-amd64-bookworm:isar-image-base \
"
CROSS_TARGETS_SET="\
@@ -71,8 +76,9 @@ CROSS_TARGETS_SET="\
mc:rpi-stretch:isar-image-base \
mc:qemuarm64-focal:isar-image-base"
-CROSS_TARGETS_SET_BULLSEYE="\
+CROSS_TARGETS_SET_RECENT="\
mc:qemuarm-bullseye:isar-image-base \
+ mc:qemuarm-bookworm:isar-image-base \
"
REPRO_TARGETS_SET_SIGNED="\
@@ -214,10 +220,10 @@ sed -i -e 's/^#BASE_REPO_FEATURES ?= "cache-deb-src"/BASE_REPO_FEATURES ?= "cach
sed -i -e 's/ISAR_CROSS_COMPILE ?= "0"/ISAR_CROSS_COMPILE ?= "1"/g' conf/local.conf
bitbake $BB_ARGS $CROSS_TARGETS_SET
while [ -e bitbake.sock ]; do sleep 1; done
-if bitbake $BB_ARGS $CROSS_TARGETS_SET_BULLSEYE; then
- echo "bullseye cross: PASSED"
+if bitbake $BB_ARGS $CROSS_TARGETS_SET_RECENT; then
+ echo "recent cross: PASSED"
else
- echo "bullseye cross: KFAIL"
+ echo "recent cross: KFAIL"
fi
# In addition test SDK creation
bitbake $BB_ARGS -c do_populate_sdk mc:qemuarm-stretch:isar-image-base
@@ -230,10 +236,10 @@ if [ -z "$FAST_BUILD" ]; then
bitbake $BB_ARGS $TARGETS_SET
while [ -e bitbake.sock ]; do sleep 1; done
- if bitbake $BB_ARGS $TARGETS_SET_BULLSEYE; then
- echo "bullseye: PASSED"
+ if bitbake $BB_ARGS $TARGETS_SET_RECENT; then
+ echo "recent: PASSED"
else
- echo "bullseye: KFAIL"
+ echo "recent: KFAIL"
fi
while [ -e bitbake.sock ]; do sleep 1; done
fi
--
2.32.0
next reply other threads:[~2021-09-14 10:35 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-14 10:35 Henning Schild [this message]
2021-09-16 13:17 ` Anton Mikanovich
2021-09-17 1:48 ` Tim Orling
2021-09-17 7:45 ` Henning Schild
2021-09-17 10:22 ` Jan Kiszka
2021-09-17 8:12 ` Anton Mikanovich
2021-09-17 16:25 ` Anton Mikanovich
2021-09-17 16:43 ` Jan Kiszka
2021-09-17 18:29 ` Tim Orling
2021-09-17 7:19 ` Henning Schild
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=20210914103530.27482-1-henning.schild@siemens.com \
--to=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