From patchwork Thu Oct 29 10:20:24 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Clara Kowalsky X-Patchwork-Id: 5577 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:03 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-pj1-f61.google.com (mail-pj1-f61.google.com [209.85.216.61]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 69TAL10h001107 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 29 Oct 2026 11:21:02 +0100 Received: by mail-pj1-f61.google.com with SMTP id 98e67ed59e1d1-3ab1e771632sf530053a91.1 for ; Thu, 29 Oct 2026 03:21:02 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1793269255; cv=pass; d=google.com; s=arc-20260327; b=cAknaikvA4GRX97T3MALcLUZ/MsQfWw/KpwYnvKv6mEeqxiNsHQRBXMsYo5MTgtTnr tOVEmwPk1Fd8s5iohiSbPtAD6HJ8IckJ3Mf/mH+O3ZDRleml81WGBbFHs4B7VaH51liG fCy+s0FAToXdI7Hk2NFxkTCGiXcIvYzDsPG1MvVefFWl2TXvdnpkuT93OZP+NhZW6nG3 xH6Y7COAP1HV+wZcfSvi8hm4gUhbzoL59WnNwOxl5vLn2Q/O3VEk3nSFuGJZgmVy8L+V 8pQuiUuffsY25LwhqCalRSLbTiYMmXx8PcbcB9TxeW8FyQUeM9QO8+BJd/l0lFZBtEU6 xUxg== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=TwyFa0rWGdFvR3yolF1hRxIErEmShiWmVtlqWf/8aa8=; fh=zNvaT2ePgTSz5ZuaJvt2mYBhPwiF1RgolZSEFOaiIPo=; b=F6rONHDT3K5kNNsreV3pEv5miTECVqPDybT/w7KGkL3stgIB7LCmS4CBNfqiFYJNqH FtWBK6WkCo+hoTF/WLb4/wDUTKvHhmB+zSdZXEBgUrBHIO8Jh5QCRLIBPUNUXkGlTZ/B jcWg3pHG31n7qj7cwKRjD0pesMYSgJkrOrhiW9+n5YoiUnAnhHDcWcz9aLKU1IeKqhZK Qn35onmWZNHPEkIIyTx1agiEZQnHH7fCwrTaCYjSdvj3GngFnc1CzVex5FnaeG8E83so TfwVLRjWykOBxMrFRle6k/XEw1h3YfX3Zh86q9W7nB1s0F1J9K0onOm3/3zVuYtPdf3K eSPg==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b="a3bR/UTn"; spf=pass (google.com: domain of fm-1047747-202610291020489dc3bbbb9300020736-s_ggwn@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-1047747-202610291020489dc3bbbb9300020736-S_gGWN@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=1793269255; x=1793874055; 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:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=TwyFa0rWGdFvR3yolF1hRxIErEmShiWmVtlqWf/8aa8=; b=lkCAP+ibAILyJRzQ/nUxqYO1F67WpBBheyYmcE778XC5sZ3/FsFQB3pQ4DZDOQs3Uy XXV7zHlvwyUQMmr424TtL36LphGOFnj8aWXgoat4+0RNu3B4YcinNByFJCqdVMZw/PGM DFt4aWnB05U7/wqfKGDlQUHVK3c+kUUjpxSiBZJO/AkxUxuXDAB7MlTd2yqpJ0gfPwqy z+T8nyCTyEHWKSl1OHGLMN+a1Hikv+FPoIwLYhpwr4LV7MBfjA3RJ9s4r9+IyU5YRcF6 t9TBw8p5Ajbfgu0CYZJ8zD5uaQmyy6ISLDuU8yBW0mSc8NHD6eNl1kiTN8iUjLN2qUVR M6bQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793269255; x=1793874055; 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: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=TwyFa0rWGdFvR3yolF1hRxIErEmShiWmVtlqWf/8aa8=; b=G/Omi+yXle6ovYNY2sNUBoqepHfeacwgM/gb4Dw15XIXMJ+aLqcjtVSTJCph4l/t1H 3BDZiYeb8zgxbXLiUUEYpDETNF6Oo98zHZmt5RRVX9DzlF90ucEG+BENXJiYB5woOTiK AtjaRSE9V0JvU4L6k6sJpJxC9UPQYmRd8JxguRXr3QZiyYiHzA3hTjjPaTG5WQlZGt6T v3XSUMtsyTRwfGpGJ78bGqzXgzMDNwKGlCdf/711NcTrgMEc5oz2/7gktETWq04qLL9Y 1/ue2Wbn3paXunluR25uccJLj8eCILwndyyk8VOT1lJMLzpx9Bg8DTFFkZgF0OXtqwO3 fYYw== X-Forwarded-Encrypted: i=2; AKwUvBwYJr6dMezMKANUW+lkTAuGYv/DdCLep53pObEl0DxLccKozumU9+PJQvtchSeIPzl2nsxp124=@isar-build.org X-Gm-Message-State: AFq9FYJ7Odr8JtBkpa1DkFBqICVWgUhrPS9f2CF3e6xQ5rD4TqSHxO2b 9x5LCqXIQpd125/3pl4A80MgMCk7afetlLSivvtSkpPmGGCdLh9NVJMu X-Received: by 2002:a17:90b:4a4a:b0:3ac:860e:1af9 with SMTP id 98e67ed59e1d1-3ae6ed95859mr1274314a91.41.1793269255440; Thu, 29 Oct 2026 03:20:55 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="ATskLdfx5q6UjT8vCrD/YyXUhfMl2M9R0CvC0MFup+eQMQvmMg==" Received: by 2002:a17:90b:4b0f:b0:3ac:7744:9df with SMTP id 98e67ed59e1d1-3ae6e8d8d0els637997a91.0.-pod-prod-00-us; Thu, 29 Oct 2026 03:20:54 -0700 (PDT) X-Received: by 2002:a17:90b:580c:b0:3ab:d26b:c2df with SMTP id 98e67ed59e1d1-3ae6ed4d63emr1294227a91.27.1793269254306; Thu, 29 Oct 2026 03:20:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1793269254; cv=none; d=google.com; s=arc-20260327; b=QIdeqtkCIboJ2cyqgXl5ZH1EAGMks91AmPz2dG/wcL50KuB/tKHwcqhfubfJBTuCKu zRva4dK1LnEKShWq7+D41sAFUlihdymgNxTOYATJVMdvcdA5lkd2vlpbB5encJ4irLuJ EqywiL1eEskknd7aCCn97l0rGcsdLN4iG0KlSz4/m7lu1r4W+UUOKE18nd7WAIZVRxVY C1HjEd52s+K1+yf4I5yTQwAZU1NISovFEsoYaiMFbyMNMHRYhHYMA5IiaeoXvRkTfqJh c7RUgdn9XxjoQto01fuYzyff9PpJGAlxfntXhxGKpTX+UazqeHzfpRQguqQ9nfy87Xzy kIAw== 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:message-id:date :subject:cc:to:from:dkim-signature; bh=/AKQSNudmU7gGIbi2q/xDGPgSYk4QIDdr5/yvJ3FjsY=; fh=AqT8zD6jUs4YP+XkSwmnbRYu3wrat9Vyg/xvm1MGQCM=; b=IBbG45WD6jNN7Of+rLMZRkD+M4gfU96RbUHSz/k8SUPO7ByCSydkZTzP0JxtTPkgUj 2KrOdvwrDEYnYhXU3FfvF53WxR7dMyxDElHAbFX2lTjLa74P+ZhnjKCPpaHedSc7iw87 Z0wYdhvT93uU0bQel7HzvcGpcBny4Y9mMftH588Z08mzUKssSdOWBAadOp6kD/oZ157V hHfwDChei50UAGGhrbLegiw+hcf+atiDTUNMPbHwQ4rmi190ztp8EdfcbzpOK7y3mJQI 9mPpIplruYhnrOC3lpy+OEKT3krb513fmoUYg12y3X0jbykXbPeWC3YartoGMiZbfQab ursQ==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b="a3bR/UTn"; spf=pass (google.com: domain of fm-1047747-202610291020489dc3bbbb9300020736-s_ggwn@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-1047747-202610291020489dc3bbbb9300020736-S_gGWN@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-227.siemens.flowmailer.net (mta-64-227.siemens.flowmailer.net. [185.136.64.227]) by gmr-mx.google.com with ESMTPS id 98e67ed59e1d1-3ae6e3a6cbesi49219a91.0.2026.10.29.03.20.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 29 Oct 2026 03:20:54 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1047747-202610291020489dc3bbbb9300020736-s_ggwn@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) client-ip=185.136.64.227; Received: by mta-64-227.siemens.flowmailer.net with ESMTPSA id 202610291020489dc3bbbb9300020736 for ; Thu, 29 Oct 2026 11:20:48 +0100 X-Patchwork-Original-From: "'Clara Kowalsky' via isar-users" From: Clara Kowalsky To: isar-users@googlegroups.com Cc: Clara Kowalsky Subject: [PATCH 1/4] testsuite: fix sstate test with relocated build directory Date: Thu, 29 Oct 2026 11:20:24 +0100 Message-ID: <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="a3bR/UTn"; spf=pass (google.com: domain of fm-1047747-202610291020489dc3bbbb9300020736-s_ggwn@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-1047747-202610291020489dc3bbbb9300020736-S_gGWN@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?= In rootful mode, sbuild uses schroot and creates its overlay upperdir under TMPDIR. The test-container mounts /isar as an overlay, but bind-mounts /isar/build to its work directory. The sstate test placed its build outside that bind mount, so schroot could not use the upperdir. The test failed when running: scripts/run-tests.sh testsuite/citest.py:SstateTest.test_sstate \ -p rootless=0 --debug ERROR| E: 10mount: mount: /run/schroot/mount/isar-builder-...: fsconfig() failed: overlay: filesystem on /isar/build-sstate/tmp/schroot-overlay/isar-builder.../upper not supported as upperdir. This is fixed by moving the sstate build under /isar/build. Since this relocates TOPDIR, BBLAYER paths are generated relative to the build directory, so BitBake uses the relocated checkout. The SignatureTest still passes successfully with this change. Fixes: a00e0aa0afff ("testsuite: fix SignatureTest by avoiding absolute path in bblayers") Signed-off-by: Clara Kowalsky --- meta-test/conf/bblayers.conf.sample | 8 ++++---- scripts/isar-setup-builddir | 5 +++-- testsuite/cibase.py | 2 +- testsuite/citest.py | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/meta-test/conf/bblayers.conf.sample b/meta-test/conf/bblayers.conf.sample index b04aba92..48928450 100644 --- a/meta-test/conf/bblayers.conf.sample +++ b/meta-test/conf/bblayers.conf.sample @@ -9,10 +9,10 @@ BBPATH = "${TOPDIR}" BBFILES ?= "" BBLAYERS ?= " \ - ${TOPDIR}/../meta \ - ${TOPDIR}/../meta-isar \ - ${TOPDIR}/../meta-test \ + ${TOPDIR}/##ISARROOT_RELATIVE##/meta \ + ${TOPDIR}/##ISARROOT_RELATIVE##/meta-isar \ + ${TOPDIR}/##ISARROOT_RELATIVE##/meta-test \ " BBLAYERS_NON_REMOVABLE ?= " \ - ${TOPDIR}/../meta \ + ${TOPDIR}/##ISARROOT_RELATIVE##/meta \ " diff --git a/scripts/isar-setup-builddir b/scripts/isar-setup-builddir index 3896793d..401a137c 100755 --- a/scripts/isar-setup-builddir +++ b/scripts/isar-setup-builddir @@ -100,9 +100,10 @@ into your configuration please add entries to conf/bblayers.conf. EOM - # Put the abosolute path to the layers in bblayers.conf so we can run - # bitbake without the init script after the first run + # Expand source-root placeholders so layers can be found independently + # of the build directory location. sed -e "s|##ISARROOT##|$ISARROOT|g" \ + -e "s|##ISARROOT_RELATIVE##|$(realpath --relative-to="$BUILDDIR" "$ISARROOT")|g" \ $ISARCORELAYERCONF > "$BUILDDIR/conf/bblayers.conf" SHOWYPDOC=yes fi diff --git a/testsuite/cibase.py b/testsuite/cibase.py index e5150b36..3f44e8ac 100755 --- a/testsuite/cibase.py +++ b/testsuite/cibase.py @@ -268,7 +268,7 @@ class CIBaseTest(CIBuilder): os.makedirs(isar_sstate) process.run(f"git --work-tree={isar_sstate} checkout HEAD -- .") - self.init('../build-sstate', isar_dir=isar_sstate) + self.init('../build/build-sstate', isar_dir=isar_sstate) self.configure(targets=image_target, sstate=True, sstate_dir='', **kwargs) # Cleanup sstate and tmp before test diff --git a/testsuite/citest.py b/testsuite/citest.py index af4cea6a..d057ffa2 100644 --- a/testsuite/citest.py +++ b/testsuite/citest.py @@ -1571,7 +1571,7 @@ class SstateTest(CIBaseTest): image_target = 'mc:qemuamd64-bullseye:isar-image-base' package_target = 'mc:qemuamd64-bullseye:hello' - self.init('build-sstate') + self.init('build/build-sstate') self.perform_sstate_test(image_target, package_target) From patchwork Thu Oct 29 10:20:25 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Clara Kowalsky X-Patchwork-Id: 5578 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:06 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-dl1-f63.google.com (mail-dl1-f63.google.com [74.125.82.63]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 69TAL5KG001118 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 29 Oct 2026 11:21:06 +0100 Received: by mail-dl1-f63.google.com with SMTP id a92af1059eb24-156b5338d4bsf735121c88.1 for ; Thu, 29 Oct 2026 03:21:06 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1793269260; cv=pass; d=google.com; s=arc-20260327; b=CtNz64dXXAu+S1GWE9bpyaOEmUR3RtxqPqE+IXUE4DVsmfVgHekP04Pn7nwZjk2EKo A8k/RqaL0ixYegxIq2rIksmGHa6Ur4VHwS7P7k8Stdh5Dytxe1gsavtB0oOzrWlqNtN8 f/GcN4evcUXJQQtwe40OYMl0766wrpEEhxeVpkz05WLfyi+QcZDckVg9+IVzKuUTVc2k sB5sys29FCjb4GWoPAZcv5ccSDZubHZ+zTKccJhW9vGyCT+1touhRWrUcofJ3G9LWnY0 pQWzhEGU1bRzPcOx5b6esUk8OsGmuu7GS6IPm5h9HENKcQNovhC2Cugqx8GopusGFiEw tZhw== 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=ZF2YMZoz7rLaqyQh5M88CxqIYINDKGMSMk2XhQq2UNk=; fh=BRUgZz6zF7InIkPchHmvj2PU45Syo5D03mhxTpxReuk=; b=hRSZk5jy8jAwRyMkINZ4/0vlS8dsIF2X1HgGfeGC83fVGd9lkAm0XOpJgU4/LaDXGS 1TKW4PoPmOMIwssenzRRnw2xUQ21SMwA67N1dOtk6G4zd/Wk99cXKvgfWoih+6WrwBwa z5WVIRQfuZXs3z51q7I3vZumh2PoDg016vCGEJ03fXBZpnbQVE6InkgcekqGsdoJnji8 upAipBUatigtJid5V4nVTPNuvGB0Wwm0A1xrwt4uAwCdbgUSTpUzR4fvr9iWn8pD/wAe JFSpM6a8zeRjsX0GcGgr+PFdUQpKXjjf3f0xPlpxQAjrNoIhMAXq/c05o97BsXjPiR6P cT6w==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=SMh6cfcR; spf=pass (google.com: domain of fm-1047747-202610291020524f695383e600020705-jpxaya@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-1047747-202610291020524f695383e600020705-JpXAya@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=1793269260; x=1793874060; 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=ZF2YMZoz7rLaqyQh5M88CxqIYINDKGMSMk2XhQq2UNk=; b=YhspAb2OaPvmWmp+ElMW868YerbnOcaF55WcKSYQgxcp1ROEmMD+s9F2w3WSy+YH79 6OsWonyL5VOzM7+baT58Ls1WzrUb9NoUdFsq4uJnFmCwzRejZtmE2xHDtM+uJ1hAFPid rXWhha7Uvhk74r5+5ritFhakEauf7CBaDzBP+wBty3YhCOvki0yzE4M+snjAsHufDtpG /WX8wIaWOFjeS1vKgIeU/cWET14GCxp4SsqRci7bp5xb4330J4ojTBze8D7vSjbcN6QS T9xoL8RwWBbbwSjLbs5p/DYP88v8Ko44azOD8c1D655l0iH9dr2/i/MskpRdjvPTuq2v PPDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793269260; x=1793874060; 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=ZF2YMZoz7rLaqyQh5M88CxqIYINDKGMSMk2XhQq2UNk=; b=ZBXSbhZotC0qVntlyI/SrA/cgI3CxzFiWmTPxMSGl8jySXcoCFthe2AJwUCdjgY1GS TJHvDGiwZB0U5MC6cG2eHBqN9JE7J2hfH1KSBgTJzCbxhnoiFzHyb+NnPWvbZkf+6b9q qei/DQwpBgoqfaX9qLZSE5m2Gh9jbdcJGpZ6+B28Sgy3N6D+Hd7cuy3R01TmxH5WIiDY S2SIVvdySE8x8mqg6B7ZrC1aL1rK+1SKw7KLm2z/JHE3L+LHPdi8hcA/NVwI8Dod3BqL /hvsUalGvsFOeTvieeNInypBdLmFvVQc+0EoksUxlb6VtK9izwE0mTHKn1q/pCLM+gB2 QU+g== X-Forwarded-Encrypted: i=2; AKwUvBw1xeCmRgaWWApeusz5e+n+aJ2bUYZDFGGyMsfs0GmTPzQKk9KGvccQ5Q8YYuB99YOVfeMCcmU=@isar-build.org X-Gm-Message-State: AFq9FYJhKvvSpIWzTIOg6Y70wYogCfrGQ+Nw3hNbGhEIOWeDG58sdwIw KoKvCvDQhQu0tm0GAKp+vAuyKenEI1qlrWD0bqasN76BJDx1c0GLT7pS X-Received: by 2002:a05:701b:4192:10b0:14e:4a59:273e with SMTP id a92af1059eb24-1a6cd4995admr7007079c88.9.1793269259447; Thu, 29 Oct 2026 03:20:59 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="ATskLdcGw6ce8GrBTMyEOPeGZaDd9rSxV1vYCHTYYCYZeAn+Lw==" Received: by 2002:a05:7022:408d:b0:14b:ff30:c3f9 with SMTP id a92af1059eb24-1a6925aedd1ls1254431c88.0.-pod-prod-03-us; Thu, 29 Oct 2026 03:20:57 -0700 (PDT) X-Received: by 2002:a05:7022:289:b0:186:5b49:90d8 with SMTP id a92af1059eb24-1a6c810532dmr6045613c88.4.1793269257121; Thu, 29 Oct 2026 03:20:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1793269257; cv=none; d=google.com; s=arc-20260327; b=KxpdWNV0O+VHJPGtVrMrNRYNzZz8lDdaCPt1ksg+p69MNWPc4QlHlnUDrmTgRaRj97 LlYymv9WzwTDrwyNTZACHLy0ZZwRulVCLCOel4Wa4I+EqDro/quPTLkaRFrKCVEKYoV0 /cD4NGnHtXzr4p032xcl4dZr3yJ7BaTd2AkHzvbDkqpW83wA+MUTx/oNsj+k3irbEiwW vVyYFyovclggilDgy7WSGDbje6jB6grMWONpMO9lQuUv8GZGRhT2nWD3POaL+HdaEDTP aOKiLTvqbLd+4mKGKYIkw1eS2mN8HewvqjAmYvjxQ9E4N4oG91ox/0nd83xl0mxeIIRl dpmA== 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=JA0VSLrFziJ1fw9GhramhG121mRmxl908RIhmTsQL2I=; fh=AqT8zD6jUs4YP+XkSwmnbRYu3wrat9Vyg/xvm1MGQCM=; b=WH3HbhIO7L8GueQPRvfjNb+WXVP8JF3c0WRd9+LZ1mSq4t6E94A2CKGHEKlzXeMTQB 89VOtjtsig5kBb8exZK1rhoigFc9c+8uNECInr+Q55f5fPZCaYn4eknU6v4wkMNUETmG a3HMzueSZp5LgtWnm5pmCEflr7fTePqQUU07SnGwrfJFkbpyrlBqd3WHnrowXu78up1O B4Ru0wCG9ba3FDy7PAcfgcKmsy/LZitvEWVbelooW2RfcsmH7syA86sLimTxn4GIZZUT x1xscu83V4cuIYGEQdclO8Dm3XSiyaz00+fwNKWjHYhFY1BZlm8EypwNay75wqEzyBaQ D2cA==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=SMh6cfcR; spf=pass (google.com: domain of fm-1047747-202610291020524f695383e600020705-jpxaya@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-1047747-202610291020524f695383e600020705-JpXAya@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-226.siemens.flowmailer.net (mta-65-226.siemens.flowmailer.net. [185.136.65.226]) by gmr-mx.google.com with ESMTPS id 5a478bee46e88-36a238b0051si101553eec.8.2026.10.29.03.20.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 29 Oct 2026 03:20:57 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1047747-202610291020524f695383e600020705-jpxaya@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) client-ip=185.136.65.226; Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 202610291020524f695383e600020705 for ; Thu, 29 Oct 2026 11:20:52 +0100 X-Patchwork-Original-From: "'Clara Kowalsky' via isar-users" From: Clara Kowalsky To: isar-users@googlegroups.com Cc: Clara Kowalsky Subject: [PATCH 2/4] image: include rootfs manifests in sstate artifacts Date: Thu, 29 Oct 2026 11:20:25 +0100 Message-ID: <20261029102027.1974884-2-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=SMh6cfcR; spf=pass (google.com: domain of fm-1047747-202610291020524f695383e600020705-jpxaya@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-1047747-202610291020524f695383e600020705-JpXAya@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_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?= do_rootfs_install writes the manifest and dpkg_status files to DEPLOY_DIR_IMAGE, but sstate captures DEPLOYDIR. After restoring the sstate, the files are missing from the deploy directory. Running: scripts/run-tests.sh testsuite/citest.py:SstateTest.test_sstate \ -p rootless=0 --debug fails with: ERROR| mc:qemuamd64-bullseye:isar-image-base: files missing from deploy dir after rebuild with sstate cache: {'/isar/build/build-sstate/tmp/deploy/images/qemuamd64/ isar-image-base-debian-bullseye-qemuamd64.manifest', '/isar/build/build-sstate/tmp/deploy/images/qemuamd64/ isar-image-base-debian-bullseye-qemuamd64.dpkg_status'} This error happens independently of commit "testsuite: fix sstate test with relocated build directory". Fix this by defaulting both output directories to DEPLOYDIR, so sstate captures and restores the files. Fixes: c7a637508ac6 ("rootfs: fold do_rootfs_postprocess task into do_rootfs_install") Signed-off-by: Clara Kowalsky --- meta/classes-recipe/image.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes-recipe/image.bbclass b/meta/classes-recipe/image.bbclass index d9125d05..ce19ae1c 100644 --- a/meta/classes-recipe/image.bbclass +++ b/meta/classes-recipe/image.bbclass @@ -106,8 +106,8 @@ ROOTFS_FEATURES += "\ " ROOTFS_PACKAGES += "${IMAGE_PREINSTALL} ${@isar_multiarch_packages('IMAGE_INSTALL', d)}" ROOTFS_VARDEPS += "IMAGE_INSTALL" -ROOTFS_MANIFEST_DEPLOY_DIR ?= "${DEPLOY_DIR_IMAGE}" -ROOTFS_DPKGSTATUS_DEPLOY_DIR ?= "${DEPLOY_DIR_IMAGE}" +ROOTFS_MANIFEST_DEPLOY_DIR ?= "${DEPLOYDIR}" +ROOTFS_DPKGSTATUS_DEPLOY_DIR ?= "${DEPLOYDIR}" ROOTFS_PACKAGE_SUFFIX ?= "${PN}-${DISTRO}-${MACHINE}" CACHE_DEB_SRC = "${@bb.utils.contains('BASE_REPO_FEATURES', 'cache-deb-src', '1', '0', d)}" 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): From patchwork Thu Oct 29 10:20:27 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Clara Kowalsky X-Patchwork-Id: 5580 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:22 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-dy1-f189.google.com (mail-dy1-f189.google.com [74.125.82.189]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 69TALEQj001265 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 29 Oct 2026 11:21:15 +0100 Received: by mail-dy1-f189.google.com with SMTP id 5a478bee46e88-33c35f5ca6csf3675177eec.1 for ; Thu, 29 Oct 2026 03:21:14 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1793269268; cv=pass; d=google.com; s=arc-20260327; b=A2EcRk/Gb4crWnBOCRJU1xMl0Ma2KiA1OkX7fgRx/Ap5+lplD16R3U+SvHLRq8bVXq /46k6DCOgNzJDa8zK/qi/vjvS8EbGpnOujYDEsEnJjjxp/mwZaqsaCsFgL9tU0rHlQbK ufnSHhSdJ/eC4Fe2J9c6sTyM9gfozxbhADWVIRZwzeRTxnTfOqNY41e17aJMKoRBLOnJ 2RDaIE6xTE26VJcFl9dClDEzT4FRGnE7uU0hd3qS3CaXIVJwFX92ldYRLtjFo16Y+7d9 1EQTHc3A57HqApCRL6Eh/6dRvrdZTk0xf2KtcSk/YiQJQw5CWFG+ZJ4JKo0Hj6EnnFpE VZ3A== 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=qEWvQhD0IL3xvN87U5DhMNf1qiUkhR4FLW7cKug3NNM=; fh=uBE5Y9rlGngZzEn7+SLcwp5g+G+9NviSI3CKvmtRKlU=; b=patjBAsTHB63bYOLZ/yiaIOWcsPrb48QiaCf926yMLtxq7RPLUmCFXn7zXwrssGVov dALhrxJwZlv42L8xK8eLQv3pltmtXJlW1smre5f1BRtxHHhxIOaSTS1Scilla/kGgcp3 pXF7Ao6yQebvvYS3CItOwtnoahuoBFXxgtJiWjWq1GB4mUqsbrNO//W/QE+T5QhddvDv zYXomeLQF8ByhMvxj6j3el3AIkCqsQZDcEZ3ub+0rXP6Kl/l2ZKJFhvYhE1vOVRpv2J2 8HlIL9kxBAt2TedvdjDDf40Vr+2WdoNJsI4VHhqAHILRQw3H+WkNcRsSUnZUzpdjTkXx QywA==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=LGtAXcgF; spf=pass (google.com: domain of fm-1047747-20261029102101274e1d5d9300020792-w2l_gc@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-1047747-20261029102101274e1d5d9300020792-w2l_gC@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=1793269268; x=1793874068; 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=qEWvQhD0IL3xvN87U5DhMNf1qiUkhR4FLW7cKug3NNM=; b=CTtHyY4C/Dek5QwBzoTkm4KGrZ/JHzBNq977uOlJ4Q3P363/FzPQ6Qca/znML7/8i9 EleUgzfdr/uR6MNRT+uXq56SO0RPooRQ7dkQKKeprT7Nqy6+9n38eHdxxaAymg9QhhLI JZbnMrpGSBQuOKLJnO5auUxGjxJddAmniWD/AEll4j6L2g8d+cjV1BNxFaw557ntH8yF YcPl43CfbFp7mymTvslYv1h4VcUM8VKTsoI6Nq38gaL4XThoAGiLIFgwGyRc0TGVlQbn DCrqVdBTV82YwTbVIFACdsEV11mMdlu50NaICMbR9dnHDJ/GZXVMM8sn0nk0cKMiAEsF u59g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793269268; x=1793874068; 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=qEWvQhD0IL3xvN87U5DhMNf1qiUkhR4FLW7cKug3NNM=; b=dCduuuJJdqZw6MD03KSAKELb+2Ur1+v/z8N/JPtLGJASxp22l1tZatpfIF2t0ja8JY rRNUwTLVsap9NHG2lbJ7rNu4D0AECDbTZTi8xFxdBDnISoUXLh9aIBIB6w2f4I33AJor iw94kJOutRMOrOS/LzGgriYqFdJYo4c27djbFfk4muFJZJ2AZCEz0Bwp/56anTaUuaJ4 y/hoG/fabL817IojA54fk5We8UjZFxjdD6CoOTL2xXTamCPf9WEllYfRLTgmoRmvL5ih umRiKPTo5rXwbjcMWYiZO5etLYL+8Q1WNg/yAKLZOC30isrGvOFZjUjZCT8XVDpp3nHo P3Ig== X-Forwarded-Encrypted: i=2; AKwUvBxEdg8BB2pRu9ScFXY+H2+BbvTUIL/mVzlYOubqNYkY2nB+7wme7Zj1EAdAkX/gwIDhmCU8quc=@isar-build.org X-Gm-Message-State: AFq9FYIzqQGj5bOdkKUJYYKsJwWl/NpY3rBQeWc+HHsI++MFi2WncNfa DJHsCH/Vk5U1r5Jp7LV6qn35ZFHHYwIzCFAe4v6Lx2GMQowwAPxRhaqm X-Received: by 2002:a05:701b:208e:b0:181:5cac:8f27 with SMTP id a92af1059eb24-1a6cf071dc0mr5344582c88.35.1793269268435; Thu, 29 Oct 2026 03:21:08 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="ATskLdcRT8Y5uvvcfN3vPdvHVb/ftFz/497wF2eQGduXAbSxZw==" Received: by 2002:a05:7022:f682:b0:1a6:54ff:9ec0 with SMTP id a92af1059eb24-1a697c4fd76ls2090959c88.1.-pod-prod-03-us; Thu, 29 Oct 2026 03:21:07 -0700 (PDT) X-Received: by 2002:a05:7022:289:b0:186:5b49:90d8 with SMTP id a92af1059eb24-1a6c810532dmr6046122c88.4.1793269267026; Thu, 29 Oct 2026 03:21:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1793269267; cv=none; d=google.com; s=arc-20260327; b=Q8siJPx9ZbaOaEofSHxU9HLa7NxnCU51vQir7QVPIv2sGBehgi0eIjUFifD3E5YnoK bJ6XwjgoPhXY+LHU3RQiJYSoSgGtaszwqKCz1u/+9xMTgu3CMLHI4qd0tN18iI3cq/pb 50hyAvgRTV43EeqRFR3M7VmZm5FbKE8qy6ogBKaB/jHD+e830pfzYnDOzC05CSw9xUXS /LVHD2COGx2d+g8mUWfhOXYaaM+QDLS1CPQyMO5ivzRElxNZbbQRZ2cznGSe3pRjieq5 qt7AVTOEMhw4hPMC8QyqYkoSKc0OTTIlfZ0p3QA52vlZLV2bkioeCyP4sXapcJ+VCNGO qKhw== 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=qVuRoH4PnyCdYekjcVjR/kt9p07RqbpUrNd5AMgIizc=; fh=AqT8zD6jUs4YP+XkSwmnbRYu3wrat9Vyg/xvm1MGQCM=; b=j47WLGD8YeR3UO60o2ympJIaz1+JMP0JJansEFb4ddMMwaelwozAsIF+vm5CZ5GOla M6CjLYL04TmtIt6K+TR3hAX4q8ecROgpFQhMHhwjS6EuslwngYEUCMb9uCX6qixxAcet hFfAA3xVEsHzaJ+nN1vLHAAKu+bca0vxVIPaGoDUtMyRpwyvQ6ekfyIhcBnFRXz8k0Ad FSSZ34JMFh+mywIag8CUuFoq0iIWSqtCS3FfBmOAs55TvRB93Un+3bKeL8TyBsyPbpNa /LnICKpt6Q7sykDOJ7963vROv6Gg48yzZQcM6I7rwq2WE2T4IwThyj9jPRlPgg5ps/bq XV+Q==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=LGtAXcgF; spf=pass (google.com: domain of fm-1047747-20261029102101274e1d5d9300020792-w2l_gc@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-1047747-20261029102101274e1d5d9300020792-w2l_gC@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 5a478bee46e88-36a2375bb7asi102879eec.2.2026.10.29.03.21.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 29 Oct 2026 03:21:07 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1047747-20261029102101274e1d5d9300020792-w2l_gc@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 20261029102101274e1d5d9300020792 for ; Thu, 29 Oct 2026 11:21:01 +0100 X-Patchwork-Original-From: "'Clara Kowalsky' via isar-users" From: Clara Kowalsky To: isar-users@googlegroups.com Cc: Clara Kowalsky Subject: [PATCH 4/4] meta-test: stage rootfs CI manifest in DEPLOYDIR Date: Thu, 29 Oct 2026 11:20:27 +0100 Message-ID: <20261029102027.1974884-4-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=LGtAXcgF; spf=pass (google.com: domain of fm-1047747-20261029102101274e1d5d9300020792-w2l_gc@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-1047747-20261029102101274e1d5d9300020792-w2l_gC@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?= isar-rootfs-ci sets ROOTFS_MANIFEST_DEPLOY_DIR to DEPLOY_DIR_IMAGE. If generate-manifest would be enabled in ROOTFS_FEATURES (which is not the case right now), do_rootfs_install would write the manifest outside DEPLOYDIR, so it would not be captured by sstate. Fix this already by setting the directory to DEPLOYDIR. Signed-off-by: Clara Kowalsky --- meta-test/recipes-core/images/isar-rootfs-ci.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-test/recipes-core/images/isar-rootfs-ci.bb b/meta-test/recipes-core/images/isar-rootfs-ci.bb index 35f5005c..0cc98679 100644 --- a/meta-test/recipes-core/images/isar-rootfs-ci.bb +++ b/meta-test/recipes-core/images/isar-rootfs-ci.bb @@ -4,7 +4,7 @@ # Copyright (C) 2025 Siemens # Bill-of-material -ROOTFS_MANIFEST_DEPLOY_DIR = "${DEPLOY_DIR_IMAGE}" +ROOTFS_MANIFEST_DEPLOY_DIR = "${DEPLOYDIR}" ROOTFSDIR = "${WORKDIR}/rootfs" ROOTFS_FEATURES += "generate-sbom"