From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7051855893335375872 X-Received: by 2002:ac2:5bc9:: with SMTP id u9mr2782392lfn.371.1641897070264; Tue, 11 Jan 2022 02:31:10 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:211c:: with SMTP id a28ls2209078ljq.0.gmail; Tue, 11 Jan 2022 02:31:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJze+2RDmZJ6TPwaogZMJrROjk6478FL3RNzrsComlOWInOCy9fvV7WmTWZtYrRTNHKI0Wr0 X-Received: by 2002:a2e:b616:: with SMTP id r22mr2388411ljn.287.1641897069313; Tue, 11 Jan 2022 02:31:09 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1641897069; cv=pass; d=google.com; s=arc-20160816; b=WY7OkShK/D5sMoKi9B63jQuuFoKqVNs75gGuJ53wXvuuprnmBHP44SSldJnmwHIwP0 BSzDy8o6cuWWhW7cIa27ZG2XfNwg9nN3nJPkZaxZPpLacvliQImgPyJhp0n9I3TTx4rg W2S8gOy89406Us90rmZst1vTHYG7Mpm1Nrr4uW85jnKzKLr0ssuizEykqVp6S662Hkkd qtNIWs02siYLfWBPleuOt8kkbG/auR6KvreE8eUBhngujgf3DXKoWfUerOYkKzLOiJ8X VTb9c6UnpguCkMctuCVDl9RMGZ4Gw6sVilntxsQJmWRY/16p0wV9u3gPHSo6da0UsKdR oUUA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:dkim-signature; bh=YqZzz1p1k7JDqVtsmMs0XqrBHjtyZvh0px7aNvf+oVw=; b=t0C+FLJUmYsrXKEx2rEZ6m87TVB7nD9cnVXOasZGznmoW7PQcGlSGB3PqNzyFCK4Ly 5Hp0G+/kwEAdxxb85WBQz+FgwxlNBpaojV1es0s38/NU2u5WYlVXdg3xKwFNenQHcsMh 9kyWvmSbbNn6yGAcmVO8v1/VedIMvC7UgyDt7naLQe4chrYvFxFOj2Wx7zTJKcZq9AVW bq4XDfZKWpbQgQ4R2HwNBy5+YunQCSV6l7vmCdPkpevcrD/zv8zVJFFtC07Jy1Sb1v3h 9zo0UlWS8ITPMnwTLHpVm1HU6DWRgH0NfTDaiLDcU0dDRUwuJ9LRZflZQn6AgwNQulod axWA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=L87Er2l4; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe0e::624 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0624.outbound.protection.outlook.com. [2a01:111:f400:fe0e::624]) by gmr-mx.google.com with ESMTPS id i21si462850lfv.10.2022.01.11.02.31.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Jan 2022 02:31:09 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe0e::624 as permitted sender) client-ip=2a01:111:f400:fe0e::624; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=L87Er2l4; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe0e::624 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZAO3WW1G5O47NXYgVvmd5619mdO3z+9aacDMLVdZVhJEa16Odw7hxRKIi721ntD2cuAZw2V5/GTikfSINx+ZQjozR2GZfya7xnYy3vhbLnhKwtkvBYm+YhCw7h6zVaSeAGDQgBdDSwE/1IqoSqlrvKSTbtYt++S0KLRNwWCYhukeROtUIQBUhwfseE47rkP58PFpzdCrw/8Gt7CirWkXlEIWZJvEqDCdlcQT2eV+oiyX6UpFD0878oSl4FavrqvbuHnxzQZnW3hV81kRF9qh4o9XR1nhZN6u6XDz19TO5mqaagTWIBcVv1R/NZrv0t9trAKVjtlbNb3eTMct/BBBaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=YqZzz1p1k7JDqVtsmMs0XqrBHjtyZvh0px7aNvf+oVw=; b=UcsyNIVgOTBrkARCYVq04Ollv/a+wd0GqmvqFNLwXU1sPG1GJCizWs/rSD4YXw+mSg3Os02kUXSqzxvyuCjhjwstUiKtdL2dS5Kd/45n536CrOOAvIH5Il4wpzKVNllpQdBunmcYZxIJL9WuGjGxoVdXYsB+3M2Eowm1NQxHDXV63J2HktVIY7VvBQ8JSiEyE3kX3CKpVnVy+FKIEZvlDQ28/8RHeS2tNlTxXYDPaElRTuRgS7EbQ143riIkhBjLnCV9uCbe/BoLD4DXKmkHAs4sYT53nNeKECgalk7E4U5p7ChBVBz9wWibsShq3OfJsfzyaUXR/3Oi+fEGomFJKw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.73) smtp.rcpttodomain=googlegroups.com smtp.mailfrom=siemens.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=siemens.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YqZzz1p1k7JDqVtsmMs0XqrBHjtyZvh0px7aNvf+oVw=; b=L87Er2l4tW/zgOkyXUHl1qAJA5Vmf+MY0Fv4jD0nLwT+v8mGfV6gOnzYO1aK/Ngk61pTIK/dxMvg/sap8UhTVcR7hX0XJt3xaTQmDC4cd8HPYjz3SGantyoS3B+KTwB3ELq4V/DTOLvSewO+QJfrRit8tZeb00HFCfxdXwtzmvqldiWt7l1iXuJ776Oq1sQR6sKJXC6sC4tzykZzgJFDUr35S8nMMVKBsXVeUnxXbM9WLgYzADXTuLHflX8L5emviPQNuU0uWKacfADDRxc34HoHQoWMjQ84lrQp4A3HtILhFtWhGSBcuZbXz/JXVHY98oLZnm/GrN81Ri6W+xthRA== Received: from DB6PR0601CA0023.eurprd06.prod.outlook.com (2603:10a6:4:7b::33) by PAXPR10MB4916.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:1df::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.9; Tue, 11 Jan 2022 10:31:07 +0000 Received: from DB5EUR01FT051.eop-EUR01.prod.protection.outlook.com (2603:10a6:4:7b:cafe::d7) by DB6PR0601CA0023.outlook.office365.com (2603:10a6:4:7b::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.9 via Frontend Transport; Tue, 11 Jan 2022 10:31:07 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.73) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=siemens.com; Received-SPF: Pass (protection.outlook.com: domain of siemens.com designates 194.138.21.73 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.73; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.73) by DB5EUR01FT051.mail.protection.outlook.com (10.152.5.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4867.7 via Frontend Transport; Tue, 11 Jan 2022 10:31:07 +0000 Received: from DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) by DEMCHDC9SNA.ad011.siemens.net (194.138.21.73) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Tue, 11 Jan 2022 11:31:07 +0100 Received: from md1za8fc.ad001.siemens.net (139.25.68.217) by DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Tue, 11 Jan 2022 11:31:07 +0100 Date: Tue, 11 Jan 2022 11:31:06 +0100 From: Henning Schild To: "Schmidt, Adriaan (T CED SES-DE)" CC: "isar-users@googlegroups.com" Subject: Re: [PATCH] fix(sstate): don't fail if there are no packages Message-ID: <20220111113106.40fc005a@md1za8fc.ad001.siemens.net> In-Reply-To: References: <20220111080200.3365264-1-adriaan.schmidt@siemens.com> <20220111101358.6ab6a30b@md1za8fc.ad001.siemens.net> X-Mailer: Claws Mail 3.18.0 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit Return-Path: henning.schild@siemens.com X-Originating-IP: [139.25.68.217] X-ClientProxiedBy: DEMCHDC89XA.ad011.siemens.net (139.25.226.103) To DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ad115676-9aff-426f-5247-08d9d4ed7a84 X-MS-TrafficTypeDiagnostic: PAXPR10MB4916:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BgZYGZXMR9ZbSrj0JbWP/whTaE0YhAxBMlTBYtsNfkcL2gIWeVr9NflTOfHhzmM2LgJxujzt3Bp0b3HDz1ubr4zmnQJDX8tM+3p+0aqDh0sM4jOOf/zjL/0NmG5mxUyv6ibHdEwPCo1nkvVW0mICos6RkUaJGlNLke2D1tVaIctI7c8iX+199bKhnjwpq1Jes+mV+PnlezYM6zHGbxCTSXiP/gNR8H6NWRLGsVYWpl0tlgP2XSVSPa4kTskwcjZoySgxlzFL+4397jjmR7KNlUP3hUlgfgh6RRSPE5QQE6BrRd889dEg4UpKj8hFmR+d30EiCHkwKEHCmnSA2YdXMo03ZC5Kddx+MAa6wmRBD4lAJ9kNLSZWhO6Zy8EWSWZERnYxXTJNjfNDLL2ud2oxJz8VYuMTjd22t0nmu2Sclb1ovGV08AAEGweigH5aRNnaBpY9Fv/GiQ8wA3iHzwp7KRi5zCAknTHSv9+Gno+3UmOktRPcCT0M7nxiQE8MMMXIuFqg70u719jSyw5nWe1ivXVuZxXKwmVFo3ef1eyuUXwnWwo9M3tJgc2334KD+U1xv/33QuodyIZdpJCz0z6irFzGHWi1qBcOFmlkirolqLxlVimgRcNuejcmOna4pQMqOrhNQ17gv8lGz1I4jj//Mg5YxYIXtdvAFxdVQR/PZPTAmF9bRQhF91bvlSCuOkUoIM/orKryoz/nJBRcSjImGnWj+pGqnF+QfSiMEmWQ5FZfeSaRd3ep8HcCubnN9sfwktapP5BjA9JMP3307YkHZttZNj4eD31GGvLPCxZHYqSgCW2f3R6BAPTklMbEwj1FiNOCtuEeL4Hsol83BfKNhA== X-Forefront-Antispam-Report: CIP:194.138.21.73;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(4636009)(40470700002)(46966006)(36840700001)(956004)(81166007)(7696005)(8936002)(316002)(508600001)(44832011)(356005)(6862004)(86362001)(4326008)(36860700001)(55016003)(82310400004)(336012)(82960400001)(5660300002)(8676002)(6636002)(70206006)(70586007)(47076005)(40460700001)(9686003)(83380400001)(2906002)(16526019)(186003)(26005)(1076003)(36900700001)(360504008);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jan 2022 10:31:07.6684 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ad115676-9aff-426f-5247-08d9d4ed7a84 X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=38ae3bcd-9579-4fd4-adda-b42e1495d55a;Ip=[194.138.21.73];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: DB5EUR01FT051.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR10MB4916 X-TUID: AoV0yAH3Ong+ Am Tue, 11 Jan 2022 11:23:41 +0100 schrieb "Schmidt, Adriaan (T CED SES-DE)" : > Schild, Henning, 11. Januar 2022 10:14: > > Am Tue, 11 Jan 2022 09:02:00 +0100 > > schrieb Adriaan Schmidt : > > > > > The code to put generated deb packages into the sstate cache > > > currently uses the pattern > > > test && do_stuff > > > which, if the condition is not met, not only skips do_stuff, > > > but also returns failure. > > > > > > The consequence is that in cases where there are no packages > > > found in ${S}/../*.deb, the sstate caching fails completely. > > > > > > This changes that pattern to use an explicit "if" instead. > > > > > > Signed-off-by: Adriaan Schmidt > > > --- > > > meta/classes/dpkg-base.bbclass | 6 ++++-- > > > 1 file changed, 4 insertions(+), 2 deletions(-) > > > > > > diff --git a/meta/classes/dpkg-base.bbclass > > > b/meta/classes/dpkg-base.bbclass index cb5ce4a..2add0b2 100644 > > > --- a/meta/classes/dpkg-base.bbclass > > > +++ b/meta/classes/dpkg-base.bbclass > > > @@ -222,13 +222,15 @@ do_dpkg_build[sstate-plaindirs] = > > > "${DPKG_SSTATE}" do_dpkg_build[sstate-interceptfuncs] = > > > "dpkg_build_sstate_prepare" > > > dpkg_build_sstate_prepare() { > > > - test -n "$(find ${S}/.. -maxdepth 1 -name '*.deb' -print > > > -quit)" && > > > + if [ -n "$(find ${S}/.. -maxdepth 1 -name '*.deb' -print > > > -quit)" ]; then ln -f ${S}/../*.deb -t ${DPKG_SSTATE} > > > + fi > > > > I think we can skip the "-print" while at it. And is that hard > > linking not problematic when DPKG_SSTATE and S are in different > > filesystems? > > The "-print" is needed. Otherwise "-quit" will terminate the find > before anything is printed. Sure ... need to skip that "-n" as well and just use the return value of find. > Both DPKG_SSTATE and S are (in all recipes in the Isar repo) always > below WORKDIR, which needs to be on one filesystem so it can be > bind-mounted into the buildchroot. > > (From looking at other code in Isar, my impression is that many things > would fail if the complete Isar build tree is spread across multiple > filesystems, e.g. the buildchroot, sdkchroot, and bootstrap recipes > create hard links from deploy dir to work dir.) I see, was assuming DPKG_STATE to be under SSTATE_DIR where different fs could be likely i guess. Henning > Adriaan > > > > > > } > > > > > > dpkg_build_sstate_finalize() { > > > - test -n "$(find ${DPKG_SSTATE} -maxdepth 1 -name '*.deb' > > > -print -quit)" && > > > + if [ -n "$(find ${DPKG_SSTATE} -maxdepth 1 -name '*.deb' > > > -print -quit)" ]; then ln -f ${DPKG_SSTATE}/*.deb -t ${S}/.. > > > + fi > > > } > > > > > > python do_dpkg_build_setscene() { >