From patchwork Thu Dec 4 08:43:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quirin Gylstorff X-Patchwork-Id: 4702 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 04 Dec 2025 09:44:14 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f61.google.com (mail-wm1-f61.google.com [209.85.128.61]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 5B48iE1O030461 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 4 Dec 2025 09:44:14 +0100 Received: by mail-wm1-f61.google.com with SMTP id 5b1f17b1804b1-4779981523fsf4658165e9.2 for ; Thu, 04 Dec 2025 00:44:14 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1764837844; cv=pass; d=google.com; s=arc-20240605; b=IaTswRV7V9nxUNdqYIKSkz+pmm3YGQSXM6S416fq7zrrizsTeE63CSFmoVuFr4vDTW TswBznJp4Fmb6hIvLdaK5wRB+2fZwzaMRdY1ovvciYqK5XDVTyWRoNq8WhC0VwNLkybW vjPPSoU5wJcYn9AAGkLzqfwdwxVP4tsvKh48UXaXollvoB1VjrO2aoQDrAu6c4hlOZ8t lU7Q5vTAtKvLgkADfk+QfPuwCNpZx3FnmUCbzh7mKhxa9b1tjLBLIdoud4jd8AygFXfn nvbD7ovVLVRfNlgA5BiIXeK1xOE/mSKL51WfJQy4XG5z9G9AVjvqtZdb9IlJnukfGz+Q ZHyg== 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 :message-id:date:subject:to:from:dkim-signature; bh=gA164Nz8JTmwuYx1ccLhwFTYuuWFzkCK2nYEqPrhgQo=; fh=qXunO+MOx+AK4bDZEFgnDfV9TE7ovgX2qD+uNkmMKow=; b=MsARfGqRsqR19MtQkaaf21WFw8oDI2y+0E+wwDJK9SVxvpyz0Kid9f/pmImvhnPlB7 XYdf+uyQors4rqBFle5y/02Gkb9fGhfNdWjA4aW5mtHevSgH6Xs+UKo2m5eW5+qXj0Lq itanj90Rrfboaot/69NT9Athwn1XsRFOBdCglXSs05BbwwkPmHx3MFTDjpWMbX5IKbsa cw3WdGLonvQoxQeW73ECFRi9o5bbgMneHv9vnxebvonrt58VEwSd6gfes/yvtxrbsDYU AkBYXavkHEAR6c/vt89wTXmDDb1XCnTA+3+NPlQ+Msv2juf8BG0wLtuM/1cSy8LKDjA4 u3Ng==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b="M6/tNh5T"; spf=pass (google.com: domain of fm-51332-20251204084400d8f3ba711f000207af-kt8ysy@rts-flowmailer.siemens.com designates 185.136.65.228 as permitted sender) smtp.mailfrom=fm-51332-20251204084400d8f3ba711f000207af-kT8ysy@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=1764837844; x=1765442644; 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:message-id:date:subject:to:from:from:to:cc:subject :date:message-id:reply-to; bh=gA164Nz8JTmwuYx1ccLhwFTYuuWFzkCK2nYEqPrhgQo=; b=Vs2iHyos1xCtClUJ+pw6xnPa5W8vdEL9MhPDEkdvbudGMqJy+8in57LSxOUitIjJnY YWgmLQwYeClcVv74QdqJnQ4SHODCh3MPh7mpM9mYxc8yqRnaHrk/cOa8N2Qhjvpjn4WW T0uBtozGHi6y5vKODAtQke5824cE+M6Tqxlev0XVovyY1JG9E3VVPa7xImO0L11Rfasy P1BHqIYFvYWXzAmFoA6pATqe7AU2/wAGWD5u3Y+scvNYMV0Zjasc+vMZqwQThrFR/TO8 bD0C2c9MRoMDoP2V/99KrtC0Plo4lzbcFfpQ7I+qVKF/MgmRHc2mAP4fmiTMeR+paRdi ry2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764837844; x=1765442644; 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:message-id:date:subject:to:from:x-beenthere :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=gA164Nz8JTmwuYx1ccLhwFTYuuWFzkCK2nYEqPrhgQo=; b=NLHsnqWzXdf0lO57TbOnKgbJek47pmXU2JVa1nngez3ZF021VUDXTXGf6eSkYa1zNV XMpAAmt+xB3/XJRyB1pwMclaEHUQ+AK6dAnRkX4Fj0QSlNk3dj/lYOHVNtpbjlvZaQxL j0WxiGup7eOLc2Eh+FAjBiW1BNL5uEAeJVp3r9m+TslwDMRpFvvLFEQpUK6kaIMRJEFK CRHKkAXn9DbHYOqGAT+83Yyvj09/MV33h/OD7KyHZDL4s2RwAky0tnlb4kfM9KpOAhHt q0TxAQSyKygxWIt/QScOGzSNyB8s0w/QXpKBaZg2Tlv7o6tD4/eCmSmDN751LiY0GI7v ocRw== X-Forwarded-Encrypted: i=2; AJvYcCUyRBx1npOewPP+rvKRA0b4NJ4bGb8fm/CGFo4UNP4yfQFiaSEldDnGh0jxjQwHtfWrlm3+P+0=@isar-build.org X-Gm-Message-State: AOJu0YxkvpLdd1GNa1XEF9799he3ncgTKWDzIbjexa6LtmHEO56awKpX 3GEnJe7HazTTQDsrcNf51ggGtarswaYSUhmhBl+lOGJsj3/nz7PsPXF4 X-Google-Smtp-Source: AGHT+IFdPJlN/K+QRy9xX82Ofq5PwfOZPwoxTASH8HseH8XLFE/cCGEfTxpsee/nj5XNleqZiO3JUA== X-Received: by 2002:a05:600c:3556:b0:477:c37:2ea7 with SMTP id 5b1f17b1804b1-4792af3223cmr50420575e9.21.1764837843780; Thu, 04 Dec 2025 00:44:03 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h="Ae8XA+a1jW2oXTJ097Kuq4sUBeR2Tw4bYC/nxTEq5WZ6IW90XA==" Received: by 2002:a05:600c:46c9:b0:477:a252:a832 with SMTP id 5b1f17b1804b1-4792fcdb440ls3138335e9.1.-pod-prod-05-eu; Thu, 04 Dec 2025 00:44:01 -0800 (PST) X-Received: by 2002:a05:600c:4f8b:b0:475:d8b3:a9d5 with SMTP id 5b1f17b1804b1-4792aeeb58cmr51401335e9.10.1764837840935; Thu, 04 Dec 2025 00:44:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1764837840; cv=none; d=google.com; s=arc-20240605; b=Qbdu+0Fe8Ll1ymsUCPzryTA0uamJD1ubniTJ8A7KZd6S2qqVhDuBZ6GsglSMkv0+HV egiGa8koSCwXZg+83leI4PZWZoLwaIIjdsdnqIGYQzsJyzh++ZOh3CruBjDudbSEjjd/ kBKkmFJy/fHUg8/LjLXyRkKFXpGA5Rtc47tE0lbTGLJOIIWbagdp5oQu/RJie1UddnnK MYUdqvY/WNpLmPgzpsM3JPEBGdjYX+dfFz9qjQuuKBd2N2tZgYEYnrltD2hI6ktUUhcA /31+BSRJgTR/hJGjsuxes40GuABPUl3fF4BvFLRJilHtuFZsVugeyN0j6tEj6xPDVEoC 5Ofg== 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:message-id:date :subject:to:from:dkim-signature; bh=G+zZ1qSOcYyRAVkLQCNCHLxGQm7ahP/H95UoWosyBfc=; fh=DyWpZh1lUFvBvet/Gn/fXGKeGXd7FZgZsz66bemebi4=; b=SEsWJcRzVzcQHMay2LxRbRG2TL6bXbz6izu3HusGqoR/xon4GejwSAmWaqOASA735r 72qhTdMDbPy1Iwsi+s4rB9LFwMWRNTKC+B9kKDQSYA9pDpUVq29Nfsm8C4kOWekRlrf/ MS7C8ugEdUE5j+LB7N+m3PjZcBdw51OAFpbLXwE/nIgFXqlREYKoNBE9qO0Tq5pPfvRu K0cfTSdYP2FN5OJnpD+OnsX+JasYP48BKpPTk1VB5IRKmNKEQfxKFCe1R87qq7xau9p+ WvP662Om5uYhPwFmgPEvw6/SoDnVaMqdxJpWVoxbxAK6bOQEyDKPb5zX80yOMhEy+qlK p8pQ==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b="M6/tNh5T"; spf=pass (google.com: domain of fm-51332-20251204084400d8f3ba711f000207af-kt8ysy@rts-flowmailer.siemens.com designates 185.136.65.228 as permitted sender) smtp.mailfrom=fm-51332-20251204084400d8f3ba711f000207af-kT8ysy@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 5b1f17b1804b1-4792b0c8e9fsi638625e9.2.2025.12.04.00.44.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Dec 2025 00:44:00 -0800 (PST) Received-SPF: pass (google.com: domain of fm-51332-20251204084400d8f3ba711f000207af-kt8ysy@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 20251204084400d8f3ba711f000207af for ; Thu, 04 Dec 2025 09:44:00 +0100 X-Patchwork-Original-From: "'Quirin Gylstorff' via isar-users" From: Quirin Gylstorff To: isar-users@googlegroups.com, cedric.hombourger@siemens.com, wzh@ilbers.de, jan.kiszka@siemens.com Subject: [PATCH v2] Fix initrd build depends after setting IMAGE_INITRD Date: Thu, 4 Dec 2025 09:43:24 +0100 Message-ID: <20251204084359.3321775-1-Quirin.Gylstorff@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-51332:519-21489:flowmailer X-Original-Sender: quirin.gylstorff@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b="M6/tNh5T"; spf=pass (google.com: domain of fm-51332-20251204084400d8f3ba711f000207af-kt8ysy@rts-flowmailer.siemens.com designates 185.136.65.228 as permitted sender) smtp.mailfrom=fm-51332-20251204084400d8f3ba711f000207af-kT8ysy@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Quirin Gylstorff Reply-To: Quirin Gylstorff 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: Quirin Gylstorff As do_image is virtual task it is not executed, see log.taskorder. 20251203-141015.078894 do_fetch (8603): log.do_fetch.8603 20251203-141015.432653 do_unpack (8817): log.do_unpack.8817 20251203-141016.385643 do_copy_wks_template (9626): log.do_copy_wks_template.9626 20251203-141018.352672 do_check_swu_partition_uuids (11629): log.do_check_swu_partition_uuids.11629 20251203-142714.202649 do_rootfs_install (269893): log.do_rootfs_install.269893 20251203-142812.346458 do_copy_boot_files (278687): log.do_copy_boot_files.278687 20251203-142812.347572 do_deploy_tpm2_firmware (278688): log.do_deploy_tpm2_firmware.278688 20251203-142812.479116 do_rootfs_postprocess (278755): log.do_rootfs_postprocess.278755 20251203-142813.723336 do_generate_image_uuid (280155): log.do_generate_image_uuid.280155 20251203-142813.833043 do_rootfs_finalize (280281): log.do_rootfs_finalize.280281 20251203-142813.837689 do_transform_template (280287): log.do_transform_template.280287 20251203-142835.289802 do_rootfs_quality_check (303158): log.do_rootfs_quality_check.303158 20251203-142835.458624 do_rootfs (303179): log.do_rootfs.303179 20251203-142835.545966 do_image_tools (303194): log.do_image_tools.303194 20251203-142835.548904 do_rootfs_wicenv (303195): log.do_rootfs_wicenv.303195 20251203-142835.635904 do_image_squashfs (303216): log.do_image_squashfs.303216 20251203-142853.614060 do_image_verity (305205): log.do_image_verity.305205 20251203-142916.978304 do_image_wic (309278): log.do_image_wic.309278 20251203-145901.333675 do_image_wic (953): log.do_image_wic.953 To ensure that a custom initrd is always build attach the dependency to do_image_tools instead. This fixes a problem with the new IMAGE_INITRD variable in case of a multiconfig with two custom initrds. Fixes: c3c4e72cbfc4 ("image: introduce IMAGE_INITRD, deprecate INITRD_IMAGE") Signed-off-by: Quirin Gylstorff --- Changes v2: Add missing fixes tag meta/classes/image.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index d367d8c7..8c18c544 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -32,7 +32,7 @@ IMAGE_INITRD ?= "" INITRD_DEPLOY_FILE = "${@ d.getVar('IMAGE_INITRD') or '${PN}' }-${DISTRO}-${MACHINE}.initrd.img" # Make sure dependent initramfs recipe is built -do_image[depends] += "${@ '${IMAGE_INITRD}:do_build' if '${IMAGE_INITRD}' else '' }" +do_image_tools[depends] += "${@ '${IMAGE_INITRD}:do_build' if '${IMAGE_INITRD}' else '' }" # Produce warning(s) if INITRD_IMAGE is used python() {