From da62e0bfbd6db13a7b5088ef970f78e3040cdc62 Mon Sep 17 00:00:00 2001
From: Jan Kiszka <jan.kiszka@siemens.com>
Date: Sun, 18 Jul 2021 16:39:06 +0200
Subject: [PATCH] kas-container: Add support for menu plugin

For this script, this is almost straightforward - except that we need to
extract the static KAS_BUILD_SYSTEM config setting from the selected
Kconfig file so that the correct container image and mode is chosen.

Two new dependencies need to be added to the container image. While
python3-newt can come from Debian, kconfiglib only exists as Python
package. To make sure we are not pulling any other packages via pip,
install kconfiglib upfront. It has no own dependencies, thus can use
--no-deps as well.

Finally, the container-entrypoint needs to be updated to make it aware
of the new plugin.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 Dockerfile           |  5 +++--
 container-entrypoint |  2 +-
 kas-container        | 27 +++++++++++++++++++++++----
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ef21349..667d5d7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,7 +16,7 @@ RUN apt-get install --no-install-recommends -y \
         build-essential chrpath socat cpio python python3 python3-pip python3-pexpect \
         xz-utils debianutils iputils-ping python3-git python3-jinja2 libegl1-mesa libsdl1.2-dev \
         pylint3 xterm \
-        python3-setuptools python3-wheel python3-yaml python3-distro python3-jsonschema \
+        python3-setuptools python3-wheel python3-yaml python3-distro python3-jsonschema python3-newt \
         gosu lsb-release file vim less procps tree tar bzip2 zstd bc tmux libncurses-dev \
         dosfstools mtools parted lz4 \
         git-lfs/buster-backports mercurial iproute2 ssh-client curl rsync gnupg awscli sudo && \
@@ -31,7 +31,8 @@ ENV GIT_PROXY_COMMAND="oe-git-proxy" \
     NO_PROXY="*"
 
 COPY . /kas
-RUN pip3 --proxy=$https_proxy install --no-deps /kas && kas --help
+RUN pip3 --proxy=$https_proxy install --no-deps kconfiglib && \
+    pip3 --proxy=$https_proxy install --no-deps /kas && kas --help
 
 RUN echo "builder ALL=NOPASSWD: ALL" > /etc/sudoers.d/builder-nopasswd && \
     chmod 660 /etc/sudoers.d/builder-nopasswd
diff --git a/container-entrypoint b/container-entrypoint
index 24f4ebd..8eb0e40 100755
--- a/container-entrypoint
+++ b/container-entrypoint
@@ -40,7 +40,7 @@ fi
 
 if [ -n "$1" ]; then
 	case "$1" in
-	build|checkout|for-all-repos|shell|-*)
+	build|checkout|for-all-repos|menu|shell|-*)
 		exec $GOSU kas "$@"
 		;;
 	*)
diff --git a/kas-container b/kas-container
index ae35d2d..11ee12a 100755
--- a/kas-container
+++ b/kas-container
@@ -32,12 +32,15 @@ usage()
 	printf "%b" "Usage: $0 [OPTIONS] { build | checkout | shell } [KASOPTIONS] [KASFILE]\n"
 	printf "%b" "       $0 [OPTIONS] for-all-repos [KASOPTIONS] [KASFILE] COMMAND\n"
 	printf "%b" "       $0 [OPTIONS] clean\n"
+	printf "%b" "       $0 [OPTIONS] menu [KCONFIG]\n"
 	printf "%b" "\nPositional arguments:\n"
 	printf "%b" "build\t\t\tCheck out repositories and build target.\n"
 	printf "%b" "checkout\t\tCheck out repositories but do not build.\n"
 	printf "%b" "shell\t\t\tRun a shell in the build environment.\n"
 	printf "%b" "for-all-repos\t\tRun specified command in each repository.\n"
 	printf "%b" "clean\t\t\tClean build artifacts, keep downloads.\n"
+	printf "%b" "menu\t\t\tProvide configuration menu and trigger " \
+		    "configured build.\n"
 	printf "%b" "\nOptional arguments:\n"
 	printf "%b" "--isar\t\t\tUse kas-isar container to build Isar image.\n"
 	printf "%b" "--with-loop-dev		Pass a loop device to the " \
@@ -222,7 +225,7 @@ while [ $# -gt 0 ]; do
 		shift 1
 		break
 		;;
-	build|checkout|for-all-repos)
+	build|checkout|for-all-repos|menu)
 		KAS_REPO_MOUNT_OPT_DEFAULT="ro"
 		KAS_CMD=$1
 		shift 1
@@ -238,7 +241,7 @@ done
 
 KAS_EXTRA_BITBAKE_ARGS=0
 
-# parse kas sub-command (build or shell) options
+# parse kas sub-command options
 while [ $# -gt 0 ] && [ $KAS_EXTRA_BITBAKE_ARGS -eq 0 ]; do
 	case "$1" in
 	-h|--help)
@@ -294,11 +297,27 @@ if [ -n "${KAS_FIRST_FILE}" ]; then
 		|| KAS_REPO_DIR=$(hg --cwd "${KAS_FILE_DIR}" root 2>/dev/null) \
 		|| KAS_REPO_DIR=${KAS_FILE_DIR}
 else
-	KAS_FIRST_FILE="${KAS_WORK_DIR}/.config.yaml"
 	KAS_REPO_DIR=$(pwd)
 fi
 
-BUILD_SYSTEM=$(grep -e "^build_system: " "${KAS_FIRST_FILE}" 2>/dev/null | sed 's/build_system:[ ]\+//')
+if [ "${KAS_CMD}" = "menu" ]; then
+	if [ -z "${KAS_FIRST_FILE}" ]; then
+		KAS_FIRST_FILE="Kconfig"
+	fi
+
+	BUILD_SYSTEM=$(tr '\n' '\f' 2>/dev/null < ${KAS_FIRST_FILE} | \
+		sed -e 's/\(.*\fconfig KAS_BUILD_SYSTEM\f\(.*\)\|.*\)/\2/' \
+		    -e 's/\f\([[:alpha:]].*\|$\)//' \
+		    -e 's/.*default \"\(.*\)\".*/\1/')
+else
+	if [ -z "${KAS_FIRST_FILE}" ]; then
+		KAS_FIRST_FILE="${KAS_WORK_DIR}/.config.yaml"
+	fi
+
+	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
 fi