From patchwork Wed Jun 18 13:50:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cedric Hombourger X-Patchwork-Id: 4233 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 18 Jun 2025 15:51:14 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-qv1-f55.google.com (mail-qv1-f55.google.com [209.85.219.55]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 55IDpD8m003081 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 18 Jun 2025 15:51:14 +0200 Received: by mail-qv1-f55.google.com with SMTP id 6a1803df08f44-6fb5720eb48sf13475386d6.0 for ; Wed, 18 Jun 2025 06:51:14 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1750254667; cv=pass; d=google.com; s=arc-20240605; b=Cw9rZSRD+lvyNfw7WO2jtYLiIPyZdLjq1AGPqtqpeMw+TZQaBlJ6oh31Y923XvYEV/ +m0vp5ZIaDkEnam1H6ltQf/P7pseSuzMkui66Cjj/a4D667FcYrIQTJ+4w1c4+GPxrdb rP2N4sZEhTLup2ivuhTPYFEZovfe8JgeZdsqEtOtp70a5Q2L+w4+pxuRVQlpyu62ZNqv 4cXfKF9EFr3KcTJStm3etT59YWmCeCxN5bYQA5XiZmrEmGJsGSJme1/f6VhEwFoHv0FJ fULCBlgZbDobJVhq2POB4Qsp/87W59pHaXZ+V0oXpo3wlVkDugSsiWtgyENjjrbPomqU NGyA== 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=7axKl/9ACYcCN+OgWx7KW+wbI2ClDpl2+2RUCFhvQuU=; fh=VhBeiqJ8gWJS4Kpy0OClLp7x2YUvAVOfcA0uudaM3AU=; b=dsC9x0SexNERhrA578G7quc5mOUJ2zc0qgyERQE51fDXxVHRU1K3assEUv2BzEBisS np11XGIDjmJefXcNcWuI169lp1aPX+c3hu5/y1mQqLogjs7Wg7ncPGTTZJyX12Sirabm TusJzF4YS4l0DfN6JlRNL9Ul4a5I08MsOtWSRpGShVY4GhOTsyl2lP9pPKPKbIhYpkfc scm8UfK+BMd+GX8Rx7fSizHQCaF2k57TVTRgMJh50uTi8L78DS4BCGYZHeN5jDWU4Djv sO/T+XModM4Hcc2uXlUVaBSTyHIjTSIcJUWGtKZPhBbL3Tit0RV4hVwMLb/y40TOM1WV sFuA==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b="GnY+vMh/"; spf=pass (google.com: domain of fm-1212295-20250618135101f806e905b8e07d0abf-j17tk9@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-1212295-20250618135101f806e905b8e07d0abf-j17tk9@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=1750254667; x=1750859467; 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=7axKl/9ACYcCN+OgWx7KW+wbI2ClDpl2+2RUCFhvQuU=; b=lM6ZCvuMb6k1xN+qilh5+VcQ1Rp5c7nNB4rPqbAXCcJ4S8EWZMcT/fgVmuWdmoDuwx N49YDcapFaV35zNlGshSrTZUouSQj6taPsJK8psH5XHuXWj/F6kodDR/o4vSuN47rrmL v3EQM5r0eKCEVjPJ9USkn0/SON2r0SCXo5+ZsNXQR7mcG1SAwtjh+Rf2pBMluMtNju/A 3kvLjxVYfkBT7cQivf3HUQZ4d8jK7KWIB4et6D7oG1n5/jbL8uatWapMN6K1OSj3xo/L zo7xDgPTcP6uc28FvzuIqaWMzf1KQms0jqUD6xDTCf7r05SAVrC7504SRl7W6mvyqiBF wUvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750254667; x=1750859467; 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=7axKl/9ACYcCN+OgWx7KW+wbI2ClDpl2+2RUCFhvQuU=; b=Bt6zZAsexQPUIa+9qHJkq8vWJSKns5oMLqH4FdP4S0JegAIVG/IoWqxvYkT94ScjPv 8knnde9r4vYqIn0pw6xgpc7nIW48Lg6da6ymDbp8uXKHDgrrJdRXlwr/7eDRhEr/BqOB rYsUo5CTmSK4ar4PQfKsDfRfkC6WFV6F48PWI6/CJgFweByfUqMzli9ELUsKfR4FM4gP +YT6isom5yI8UG6qQmVu/22TZ5KNatbz8JOYJjiw6cqVFkhJBaLD2kQ6HzQ/MRl74eND zF+MJP8749MNbLkBQVHjC7XhN6J1bzyLVeMI4FAE+PVyFDXz2pOufdilrwa22UQkEBP6 gXcg== X-Forwarded-Encrypted: i=2; AJvYcCU1jyxFEAHWtwH0aYpxE00Ze2rhYUvoqPfqqWYePnBOQhhUEMyM0kT/sQAkMWhZx2YnpHSPb/A=@isar-build.org X-Gm-Message-State: AOJu0Yw/M3pVLqXGTx1FXLFwBNKW2ar0xxKa/Jn+tzOVK5eG19DOYSAR 9JfjH2o7ivuEpStngv3tfictU+DhB4+Qf/rGiMh9eqDdbTyrRnzqcOH3 X-Google-Smtp-Source: AGHT+IFRcFctwYRUnYftDA8FBHSRbkXaUlTSbtoiZ+uWheiqM+6BC/ANjP4/llqHKKv4Visfy5N5ZQ== X-Received: by 2002:a05:6214:19ce:b0:6e2:3761:71b0 with SMTP id 6a1803df08f44-6fb68ae223bmr41795696d6.5.1750254666707; Wed, 18 Jun 2025 06:51:06 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h=AZMbMZcqKI4erSM+kSetfS2GvpvD8npLaG0Ji/DbI6IWCiKmXA== Received: by 2002:a05:6214:29ef:b0:6fa:bd03:fbf2 with SMTP id 6a1803df08f44-6fb3544e2c3ls96888376d6.0.-pod-prod-00-us; Wed, 18 Jun 2025 06:51:05 -0700 (PDT) X-Received: by 2002:a67:fa5a:0:b0:4e1:5132:67c9 with SMTP id ada2fe7eead31-4e9972a32demr1154358137.0.1750254664687; Wed, 18 Jun 2025 06:51:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1750254664; cv=none; d=google.com; s=arc-20240605; b=KU7qzhxcO2zCnX/cktPjQc1qlLgNKIrlwspFAFLS0E2YR3BbQ8uF6pxqt99e3d/e60 9veY54HOgVFXDp4CtpbJP1lPOSjlhIKZaqs3GPswFII6DWB5FeyCUuOB+qC46kHBFATp 5SGCvzbDAh97KuS8/SosWO5xWmDP/QHXOpIi3g1eNpnCFkb1PWU0CztTwXrCIbJM9Nvv ExIQDNcYHPLoc1rBx3jl5VFJSeLB/NYhuxsKSLtAxhmIbwiUGRry9MmRGMz1lSrLbqSF 3b+5wwqUNqRA17md6nMeGFzsykiHRWwFcUwX+dPbS2g5h+mAMwNCXL6MQpP13/cA5t0r RqLA== 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=4hNIqM2vyvntWek21pO5SDHeWjBNW2wkEN4si36cJLw=; fh=D/q4xMKxZDyLo2GtmwQ/2prSr9aCFD3HVqTCj43epLY=; b=SjKq7DmCHCozaFdZ3f44+RX0GTdzwZxa/FopC4yJ0RTk2Ekg2W0oP0IEattBZLdlrW xveJEuB+t61WZFYuJ6zpECu80N9WrjZi5J5x0D8tIi79xdUgORIK7iPPh4xY3O9p1WH4 JCYyGUqCH2iYW+ECUAI2uKjfFvTH85j7id70Gfr/nAIlklnpTN5ds7/eMxfFkxB3JNc5 TBNzB4+ThZzJN0y+3RJtAayY6dlyqvY+qTgRQqGAduQc2nnJtH13dgG/ZHdeIFXq4/Pl Fo94pB/fcFs/v79yESwzzZug2SPsQ91H8HMGYhx6YsfDPZme/WVj6iSpXersvIfG6Mao Up5w==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b="GnY+vMh/"; spf=pass (google.com: domain of fm-1212295-20250618135101f806e905b8e07d0abf-j17tk9@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-1212295-20250618135101f806e905b8e07d0abf-j17tk9@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-225.siemens.flowmailer.net (mta-64-225.siemens.flowmailer.net. [185.136.64.225]) by gmr-mx.google.com with ESMTPS id ada2fe7eead31-4e7e666cfcasi544424137.0.2025.06.18.06.51.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Jun 2025 06:51:04 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1212295-20250618135101f806e905b8e07d0abf-j17tk9@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) client-ip=185.136.64.225; Received: by mta-64-225.siemens.flowmailer.net with ESMTPSA id 20250618135101f806e905b8e07d0abf for ; Wed, 18 Jun 2025 15:51:01 +0200 X-Patchwork-Original-From: "'Cedric Hombourger' via isar-users" From: Cedric Hombourger To: isar-users@googlegroups.com Cc: felix.moessbauer@siemens.com, Cedric Hombourger Subject: [PATCH v2 3/4] image-postproc-extension: refactor systemd version checks Date: Wed, 18 Jun 2025 15:50:39 +0200 Message-Id: <20250618135040.8252-4-cedric.hombourger@siemens.com> In-Reply-To: <20250618135040.8252-1-cedric.hombourger@siemens.com> References: <20250519115750.3195300-1-cedric.hombourger@siemens.com> <20250618135040.8252-1-cedric.hombourger@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-1212295:519-21489:flowmailer X-Original-Sender: cedric.hombourger@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b="GnY+vMh/"; spf=pass (google.com: domain of fm-1212295-20250618135101f806e905b8e07d0abf-j17tk9@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-1212295-20250618135101f806e905b8e07d0abf-j17tk9@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Cedric Hombourger Reply-To: Cedric Hombourger 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?= Signed-off-by: Cedric Hombourger --- meta/classes/image-postproc-extension.bbclass | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/meta/classes/image-postproc-extension.bbclass b/meta/classes/image-postproc-extension.bbclass index 991bac4c..0af588d8 100644 --- a/meta/classes/image-postproc-extension.bbclass +++ b/meta/classes/image-postproc-extension.bbclass @@ -53,12 +53,17 @@ image_postprocess_mark() { --build-id "${BUILD_ID}" --variant "${DESCRIPTION}" --version "${PV}" } +# Use dpkg to find out which version of systemd is installed into the image or reports "0" +image_systemd_version() { + sudo chroot ${IMAGE_ROOTFS} dpkg-query --showformat='${source:Upstream-Version}' --show systemd || echo "0" +} + ROOTFS_POSTPROCESS_COMMAND =+ "image_postprocess_machine_id" image_postprocess_machine_id() { # systemd(1) takes care of recreating the machine-id on first boot # for systemd < v247, set to empty string, else set to uninitialized # (required if initramfs with ro root is used) - SYSTEMD_VERSION=$( sudo chroot ${IMAGE_ROOTFS} dpkg-query --showformat='${source:Upstream-Version}' --show systemd || echo "0" ) + SYSTEMD_VERSION=$( image_systemd_version ) MACHINE_ID="uninitialized" if dpkg --compare-versions "$SYSTEMD_VERSION" "lt" "247"; then MACHINE_ID="" @@ -82,10 +87,7 @@ image_postprocess_sshd_key_regen() { ROOTFS_POSTPROCESS_COMMAND =+ "image_posprocess_disable_systemd_firstboot" image_posprocess_disable_systemd_firstboot() { - SYSTEMD_VERSION=$(sudo chroot '${ROOTFSDIR}' dpkg-query \ - --showformat='${source:Upstream-Version}' \ - --show systemd || echo "0" ) - + SYSTEMD_VERSION=$( image_systemd_version ) if dpkg --compare-versions "$SYSTEMD_VERSION" "ge" "251"; then sudo chroot '${ROOTFSDIR}' systemctl mask systemd-firstboot if ! cmd_output=$(sudo chroot '${ROOTFSDIR}' systemd-firstboot \