From patchwork Tue Jan 6 11:04:57 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "srinuvasan.a" X-Patchwork-Id: 4789 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 06 Jan 2026 12:05:09 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f55.google.com (mail-lf1-f55.google.com [209.85.167.55]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 606B58cK019448 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 6 Jan 2026 12:05:08 +0100 Received: by mail-lf1-f55.google.com with SMTP id 2adb3069b0e04-595892a3910sf642848e87.1 for ; Tue, 06 Jan 2026 03:05:08 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1767697497; cv=pass; d=google.com; s=arc-20240605; b=LYkGMwHlLn0eAU/3WQeBS/fCC6Gu1IQgjS+SY8bkx5qjrDODoLsSRAl5GvnFuyGMPO nku1HwER84olIiRMC5KDLJNKFsMR0TUVtMZx2Noo4NU/3OA3pgVPgwgNP6ALC+ro+5U2 sTWCUArafpyo+0pfu+jnkOCM4mnQ9A0KsmY0WCNlTBnpzCXc5fRtNUe7iX8Z3OP6udhd KnMQq2WrKUKEYTvVucmpkYPDyQiWRTo7UJInzXQwG5awcgKChR+kbV4Xt8Ydenvkeuh/ SYwk7lt+ScI+JDP7mHO5rwXJu4fotv+glhQNsq7J3jWzasnQINjXyjVKmY2Y83T+B3Cc xVIQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=YRuwPJ6goVnXetA+q8WKevibq8v3bBoNLy6DExa5doQ=; fh=nflRVdNBDE+mz5uLLGnsbJjBatbHbGNqEhbROVF7p5s=; b=g6Mne/Dvkw+ketn6xMfdJn8kAQG0qAhQTVWACPP41DqwzTIoqCqs1crXZWTjo0v+0N WinHLzQwDh8RgObwFUuolWcvn7WaGEUSkxcp14JcGw2Z4fQjz0fRkFxGIbDDMl8R00bb ++KLe5uXtEKMqJLN4h8kcmOeOHt0S5OTZElAUCWi23P3rpRVkJuDwWWhueHf+Ga0Uypl 9gWcqReVD5lTxiuG3AgivtL0b2LvZresBEx3Va+lbJIqSgwofk8xGzRDiwgl150lnE49 Cd1pOZsPROB2Ws7sUi9Q/+sHnjRZNCb/VNpo5V7jvK706I1ld6lduV5cIA8+6B9rEswM 5hNg==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=OTzGRC07; spf=pass (google.com: domain of fm-1324425-2026010611045280dcd4b8210002075f-cou1n5@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-1324425-2026010611045280dcd4b8210002075f-COu1n5@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1767697497; x=1768302297; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=YRuwPJ6goVnXetA+q8WKevibq8v3bBoNLy6DExa5doQ=; b=aw4n85Lw+LsSPFnPNBX6RFpkQC9zsytMHr9vpc4lexYYvTheMm+GoO9DktZZWwbBB6 YHFpQascsvqWXkBD6G0EuNLvZ4CNT4pKmK5/Ho7tTMNnwWNQbDWh0gWw/wWLtmUKA1Gw Yg7WdIJlV9r4bo+AYUZjs8+W7GQLYJ2m7Vo0kuOzinK1vPL/5ZpmNsqjjIHzqCwsTHke 1M/M6zlF6d+G1rPDWrd2np+3pd80FhtBDmbTBTvm+Fmyq4iHBvAaPTFAtqrflWFWiRSC W984v9S+jgkb568ymxWtUH7Lsu0n8pCImVGQq0SrivugMsLbWX2+MZ+9Wam16ToDLov+ 4DbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767697497; x=1768302297; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=YRuwPJ6goVnXetA+q8WKevibq8v3bBoNLy6DExa5doQ=; b=QQ678vmH5h0kpfkeUyBVv67dDos+2PqA6IZwL1T+mnYWLAaerwqsyVA+XVGRrpzRZP q1gtkwaWnmNL6IA5sMeNOw3g3f18gIAUC97uxJ72X6UQsYyFuchdU2oqgiEWMW07jyxI cq8K+9lyXvokk+ccLs5iQGrzR1gU3e12HrKF1aIhflN0j1dwAfa98n8mGcTyV66jHuLI TihxGKoczTOP1BZPbNUN6RxirD/PAudDOsZDP1WEXVaUlkjEkNmI2vrR1beMc/WNKmkf JQodKcmC/VQH+KF7nA4EWGUqESuWvBTrqdmY7rVtKLhSAO8qND3pojJlQT0WSKV23FCx 4Y2g== X-Forwarded-Encrypted: i=2; AJvYcCW+zLcVaZ4vrcZR2Tmn6i4GwFUV3IHMy2A49PkcrRzfwrTz9WTCsjbvxGu/i5edEkXwBzVW6a4=@isar-build.org X-Gm-Message-State: AOJu0Yz3TpfKBAT9zoozj92qQHSgdwAmIUrkKG4rfOE2C5IvPmsRHxNZ FKlGdIGLe5gkqpuzExCifNVAmdPRr3Eo1JSvX6q3a1RRDJwPJ+ahqBfd X-Google-Smtp-Source: AGHT+IHbE0sVODNg+aSGFM0qVLnfokXB0eQo4IkZsIs9ofTAYmxqB/TWi2b8NSthZ6hskJxOpdSwiw== X-Received: by 2002:a05:6512:3b0a:b0:59b:4213:613c with SMTP id 2adb3069b0e04-59b652f0de7mr928541e87.53.1767697497029; Tue, 06 Jan 2026 03:04:57 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h="AWVwgWbQSUVY2DI9ORNGqefyJZ9AC2JW75GEr6LU2RNFS//QeA==" Received: by 2002:a05:6512:340b:b0:59a:10df:3574 with SMTP id 2adb3069b0e04-59b651ea659ls326844e87.2.-pod-prod-02-eu; Tue, 06 Jan 2026 03:04:54 -0800 (PST) X-Received: by 2002:a05:6512:23aa:b0:595:81ba:fb4 with SMTP id 2adb3069b0e04-59b652e60f7mr848958e87.47.1767697494196; Tue, 06 Jan 2026 03:04:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1767697494; cv=none; d=google.com; s=arc-20240605; b=kZ24HyVHHTJM8K1KjlcciHBjZhoRpE+itQiOVmLNCw84siFjcB+LhKl0EG5Q5zYdQe vwWNhK4klURsLriS8SY3k4iPYjUWYljaajjgBtGH061KpK6cT1Ma9Ww5idQI/UbaCx1/ mXSpNwQakri+W7zLi0K616if4ygRg94/DsFE4dvfqphHblpElmQYUgNtub2mobtLp5rg bfNes2mOaTu7IE7+ucvMqui1fFW4H8NGszNpUwznY0SMJnFBgWEIxlKXLubljc9VRT+7 gT0pUNtRvPBZSZdDUKDTN3hFGD3usWSZbWEOqvD5ftu7h6DwV5oC18wxMBgKUSkzRd3m 0Yew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=hqvL9LAbjInEB6E9DZbcUhwcX/sRcM92G9FQ8oYJpsY=; fh=q34A+PDu/veyKhQmJ8Sf9YPiZusI+h3MND2WD1Gk9tg=; b=GDkIt1BtiPocyQKLsE5PtEiCH8oKtaO6xaFTUxuujHeAim+Zi4CbzepGyEOF3bdPjI 4XqLLgs7eSoJLgBYXzb0T92kx8OMaVY0DZn129Ku5ffAvr7xeXKwQ2oXOx5ePwWPDptH +LAm6MqE5Sxms/o6Wvt2VAZD2Ng3jPycbU9XakNUPXwwkuLS6Dbqe77nKoZXHHYAQr5M duErUAy6kYUGCRzIlmGaPtr+4Aeuv0crA4lAKhl/f8+QDzDIL5B9LgbcaPfoareRvdJ4 hUBn39CTdKuxGtUh4OTk+NUxaLwM3bGKh4s09G4BZk/HJviIcAislqn2PdYQOWQiiz7p 3cng==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=OTzGRC07; spf=pass (google.com: domain of fm-1324425-2026010611045280dcd4b8210002075f-cou1n5@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-1324425-2026010611045280dcd4b8210002075f-COu1n5@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-225.siemens.flowmailer.net (mta-65-225.siemens.flowmailer.net. [185.136.65.225]) by gmr-mx.google.com with ESMTPS id 2adb3069b0e04-59b6c0e891bsi11596e87.7.2026.01.06.03.04.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Jan 2026 03:04:54 -0800 (PST) Received-SPF: pass (google.com: domain of fm-1324425-2026010611045280dcd4b8210002075f-cou1n5@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) client-ip=185.136.65.225; Received: by mta-65-225.siemens.flowmailer.net with ESMTPSA id 2026010611045280dcd4b8210002075f for ; Tue, 06 Jan 2026 12:04:53 +0100 X-Patchwork-Original-From: "srinuvasan.a via isar-users" From: "srinuvasan.a" To: isar-users@googlegroups.com Cc: Srinuvasan A Subject: [PATCH] kas: update to kas-container 5.1 Date: Tue, 6 Jan 2026 16:34:57 +0530 Message-Id: <20260106110457.52805-1-srinuvasan.a@siemens.com> In-Reply-To: References: MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-1324425:519-21489:flowmailer X-Original-Sender: srinuvasan.a@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=OTzGRC07; spf=pass (google.com: domain of fm-1324425-2026010611045280dcd4b8210002075f-cou1n5@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-1324425-2026010611045280dcd4b8210002075f-COu1n5@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: srinuvasan.a@siemens.com Reply-To: srinuvasan.a@siemens.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-4.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_RP_CERTIFIED, RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= From: Srinuvasan A Additionally, set KAS_CONTAINER_IMAGE_DISTRO_DEFAULT to debian-bookworm, as bookworm images fail to build when using the trixie container. Ref: https://groups.google.com/g/isar-users/c/H1AuILdBBMI Signed-off-by: Srinuvasan A --- kas/kas-container | 42 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 38 insertions(+), 4 deletions(-) mode change 100755 => 100644 kas/kas-container diff --git a/kas/kas-container b/kas/kas-container old mode 100755 new mode 100644 index 476724c7..b46682e4 --- a/kas/kas-container +++ b/kas/kas-container @@ -27,8 +27,9 @@ set -e -KAS_CONTAINER_SCRIPT_VERSION="4.8.2" +KAS_CONTAINER_SCRIPT_VERSION="5.1" KAS_IMAGE_VERSION_DEFAULT="${KAS_CONTAINER_SCRIPT_VERSION}" +KAS_CONTAINER_IMAGE_DISTRO_DEFAULT="debian-bookworm" KAS_CONTAINER_IMAGE_PATH_DEFAULT="ghcr.io/siemens/kas" KAS_CONTAINER_IMAGE_NAME_DEFAULT="kas" KAS_CONTAINER_SELF_NAME="$(basename "$0")" @@ -64,7 +65,8 @@ usage() 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" "--isar\t\t\tUse kas-isar container to build Isar image. To force\n" + printf "%b" " \t\t\tthe use of run0 over sudo, set KAS_SUDO_CMD=run0.\n" printf "%b" "--with-loop-dev Pass a loop device to the " \ "container. Only required if\n" printf "%b" "\t\t\tloop-mounting is used by recipes.\n" @@ -117,6 +119,26 @@ trace() "$@" } +prepare_sudo_cmd() +{ + if [ -z "${KAS_SUDO_CMD}" ]; then + # Try to auto-detect a privileged executor + if command -v sudo >/dev/null; then + KAS_SUDO_CMD="sudo" + elif command -v run0 >/dev/null; then + KAS_SUDO_CMD="run0" + else + fatal_error "No privileged executor found, need sudo or run0." + fi + fi + + case "$KAS_SUDO_CMD" in + sudo) _KAS_SUDO_CMD="sudo --preserve-env";; + run0) _KAS_SUDO_CMD="run0 --background= --unit=kas-container@$$";; + *) fatal_error "Unsupported KAS_SUDO_CMD ('${KAS_SUDO_CMD}'), use sudo or run0.";; + esac +} + enable_isar_mode() { if [ -n "${ISAR_MODE}" ]; then @@ -128,15 +150,17 @@ enable_isar_mode() KAS_ISAR_ARGS="--privileged" if [ "${KAS_CONTAINER_ENGINE}" = "podman" ]; then + prepare_sudo_cmd # sudo is needed for a privileged podman container - KAS_CONTAINER_COMMAND="sudo --preserve-env ${KAS_CONTAINER_COMMAND}" + KAS_CONTAINER_COMMAND="${_KAS_SUDO_CMD} ${KAS_CONTAINER_COMMAND}" # preserved user PATH may lack sbin needed by privileged podman export PATH="${PATH}:/usr/sbin" elif [ "${KAS_DOCKER_ROOTLESS}" = "1" ]; then + prepare_sudo_cmd export DOCKER_HOST="${DOCKER_HOST:-unix:///var/run/docker.sock}" debug "kas-isar does not support rootless docker. Using system docker" # force use of well-known system docker socket - KAS_CONTAINER_COMMAND="sudo --preserve-env ${KAS_CONTAINER_COMMAND}" + KAS_CONTAINER_COMMAND="${_KAS_SUDO_CMD} ${KAS_CONTAINER_COMMAND}" KAS_DOCKER_ROOTLESS=0 fi } @@ -267,10 +291,14 @@ trap kas_container_cleanup EXIT INT TERM set_container_image_var() { KAS_IMAGE_VERSION="${KAS_IMAGE_VERSION:-${KAS_IMAGE_VERSION_DEFAULT}}" + KAS_CONTAINER_IMAGE_DISTRO="${KAS_CONTAINER_IMAGE_DISTRO:-${KAS_CONTAINER_IMAGE_DISTRO_DEFAULT}}" KAS_CONTAINER_IMAGE_NAME="${KAS_CONTAINER_IMAGE_NAME:-${KAS_CONTAINER_IMAGE_NAME_DEFAULT}}" KAS_CONTAINER_IMAGE_PATH="${KAS_CONTAINER_IMAGE_PATH:-${KAS_CONTAINER_IMAGE_PATH_DEFAULT}}" KAS_CONTAINER_IMAGE_DEFAULT="${KAS_CONTAINER_IMAGE_PATH}/${KAS_CONTAINER_IMAGE_NAME}:${KAS_IMAGE_VERSION}" KAS_CONTAINER_IMAGE="${KAS_CONTAINER_IMAGE:-${KAS_CONTAINER_IMAGE_DEFAULT}}" + if [ -n "${KAS_CONTAINER_IMAGE_DISTRO}" ]; then + KAS_CONTAINER_IMAGE="${KAS_CONTAINER_IMAGE}-${KAS_CONTAINER_IMAGE_DISTRO}" + fi } # SC2034: DIR appears unused (ignore, as they are used inside eval) @@ -283,6 +311,7 @@ setup_kas_dirs() KAS_REPO_REF_DIR="$(check_and_expand KAS_REPO_REF_DIR required)" DL_DIR="$(check_and_expand DL_DIR createrec)" SSTATE_DIR="$(check_and_expand SSTATE_DIR createrec)" + KAS_BUILDTOOLS_DIR="$(check_and_expand KAS_BUILDTOOLS_DIR createrec)" } setup_kas_dirs @@ -339,6 +368,10 @@ while [ $# -gt 0 ]; do if [ "$(id -u)" -eq 0 ]; then fatal_error "loop device not available!" fi + prepare_sudo_cmd + if ! [ "$KAS_SUDO_CMD" = "sudo" ]; then + fatal_error '--with-loop-dev requires sudo for device setup.' + fi sudo_command="/sbin/losetup -f" sudo_message="[sudo] enter password to setup loop" sudo_message="$sudo_message devices by calling" @@ -593,6 +626,7 @@ forward_dir KAS_BUILD_DIR "/build" "rw" forward_dir DL_DIR "/downloads" "rw" forward_dir KAS_REPO_REF_DIR "/repo-ref" "rw" forward_dir SSTATE_DIR "/sstate" "rw" +forward_dir KAS_BUILDTOOLS_DIR "/buildtools" "rw" if git_com_dir=$(git -C "${KAS_REPO_DIR}" rev-parse --git-common-dir 2>/dev/null) \ && [ "$git_com_dir" != "$(git -C "${KAS_REPO_DIR}" rev-parse --git-dir)" ]; then