From patchwork Thu Oct 29 10:20:26 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Clara Kowalsky X-Patchwork-Id: 5579 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 29 Oct 2026 11:21:10 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-pl1-f189.google.com (mail-pl1-f189.google.com [209.85.214.189]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 69TAL8U0001198 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 29 Oct 2026 11:21:09 +0100 Received: by mail-pl1-f189.google.com with SMTP id d9443c01a7336-2e601800e58sf30884375ad.2 for ; Thu, 29 Oct 2026 03:21:09 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1793269263; cv=pass; d=google.com; s=arc-20260327; b=U+cWC27nxRrWRKaC8TkQ/LZidJ/Rj5JPH4vzJuXPiGd4ISQyFGuTb47Dr/k+fchRs+ VkD/Ploai3yp5vChb62gB3vOb8KZtK1IIca8/lDvqGvUzf/cJU9jxCHPgDl25JeuNlEQ yov4lTMUvT/HAs1EHxPTt4IBkeNwvmeFMqGHPw9pFAVFIc8ramhuSBbJwOeLelZomaxO qF1LTUaMLgQ2ECkDBFhoy4eozG4plhaE8WBXGieFyrqWIdx5cF0dPHtJdRNwIgQLvgdR Csq7j6EBFeCqO19DUtSWLM+oQcWmaaPt4jL9i2LD428BfIW0bltArn4qY9pBhbJyTBMo L0wQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; 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=Pk792Ag3BCQhp7SD1P2Ek4J/lvNHQ62vYaQ2tUoZJJw=; fh=jLsc1BC1S1z2f3TG4jirKH455tf2zm8PCLw6kNKot1g=; b=auZAzX0lSZWvTIk6iQMkVuucwSh99cqZ9j+/+bWocK6wTwEnhppv9dRqSHVCQGXeQ4 ewOpLtyMjNwH/3EcbQlWPRVsq2x7KhwshlVeWM5fVbjovoKfzyyHDWSfY+ylCmUAqLKA b1LSsKi+3hWdypXmLCb0V9PAB6tw8BVDPIoHkmzkixgs0s9mrLa+LqtZ0jdypaqalBE2 kBwK7HbZZcEMeH3nG323ztPQcFdUvFpMj+J3Vt+AZgJIqOkfdurCRK+gCV/ZF0Eg52EV 5biFSojBffxMj5kxRre9wFe8T9rWqO1e//vvlKd2biUZcVX5ht5vB2H3qeznhTMUmrHS ebEA==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=bVbxJlyG; spf=pass (google.com: domain of fm-1047747-202610291020579962985c10000207b6-plpwig@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-1047747-202610291020579962985c10000207b6-PlPwIg@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=20260707; t=1793269263; x=1793874063; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:content-type: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:content-type; bh=Pk792Ag3BCQhp7SD1P2Ek4J/lvNHQ62vYaQ2tUoZJJw=; b=UqkEInJystQvv8UFPrPtC2wOd+1WanS9fgNSBQ/21+Fciz9agS75dNN2grgMuSA8Ia CP97+qipziikhpN3YUnIaOgHbnhkTQ+WaJxgmizTtj3Yei+LVKu+DmmLHpbt6OY70xm9 UtV9SDWsvxciCMWh3m73fg3roQQwpssRE1+q7JdPZ6s73l8QFPabQBT1PZ/Y0WvP+E4k 2LDD1AX4xgJwZ8/QTyaxF75NTfFkPv2uJcUJ5TSv5w7K2Xlw0mTR4611rlf/6+o/bhc1 QO9oR/27NtakCgXJe87A4+S5RL/bS9ehA7PYDMbZGwedb4Ieq9wHbVn+LMSs8l+nr/u3 ZYwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793269263; x=1793874063; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :content-type: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:content-type; bh=Pk792Ag3BCQhp7SD1P2Ek4J/lvNHQ62vYaQ2tUoZJJw=; b=x98r9Fmid7lbqhaGHeMv2awzDXHDzfDlA0aKTzIOfFtdKWz/woUKqDFEVs5yXN6yec GKGqE9HANiv/peX8pdRchQ7BZqKVeqCuIFd0aJyKz4AkiIKoRvZmzazkDyb+3ypRhlIP fmZZyzOyfA4wlGebq5dzGc0hVU2u6T8r0C7I008wL4dMtLya3T7RK7q5e00rIjXWA/52 WwBjy6oaAhoW1Kgx/8o1Bpd37pwMdn5YpNt+NTzbyNjCWtbKD2Cueta4osRWU4oZ8j39 CO2vYL6DbYchTvP+2Qj9t/QfY07NSbTwJZYASc4l8f03WjMBNX0f5PD2c42G6pfxN5je rNBg== X-Forwarded-Encrypted: i=2; AKwUvBwnkPuZGVaOHefJXR89PDFEvgipNUomEPZd6NfYfctEDwwt9ZPiT9TvB0VLXzWuCCt5dmkaCYQ=@isar-build.org X-Gm-Message-State: AFq9FYJgwOt4iCFJ54TZ1cuV/p7rEq9AcQwX4B9hdEhMkvHeGa4xu+2T IYAt6W4CKKaHXiJVQyf4ZpWivRSygpIG9Zwf/aGJZmnhb/fiU5Q8mGCm X-Received: by 2002:a17:902:f547:b0:2e9:451e:1e23 with SMTP id d9443c01a7336-2eb004fa185mr46644655ad.23.1793269263159; Thu, 29 Oct 2026 03:21:03 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="ATskLdeX9gqnKjuEwkzSY5O5uFOd+WCMKx3a4Z6t44cBzbklpQ==" Received: by 2002:a17:903:1b06:b0:2e8:7aa:4a64 with SMTP id d9443c01a7336-2eafcea1888ls33261795ad.1.-pod-prod-03-us; Thu, 29 Oct 2026 03:21:02 -0700 (PDT) X-Received: by 2002:a17:90b:1a86:b0:3ab:2737:3393 with SMTP id 98e67ed59e1d1-3ae582c1b7bmr4013717a91.40.1793269262124; Thu, 29 Oct 2026 03:21:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1793269262; cv=none; d=google.com; s=arc-20260327; b=hylZ9L5oS7xLeQTTDKkx+kUV/0n5APAyeQdPFGLjehlCRbvr7glyL1U0tagbckfT0P l450bKdfr2HKpedOMjiJIxE8YXTRu8eGvKVx+SmuWYdmz+R9vZ/wjqe0Y8VilR+5LikK S/C30SzWInwJtaO0WxkQKUfj57mZMOhJBL0k09Evl9YMJHbLcZET67rdFMASrX+hE6Cz L1C4yFQ3z6k/hNFDfgCZlmD/L1Vjqd5GUrr8NxEFme4mWWuP+0HOKCNWK6G2iDA80rFw kg1cgBR6YxOmW6MhJPZ89GE2h9m7xrZJqVbpOZQ7k42pJnav3eAc6KmBiYjOmxTN5Ben O4vg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=k4iHqWo3xhwuHXVam1DJlUujckuxcMmpiTg6TaWsS/4=; fh=AqT8zD6jUs4YP+XkSwmnbRYu3wrat9Vyg/xvm1MGQCM=; b=lQbpm0E54Z82o5mQLFE0Ue12N0Ab9ZmZ6d4y4Mp+JZhedhXhbrx9qILGl1Kzc6o+f/ 9m0A3QHQzTR6/e7J8yPMw8XohiEEmTrJ/g3lbnaihxSuRdDREjyYPN4s7a2ul4VcStSB ln86s6bEbJAQnlz1y2DBGtswQupCbb+fis8Cf9+druRq/XZl5dbmGmsgXTD84iXJGdrY W3GqMp/ERt2pF2FJAOd2n2V0mzBzOIE6CR6hWuimyu2/OVa5E28ZmJmg9CUeoxLjDePh BN85DbxozX+WBsfYzrivG6A7M4Zzn/zRBlRb3MVXxdefDM1HJjLleRVOWPtN3iUR/HeT a35w==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=bVbxJlyG; spf=pass (google.com: domain of fm-1047747-202610291020579962985c10000207b6-plpwig@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-1047747-202610291020579962985c10000207b6-PlPwIg@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 98e67ed59e1d1-3ae5795b7f3si65278a91.3.2026.10.29.03.21.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 29 Oct 2026 03:21:02 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1047747-202610291020579962985c10000207b6-plpwig@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 202610291020579962985c10000207b6 for ; Thu, 29 Oct 2026 11:20:57 +0100 X-Patchwork-Original-From: "'Clara Kowalsky' via isar-users" From: Clara Kowalsky To: isar-users@googlegroups.com Cc: Clara Kowalsky Subject: [PATCH 3/4] initramfs: include manifest in sstate artifacts Date: Thu, 29 Oct 2026 11:20:26 +0100 Message-ID: <20261029102027.1974884-3-clara.kowalsky@siemens.com> In-Reply-To: <20261029102027.1974884-1-clara.kowalsky@siemens.com> References: <20261029102027.1974884-1-clara.kowalsky@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-1047747:519-21489:flowmailer X-Original-Sender: clara.kowalsky@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=bVbxJlyG; spf=pass (google.com: domain of fm-1047747-202610291020579962985c10000207b6-plpwig@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-1047747-202610291020579962985c10000207b6-PlPwIg@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Clara Kowalsky Reply-To: Clara Kowalsky 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_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?= initramfs.bbclass overrides ROOTFS_MANIFEST_DEPLOY_DIR to DEPLOY_DIR_IMAGE, but as do_rootfs_install captures DEPLOYDIR for sstate, the initramfs manifest is missing after cache restoration. Fix this by staging the initramfs manifests to DEPLOYDIR too. The sstate test is extended to build an external initramfs and verify that its manifest is restored. Fixes: c7a637508ac6 ("rootfs: fold do_rootfs_postprocess task into do_rootfs_install") Signed-off-by: Clara Kowalsky --- meta/classes-recipe/initramfs.bbclass | 2 +- testsuite/citest.py | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/meta/classes-recipe/initramfs.bbclass b/meta/classes-recipe/initramfs.bbclass index 41828487..9ae9c556 100644 --- a/meta/classes-recipe/initramfs.bbclass +++ b/meta/classes-recipe/initramfs.bbclass @@ -20,7 +20,7 @@ INITRAMFS_INSTALL += "${@ ("linux-image-" + d.getVar("KERNEL_NAME")) if d.getVar INITRAMFS_FULLNAME = "${PN}-${DISTRO}-${MACHINE}" # Bill-of-material -ROOTFS_MANIFEST_DEPLOY_DIR = "${DEPLOY_DIR_IMAGE}" +ROOTFS_MANIFEST_DEPLOY_DIR = "${DEPLOYDIR}" ROOTFS_PACKAGE_SUFFIX = "${INITRAMFS_FULLNAME}" SBOM_DISTRO_NAME:append = "-Initramfs" diff --git a/testsuite/citest.py b/testsuite/citest.py index d057ffa2..973321ae 100644 --- a/testsuite/citest.py +++ b/testsuite/citest.py @@ -1562,17 +1562,25 @@ class SstateTest(CIBaseTest): :avocado: tags=sstate """ + IMAGE_INITRD_LINES = ["IMAGE_INITRD = 'isar-initramfs'"] + def test_sstate_populate(self): image_target = 'mc:qemuamd64-bullseye:isar-image-base' - self.perform_sstate_populate(image_target) + self.perform_sstate_populate( + image_target, lines=self.IMAGE_INITRD_LINES + ) def test_sstate(self): image_target = 'mc:qemuamd64-bullseye:isar-image-base' package_target = 'mc:qemuamd64-bullseye:hello' self.init('build/build-sstate') - self.perform_sstate_test(image_target, package_target) + self.perform_sstate_test( + image_target, + package_target, + lines=self.IMAGE_INITRD_LINES, + ) class SingleTest(CIBaseTest):