From: Jan Kiszka <jan.kiszka@siemens.com>
To: cip-dev <cip-dev@lists.cip-project.org>
Subject: [isar-cip-core][PATCH] Switch to bullseye by default
Date: Thu, 26 May 2022 09:12:22 +0200 [thread overview]
Message-ID: <9c68811b-c8df-6f80-d314-b379b131ab8c@siemens.com> (raw)
From: Jan Kiszka <jan.kiszka@siemens.com>
For new projects, this is clearly the better choice. So, move our
defaults forward. A separate kas option is introduced to allow explicit
selections without relying on defaults.
CI is kept with its existing focus on buster images. This can be updated
separately later on.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
.gitlab-ci.yml | 1 +
Kconfig | 3 ++-
kas-cip.yml | 4 ++--
kas/opt/buster.yml | 15 +++++++++++++++
4 files changed, 20 insertions(+), 3 deletions(-)
create mode 100644 kas/opt/buster.yml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e2ed919..8545a66 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,6 +35,7 @@ default:
- if [ "${extension}" != "base" ]; then base_yaml="${base_yaml}:kas/opt/${extension}.yml"; fi
- if [ "${wic_targz}" = "enable" ]; then base_yaml="${base_yaml}:kas/opt/wic-targz-img.yml"; fi
- if [ "${targz}" = "enable" ]; then base_yaml="${base_yaml}:kas/opt/targz-img.yml"; fi
+ - if [ "${release}" = "buster" ]; then base_yaml="${base_yaml}:kas/opt/buster.yml"; fi
- if [ "${release}" = "bullseye" ]; then base_yaml="${base_yaml}:kas/opt/bullseye.yml"; fi
- echo "Building ${base_yaml}"
- kas build ${base_yaml}
diff --git a/Kconfig b/Kconfig
index 651a726..9c89008 100644
--- a/Kconfig
+++ b/Kconfig
@@ -80,7 +80,7 @@ comment "Debian distribution options"
choice
prompt "Debian Release"
- default DEBIAN_BUSTER
+ default DEBIAN_BULLSEYE
config DEBIAN_BUSTER
bool "buster (10)"
@@ -92,6 +92,7 @@ endchoice
config KAS_INCLUDE_DEBIAN
string
+ default "kas/opt/buster.yml" if DEBIAN_BUSTER
default "kas/opt/bullseye.yml" if DEBIAN_BULLSEYE
comment "Image features"
diff --git a/kas-cip.yml b/kas-cip.yml
index fce176b..48de066 100644
--- a/kas-cip.yml
+++ b/kas-cip.yml
@@ -1,7 +1,7 @@
#
# CIP Core, generic profile
#
-# Copyright (c) Siemens AG, 2019
+# Copyright (c) Siemens AG, 2019-2022
#
# Authors:
# Jan Kiszka <jan.kiszka@siemens.com>
@@ -12,7 +12,7 @@
header:
version: 10
-distro: cip-core-buster
+distro: cip-core-bullseye
target: cip-core-image
build_system: isar
diff --git a/kas/opt/buster.yml b/kas/opt/buster.yml
new file mode 100644
index 0000000..a762163
--- /dev/null
+++ b/kas/opt/buster.yml
@@ -0,0 +1,15 @@
+#
+# CIP Core, generic profile
+#
+# Copyright (c) Siemens AG, 2022
+#
+# Authors:
+# Jan Kiszka <jan.kiszka@siemens.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+header:
+ version: 10
+
+distro: cip-core-buster
--
2.35.3
reply other threads:[~2022-05-26 7:12 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=9c68811b-c8df-6f80-d314-b379b131ab8c@siemens.com \
--to=jan.kiszka@siemens.com \
--cc=cip-dev@lists.cip-project.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.