From patchwork Wed Jun 25 19:37:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cedric Hombourger X-Patchwork-Id: 4238 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 25 Jun 2025 21:39:31 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-oo1-f58.google.com (mail-oo1-f58.google.com [209.85.161.58]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 55PJdE8a007206 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 25 Jun 2025 21:39:14 +0200 Received: by mail-oo1-f58.google.com with SMTP id 006d021491bc7-60bb414cc3esf331244eaf.0 for ; Wed, 25 Jun 2025 12:39:14 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1750880348; cv=pass; d=google.com; s=arc-20240605; b=j5LMYVdfD1xzvPBQ5iRB5CMyZXMHajn+zyVI+P1dv3sTRDeQNQs6l9yY73OTcjO/G3 vCj2f+kMDPwHdDWkDcJgagiXX4zQ4RvQgq/EjHeui3vvvgYAtjbTeMoiixGvQqRT7Ubs pjfDpx6aiLYKe9YjZ0FRcmOfP+iUSPPkDt9Uzk1mqDs51foOjAOMgKrF4j5yoxyPaTUx 21BglKTCjCosa8kdAaDp3K/ymwyzgxZnmYzLKMnWTXW4mEfmxhw+zTdIvPoXH8VzkdCM 2IVIAhJEkQt5U1Ga8vIGnOTFrjRR4fSlRMx+rea44MX2cuwP2iIrvQiO/d1gm+Gd0skC fDbA== 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=OQkCnDwLjf5ZZzuZ7a8JvVFMUb8J5lmFFzOak4l3A2g=; fh=HBfRUgorAYQJ5Cb9ya9m54XRzMqLdFtq3rJ97TjoJys=; b=W+TdGmpNb0iZmosIwwJ2wmEyGdItQKjlo8AaO+WHaz/ltaJUN6u2KAhr3mBsP/zTma /UnS/9gXzvkWHuSsIIT74DezLG55mRDP2DRxQjzQ+5uQ2iuT7T6okE+2e9v6j3MuHmOl 1eefk7b7ZhxHR5tBtu+AJMyKd7k9160Fb22xA9u6VNUw+PvlWh1uxvhsSuRbrh2Bayor s4fhf/K752r87gwclXlnjY0QFzCSxAogueUcTBR3i9CNOxaajuUT/x2WnCBZnTWnBKn+ Is88DIsi4YlLfxZldNwh1AawtRcjxGzL8qruoVUlEQrpN2sePntm2ilzGqZKj2IjRjXw RjzA==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=hSSJvo8d; spf=pass (google.com: domain of fm-1212295-20250625193906f6dac9ad1c9eea624c-6wn4of@rts-flowmailer.siemens.com designates 185.136.65.228 as permitted sender) smtp.mailfrom=fm-1212295-20250625193906f6dac9ad1c9eea624c-6wN4of@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=1750880348; x=1751485148; 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=OQkCnDwLjf5ZZzuZ7a8JvVFMUb8J5lmFFzOak4l3A2g=; b=mmecZqo7Pcsh7/7ZCdmMSwPMz916YMeW27vIcvW3g6EtLx5s3GobcRoR17Vbo8EmUP I9RULJwILJ4d4hew7XVO+L/hFlPJ7HxalPoaxDUjTWy8OxeqSlWGNqRsVFhh2A3Vi0ul LpAbaC5w9M1IJhgamwW5XDkVasFWINMUFKIg1Ocr5fc23cENrZ0BoV/nJNHUW9JwV43a pmF1UHCHfGEEmmj9j/WTLi4ocDW+e6DOIwiFhh7VCeKpR2wl5C/Q6ZTMFCOMQnoLfkS1 BupuN9TlI7YGGYgO/JHAMrBEATDiUj1nwNAGMwT7FOjNHGwpcVUgeKVf6TO4xRGu1x5w 56Mw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750880348; x=1751485148; 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=OQkCnDwLjf5ZZzuZ7a8JvVFMUb8J5lmFFzOak4l3A2g=; b=f4GUuvzMpB9mkFY8sr0BjoYaNmMxueE6+4FZ1CidSSe8c9Gvtsg133hsukKuhMWpTu CIcTH49AoEmCUUo++G3h9SdlDz+GBqWhOL1pRXIj3G+R9FbB6ZMszt8s/1BfLjioTqSW gCR9EbV2uWnT3ZMFxbB7TN1edtj2ZImkR+0R8jlSq3azYmkAYcBw+iBly8ijB4JQdL4o pPWy9SzVVQN/QHdnM4KEei/ZSUOtS2fH7aAigAVOIPYdy+7Jwma0SdAcoRragGVvvcUn 67sKdj273zQQiwPKkDbju/tI9nuNPQt9K4hmVe2eLDp+r3L/+pl0WWNiI/LGCF89yXai cixQ== X-Forwarded-Encrypted: i=2; AJvYcCWyFT2uKX90vvTpXRVi3Wi2XTBz+pwJ1g0/FTCvEkWsd7ZAjD862vWA4mvuthr0jR/lSUPmIw8=@isar-build.org X-Gm-Message-State: AOJu0YwGPZ2yk7OG1vjgeCOosJhc/pZzLKmdzHy20vUO19dE5dhmMgbQ 74ZqbVYL7rfMpe2PZ2eCCtcNmp+genC5alZO3U+COO/cz+AtQP+acCRT X-Google-Smtp-Source: AGHT+IEod0RskOzucsd8Oaa8uhbn+rBYZ5iiMtskDrlcP+gTf7R1XZPDuUFlv6VFjaE9nLNpmC89XA== X-Received: by 2002:a05:6870:1e84:b0:2c2:174b:c829 with SMTP id 586e51a60fabf-2efb21b59d6mr2841248fac.15.1750880348572; Wed, 25 Jun 2025 12:39:08 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h=AZMbMZeadpuhT6MRMIA1R8xkScxT1xImL9zFJiDpkiRCXlmYLQ== Received: by 2002:a05:6871:d08e:b0:2c1:8546:7864 with SMTP id 586e51a60fabf-2efcf20e861ls121504fac.2.-pod-prod-07-us; Wed, 25 Jun 2025 12:39:06 -0700 (PDT) X-Received: by 2002:a05:6808:13d1:b0:40a:ab2f:618 with SMTP id 5614622812f47-40b05c69dbemr2992408b6e.38.1750880346769; Wed, 25 Jun 2025 12:39:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1750880346; cv=none; d=google.com; s=arc-20240605; b=CaVDkv2w1YBYCTMLaIPHbY8qXYJCG8nHWAaYVwpVyRhm6z6h2T+BliW4pNk7kskRd2 9FTnFx8bMgvQbUIUZm0Q4eTOB/nZfAhabGhBCKZprSaCyNdTpmRnFykNaxCbuU+HUHR9 NdlkHmnKoDAjGygVDb7ADeAAVwEGceI1iOrFQzDika3iyFouZ+KiLe1NPFV0Zj3F9i9g QWyzb6+UtT3srfPrrouzc7+2oGq6dR4szZzTOXP+/eMikZj98g5taavNyGIQlB/ScdRj BzxC5y3L5Jem709elIcKkfIjFhLlCpqgC3dzba41W12bTWoIxJgVONmFa4BtfKoEWSed VY6g== 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=axgdpHs6jUbeapCbs0LEBlNSB0ZDuWgcWMdAviQr8VAbb63/gF8uAPtIf8fK0gBE8w K6Bykao3bg0PCs3w1Ujar6OL1k1CaOrZFtNAHMHKzn0hMujaEPd42OUMVXfCc6wztTxL HxnmpUgDaVUB2dwTMfGL4ysyc6K5m9tDVQsjDHrx9nfmtSEu85eI4YG9YOk73sB9tlXp /kYkWIvltCS0InsGzKp2wkMQi7zynndvdzw/9Z/sZzXkiW8Y6mUsK828DhY3oiHX4rO/ 2hXR+ytLGuB5vfgl/mMV6GjCve3g8efleNKu6TT4Kes4OgQIiwskt1zo1b6/DklChaH+ 1Wfw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=hSSJvo8d; spf=pass (google.com: domain of fm-1212295-20250625193906f6dac9ad1c9eea624c-6wn4of@rts-flowmailer.siemens.com designates 185.136.65.228 as permitted sender) smtp.mailfrom=fm-1212295-20250625193906f6dac9ad1c9eea624c-6wN4of@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-228.siemens.flowmailer.net (mta-65-228.siemens.flowmailer.net. [185.136.65.228]) by gmr-mx.google.com with ESMTPS id 5614622812f47-40ac6d458c8si636949b6e.5.2025.06.25.12.39.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Jun 2025 12:39:06 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1212295-20250625193906f6dac9ad1c9eea624c-6wn4of@rts-flowmailer.siemens.com designates 185.136.65.228 as permitted sender) client-ip=185.136.65.228; Received: by mta-65-228.siemens.flowmailer.net with ESMTPSA id 20250625193906f6dac9ad1c9eea624c for ; Wed, 25 Jun 2025 21:39:06 +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 v3 3/6] image-postproc-extension: refactor systemd version checks Date: Thu, 26 Jun 2025 03:37:45 +0800 Message-Id: <20250625193748.2681-4-cedric.hombourger@siemens.com> In-Reply-To: <20250625193748.2681-1-cedric.hombourger@siemens.com> References: <20250625193748.2681-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=hSSJvo8d; spf=pass (google.com: domain of fm-1212295-20250625193906f6dac9ad1c9eea624c-6wn4of@rts-flowmailer.siemens.com designates 185.136.65.228 as permitted sender) smtp.mailfrom=fm-1212295-20250625193906f6dac9ad1c9eea624c-6wN4of@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=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,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 \