[isar-cip-core] Switch to bullseye by default

Commit Message

Jan Kiszka May 26, 2022, 7:12 a.m. UTC

From: Jan Kiszka <[e-mail]>

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 <[e-mail]>
---
 .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

Patch

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 <[e-mail]>
@@ -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 <[e-mail]>
+#
+# SPDX-License-Identifier: MIT
+#
+
+header:
+  version: 10
+
+distro: cip-core-buster