From: Jan Kiszka <
jan.k...@siemens.com>
This was forgotten when introducing KAS_CONTAINER_SCRIPT_VERSION,
causing the release of 4.8 to overwrite KAS_IMAGE_VERSION_DEFAULT again.
Fix up the variables and update the release script to use the right one
from now on.
Fixes: 99d9604f0c5b ("kas-container: pass script version to kas in container")
Signed-off-by: Jan Kiszka <
jan.k...@siemens.com>
---
Means we need a 4.8.1 - too bad.
kas-container | 6 +++---
scripts/release.sh | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/kas-container b/kas-container
index 3e11669..b72c87b 100755
--- a/kas-container
+++ b/kas-container
@@ -2,7 +2,7 @@
#
# kas - setup tool for bitbake based projects
#
-# Copyright (c) Siemens AG, 2018-2024
+# Copyright (c) Siemens AG, 2018-2025
#
# Authors:
# Jan Kiszka <
jan.k...@siemens.com>
@@ -27,8 +27,8 @@
set -e
-KAS_CONTAINER_SCRIPT_VERSION="4.7"
-KAS_IMAGE_VERSION_DEFAULT="4.8"
+KAS_CONTAINER_SCRIPT_VERSION="4.8"
+KAS_IMAGE_VERSION_DEFAULT="${KAS_CONTAINER_SCRIPT_VERSION}"
KAS_CONTAINER_IMAGE_PATH_DEFAULT="
ghcr.io/siemens/kas"
KAS_CONTAINER_IMAGE_NAME_DEFAULT="kas"
KAS_CONTAINER_SELF_NAME="$(basename "$0")"
diff --git a/scripts/release.sh b/scripts/release.sh
index de60063..f41e508 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -31,7 +31,7 @@ fi
mv newchangelog CHANGELOG.md
sed -i "s,\(__version__ =\).*,\1 \'$NEW_VERSION\'," kas/__version__.py
-sed -i "s,\(KAS_IMAGE_VERSION_DEFAULT=\).*,\1\"$NEW_VERSION\"," kas-container
+sed -i "s,\(KAS_CONTAINER_SCRIPT_VERSION=\).*,\1\"$NEW_VERSION\"," kas-container
git add CHANGELOG.md
git add kas/__version__.py
--
2.43.0