[PATCH 1/1] kas-container: let buildsystem set via CLI take precedence

[Felix Moessbauer]

If the buildsystem is explicitly set via the CLI flag (e.g. --isar),
that should take precedence even if a .config.yml is found.

Along with these changes, we call the enable_<buildsystem>_mode
functions only once, hence we can safely remove the re-entrancy
guards and get a leaner control flow.

Signed-off-by: Felix Moessbauer <felix.mo...@siemens.com>
---
kas-container | 23 ++++++++++-------------
1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/kas-container b/kas-container
index 7aa129948..1f8e3dfb5 100755
--- a/kas-container
+++ b/kas-container
@@ -155,11 +155,6 @@ prepare_sudo_cmd()

enable_isar_mode()
{
- if [ -n "${ISAR_MODE}" ]; then
- return
- fi
- ISAR_MODE=1
-
KAS_CONTAINER_IMAGE_NAME_DEFAULT="kas-isar"
KAS_ISAR_ARGS="--privileged"

@@ -362,11 +357,13 @@ podman)
;;
esac

-# parse kas-container options
+# parse kas-container options, leave build system empty to distinguish between
+# explicitly set via flag and implicitly via config.
+BUILD_SYSTEM=""
while [ $# -gt 0 ]; do
case "$1" in
--isar)
- enable_isar_mode
+ BUILD_SYSTEM="isar"
shift 1
;;
--with-loop-dev)
@@ -571,10 +568,10 @@ if [ "${KAS_CMD}" = "menu" ]; then
if [ "$(echo "${KAS_FIRST_FILES}" | wc -w)" -ne "1" ]; then
fatal_error "menu plugin only supports a single Kconfig file"
fi
- BUILD_SYSTEM=$(tr '\n' '\f' 2>/dev/null < "${KAS_FIRST_FILES}" | \
+ BUILD_SYSTEM=${BUILD_SYSTEM:-$(tr '\n' '\f' 2>/dev/null < "${KAS_FIRST_FILES}" |
sed -e 's/\(.*\fconfig KAS_BUILD_SYSTEM\f\(.*\)\|.*\)/\2/' \
-e 's/\f\([[:alpha:]].*\|$\)//' \
- -e 's/.*default \"\(.*\)\".*/\1/')
+ -e 's/.*default \"\(.*\)\".*/\1/')}
else
if [ -z "${KAS_FIRST_FILES}" ]; then
KAS_FIRST_FILES="${KAS_WORK_DIR}/.config.yaml"
@@ -582,18 +579,18 @@ else

# We only get the first build system and let kas check if mixed
_KAS_FIRST_FILE=$(echo "${KAS_FIRST_FILES}" | awk '{print $1}')
- BUILD_SYSTEM=$(grep -e "^build_system: " "${_KAS_FIRST_FILE}" 2>/dev/null | \
- sed 's/build_system:[ ]\+//')
+ BUILD_SYSTEM=${BUILD_SYSTEM:-$(grep -e "^build_system: " "${_KAS_FIRST_FILE}" 2>/dev/null |
+ sed 's/build_system:[ ]\+//')}
fi

if [ "${BUILD_SYSTEM}" = "isar" ]; then
enable_isar_mode
-elif [ -z "${ISAR_MODE}" ]; then
+else
enable_oe_mode
fi

# clean can be executed without config, hence manually forward the build system
-if [ "${ISAR_MODE}" = "1" ] && echo "${KAS_CMD}" | grep -qe "^clean\|purge"; then
+if [ "${BUILD_SYSTEM}" = "isar" ] && echo "${KAS_CMD}" | grep -qe "^clean\|purge"; then
KAS_OPTIONS="${KAS_OPTIONS} --isar"
fi

--
2.53.0

[Jan Kiszka]

Thanks, applied.

Jan

--
Siemens AG, Foundational Technologies
Linux Expert Center