From patchwork Mon May 19 11:57:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "cedric.hombourger@siemens.com" X-Patchwork-Id: 4215 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Mon, 19 May 2025 13:58:25 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-ed1-f62.google.com (mail-ed1-f62.google.com [209.85.208.62]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 54JBwOBM018169 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 19 May 2025 13:58:24 +0200 Received: by mail-ed1-f62.google.com with SMTP id 4fb4d7f45d1cf-60179d8e964sf2658705a12.2 for ; Mon, 19 May 2025 04:58:24 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1747655898; cv=pass; d=google.com; s=arc-20240605; b=GZzuGLUaF/hPqAWs8wtTbd9ugx/h6sSJ+s+7Wz4OrH0sBeizzmGlEw1z70Uol3bd5Q puQ0CHJpbzowulFTRK3Bdg20zmc5i7BojjLXOye2vZ3BAKF6gbIW2hTa+YA9osFpROOV fuwcU1yOXyQ5zUNnLyLoc5E1XPMUTgkN8noe1y2K3Qy6h45lWjS3NUDy62jz8hqWjetk yhEcK3jsayvY7P9x1KjUXoP0DpX9p8h4zcpQwuxtbxjV7Zxu42TFe0Bn32SN/7yVYDHo HnGmX44xhVJZ33FEwPEKllkw9bi8dCltVxZ1qjnlhqaXMtSz8Ry16HWYxZDd2bwFbN80 vEgA== 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=56z04knEaYklCtrwAWoSiyxcmXEAeVwqq8s3nqkuzW0=; fh=q+5MjwgNuINQTF3WFcgCYlk0oe5FPrwNF0aGLdBpIWY=; b=jq1Vifb7d0rD2+2hVrdbd6+KrLrun1sd0mfb1xxL9DbaNaJcqh0egFuLJvdPMCy8vO P/v8oEdn3wOEV4CfWDuSDZEV8xrC8nvthNuR4HYsht9ft6gktMwdIPu6FDIW4gaA2Fgi SMWQTFhxQA3SGJcNkBsQZ5AFjsvqMgbUqDOaIK2DQ5wt5qSgsN2gk4pig8AUbxC+g8Vh cZjFTKjxi7VQIcyUC4n6WYC8SyxI745cVKv4h0HUuGOXYvRom0nOaWQ9DIE+H+Jrzt2B PKb/lVxMIs5C3u0sJenJ1CFthw7KC+jAsTRO3Vb49hb06rrK/8LK8da3VAWn1jN0jgMD NmJQ==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=VO0yqnxN; spf=pass (google.com: domain of fm-1212295-20250519115814c245885f99e000305a-ezu_1i@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-1212295-20250519115814c245885f99e000305a-ezU_1i@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=1747655898; x=1748260698; 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=56z04knEaYklCtrwAWoSiyxcmXEAeVwqq8s3nqkuzW0=; b=cZoEB5C+v/QnP+G4A2lMKl6b57L65LnVhptFz6btTWeopyYSAxc8CMnGnymlPyOp3n 0ACeTZGEM6Qgayy7oXdXMrQvPOBVq/c5xAJk3QKSrvda5Jm/n/kQDYajz/Z8HKblYNtE mou6UUN5HU7AsYWKFxXqp3s7DEOiINsOsauT+/M3DPgCteuhIeGcQ78H7Hr7qU8nm3pz BmugPR+yVPN7+fDC1bF2jXb0N8bJKRh2qmsXg/U8N/KPOAj8IX7SmrVUyKmlQWQ7ts3r U9wVT4uuW8JbnJuuEY3Qf3MxRqSA4wMTTPji3xONZ1m3O2cnhC4DSibad/h9QSokZQeM uNWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747655898; x=1748260698; 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=56z04knEaYklCtrwAWoSiyxcmXEAeVwqq8s3nqkuzW0=; b=HEI4Fg0ifqC/pvOac8GMMi6aKFafoPZwSLH4Y37E3vRhZL6iBr18J9JPMGSYUyV9mH hjJ4llLtVVUk+JH5itLWXQ2vKD45zDBqrOx7VDq8q22HCATsbRutXf8t6Vu0xvW3z2tc qpCIY6FAy9O49lZTPGC9Dm2jd7H71wLinlsLJWJsVo4KNZGgS5/EUWBjO/ZvKDu1Nl7s XRqG3AH1jjy8p4nz2/H+laMfq++lx8Y6cjU8UVXD9hwfI59v9Bu2EvSGJbO0IGmm8KdO swuPbyUcTNE4oVTmIEjIiIPTYMML+UIqrS1rHmoC909lgtFVPnX2rD3nkZcYinef9lmy W9Pg== X-Forwarded-Encrypted: i=2; AJvYcCVDJ9Pve9syxaR6TBWkedbp4ix2pD8KpB1aAeVzuocomGpGdZw1xtCGHnMSFzkYvNJHbI4IASQ=@isar-build.org X-Gm-Message-State: AOJu0YyqvNao6zGClttwWO82LFvv5p6rIGxvEQzLi/tMGtES/9M2qWou Q77EfUB4VKYBgUubmUORgfg9ldJjlLP+pxY+EDwTq2RImLUBIhiEVsba X-Google-Smtp-Source: AGHT+IF8SUFDY2eifwgZVWo74NK+gC73xgchqW26g4z3Ie8s/LEwuizo1fhLhv0O+BP4sLIGv45tLQ== X-Received: by 2002:a05:6402:5cd:b0:5f6:4a5b:9305 with SMTP id 4fb4d7f45d1cf-60119cd4192mr10287968a12.33.1747655897769; Mon, 19 May 2025 04:58:17 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h=AVT/gBF9M0vgiWpbywM8qm27QkP4zr7hUZhWLr+Pc+nB2fxcSA== Received: by 2002:a05:6402:2341:b0:5f4:8519:a63d with SMTP id 4fb4d7f45d1cf-5ffc94698fals447015a12.2.-pod-prod-06-eu; Mon, 19 May 2025 04:58:15 -0700 (PDT) X-Received: by 2002:a05:6402:3508:b0:5fb:868b:5a59 with SMTP id 4fb4d7f45d1cf-60119cd0c1bmr10899430a12.32.1747655894936; Mon, 19 May 2025 04:58:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747655894; cv=none; d=google.com; s=arc-20240605; b=L4em2nJ34qprIUHX14bo8EhPbFplA2wW80UNT8R4+uGgp0fQFQYq9h1egOv3SqxeKq yHVH4sVKqMYS4h19APjXTICpmVYLNxQhjbcpSVB89g61AlIYusMb2YpD2ki6bco5IgxU JfII7heIG62dJqg+dYWwHRq/YYyfEhLpWZnkJ3D0uWdNefm0vA/t4UMI23gjGnfsRNhJ LonAM/o+Fe2qqDTMk8aQQC9IA/9yEVTckYXMGvzr0d9nZiMNHL0dZ3CbnCpVVi47i3Oz Hg45/wJQ8G1d9nHjjF51/+LLQQEFL9L4voXmbkSdswjG0xtd7kvyjOzGg5Kz0c4YLHfn yygQ== 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=h5XafRIL0qhBxbT67uj4J6vqhD1+ak+TiEq2TpMig6GAUOWC1rSNZRSyEDrixIWMza LWfUmWf0AU6me2lYcnIIRSc69fqb2opdsY531lNl6afS2mvyJ1FvyXaFRFsdUEiCahFS jHaWAKh+2TtcbfaGiNTCoSUgOZHLfnS64Zz17Zf3N81EGGSg3M+PvRwM+k2rCs1uyBDu oiTrwFyI6JA9gs3N8UtcIo3O6xRxA+x/renMfDCVvZzwsgQKYVEze/UMKXzK0dFfontc f2l4yDOgW0UgyAEthbffQcjrlcRv3hUhMT+1o3CsGP6hy1VKRPsqqE016ccmAZ3XhTEr 1wqg==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=VO0yqnxN; spf=pass (google.com: domain of fm-1212295-20250519115814c245885f99e000305a-ezu_1i@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-1212295-20250519115814c245885f99e000305a-ezU_1i@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-228.siemens.flowmailer.net (mta-64-228.siemens.flowmailer.net. [185.136.64.228]) by gmr-mx.google.com with ESMTPS id 4fb4d7f45d1cf-6005ae4a03esi108842a12.3.2025.05.19.04.58.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 May 2025 04:58:14 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1212295-20250519115814c245885f99e000305a-ezu_1i@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) client-ip=185.136.64.228; Received: by mta-64-228.siemens.flowmailer.net with ESMTPSA id 20250519115814c245885f99e000305a for ; Mon, 19 May 2025 13:58:14 +0200 X-Patchwork-Original-From: "'Cedric Hombourger' via isar-users" From: "cedric.hombourger@siemens.com" To: isar-users@googlegroups.com Cc: felix.moessbauer@siemens.com, Cedric Hombourger Subject: [PATCH 3/4] image-postproc-extension: refactor systemd version checks Date: Mon, 19 May 2025 13:57:49 +0200 Message-Id: <20250519115750.3195300-4-cedric.hombourger@siemens.com> In-Reply-To: <20250519115750.3195300-1-cedric.hombourger@siemens.com> References: <20250515150727.1764989-2-cedric.hombourger@siemens.com> <20250519115750.3195300-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=fm1 header.b=VO0yqnxN; spf=pass (google.com: domain of fm-1212295-20250519115814c245885f99e000305a-ezu_1i@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-1212295-20250519115814c245885f99e000305a-ezU_1i@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 \