From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7051855893335375872 X-Received: by 2002:a63:7f16:: with SMTP id a22mr3783441pgd.190.1641901849584; Tue, 11 Jan 2022 03:50:49 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a63:6e8e:: with SMTP id j136ls5255402pgc.9.gmail; Tue, 11 Jan 2022 03:50:49 -0800 (PST) X-Google-Smtp-Source: ABdhPJzb9R1HubR4UfS2WQFPkrshxXM9jljtS+2Nru67GgHfytFzq5Tvgp9bSOcwwFPMjz/HBa/L X-Received: by 2002:a63:370f:: with SMTP id e15mr3653678pga.230.1641901848931; Tue, 11 Jan 2022 03:50:48 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1641901848; cv=pass; d=google.com; s=arc-20160816; b=OAaQjoVy4pPwsuSqno8s/w23RtSlSM7Jb67Evt3TZs2wp/PW4/1WQ1zuO8h82oDHSL cwowczdwdmmkzcsw95YYu6hzVlGVVhnZAzEGqXU9wOgybeccTlPzMTwrrMl7g991rl6Y 54riw0wqsDgnY6btJh8uAnvXQIuypRBUoUK3iC2TxZlFmFPUPk/sqH8YdUKDWla3tqar i/PyGNTRcpBXId0I2bBdAeBeQIRp2wVrfrNJxM6VudyeQMtNqnEl5r1QTyD7Hw9X48ae Nzlavr07W98a+ZX4ZOaoGpa6Qq55GMZ/3SFb4xD9cPMmC2JpwO/OPMdt37ZA/cWg6vfs ko6Q== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:document_confidentiality :msip_labels:content-language:accept-language:in-reply-to:references :message-id:date:thread-index:thread-topic:subject:cc:to:from :dkim-signature; bh=eU94Jk8KpoxzFN1Opfwb/cfVZ6oucJFTuLaZhi8Jmaw=; b=washYiTOqmRoGVhZlT13ptu9oz4ByYr+zW3h8K6BdwaW3Zw2M1mi8obUOaJhDdJtyR cscOii3W6fB2jPjBqVE4yNoRfU8MNPLe8CDjcOU+CRFtoMu2tid23XGL18nPsSM8KxUK 5EEtRU/vulp9ZvTg9llVUqk91/ghgyCva+tI3V0LGmi0690PEWAA8Vk6ojlAaNNtgAW7 woaDJ3WSy6HjpxYmQoTHPXGOwdzDZliqv+H8h6afuIl8skM8d3EtCoB3zmxCkJLt1cUp uD4kHm2XaloOvxtTbDSfEFnAxLO3IRvRPl3ho9GYCl1mrbHOcf8fHBxU8JmyDt/Fv3Ey +Qjw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=IQ28fuhr; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of adriaan.schmidt@siemens.com designates 40.107.20.40 as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2040.outbound.protection.outlook.com. [40.107.20.40]) by gmr-mx.google.com with ESMTPS id q19si470646pfj.0.2022.01.11.03.50.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Jan 2022 03:50:48 -0800 (PST) Received-SPF: pass (google.com: domain of adriaan.schmidt@siemens.com designates 40.107.20.40 as permitted sender) client-ip=40.107.20.40; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=IQ28fuhr; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of adriaan.schmidt@siemens.com designates 40.107.20.40 as permitted sender) smtp.mailfrom=adriaan.schmidt@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=bzhsIpLUzlwcJRiQf2SOP0ip1Azk1Xxe9x1yvgqcxsGdyz09pmLjDfpsYDSdeFeLAVfCmkaon8E77dEEWYUPokuMe+KRVjuttlWSeXYX+TAykm0tNGeAKORpkhm6ekPaZ3nviyOhGwabUrU1WW4qQ/mQ2PQHfPqyaw8aIVLhcm13zynIIe8yRLkdVDwzjJ+bq9ztsPvV1LHt7s7Za+RHNZ0wyYYfP/3+KEhy5aT1Hqj0Ue3FGfbku//hMCUWnjfU7jgxMYMyGMUcQQXBdUEdriMHIumwU8fvImy03PEPPxeqkd4lTOTj6XZDJw8iKB+6SLh6cUL/vR9hPqTCvLU6mg== 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=eU94Jk8KpoxzFN1Opfwb/cfVZ6oucJFTuLaZhi8Jmaw=; b=QAuKLBfFWT98pFYbXKA6WNm4jE1DTrW7M3V7NAVNC21UsX9FPj3pPXmeYIViROvtCve3ZNk5Q4gFWQgpStvUOFWsAYSU9PAKLa4Y/Nl8SRfeIKllCMUkTu34MLOteZJLgZnuG0dJtx6oys/t/eTeQkeG7K6L7Uvlc+GAo3RAZI/zxCcYFfeol8CVa6cRtcQBLh2oWFqUZt26NvxOC8w8vAmyL0gyDTufgeLxLb6USmmmJhSoSkbsq10VIf+i2bXLe37aLEokgT4fmvBs1ItRscnkJkPeEXiE4vvB83iH42oYclPTmT9mExJSWPgDc29SnXR8VAk8GSU/jLvZ2dCRqQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; 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=eU94Jk8KpoxzFN1Opfwb/cfVZ6oucJFTuLaZhi8Jmaw=; b=IQ28fuhrFbk/tIg5TUuZYL7v+rRRhiPh+IdZS027r5eq8V7Rwcofqb5j8F0+fPUgu6OxVfQ/Ztyq9GAV1DKZQn/eDIgmSUY2+h9KkPz9ZtPX65hyPiujk3gfUk9BBSH7rjTUObrqoS6mNUPawmemFy+gMsIZ1KhRz4bupv9nXYUbRc4dQ/tWetLuw9zyaDxV1IgTwn9Rj9H8W5fSRlCKkLdxB+87ay1gdwZAkg3JAlUMAPrMl+OBQeFNENBdfEjT4DVzYjOuDMe1e750OXWml9HgHOAC5CXt9+beighH1PMXRLQ53EaW+eXLXApzWEcT5vbQyHPSNSMW8ugbkxyraw== Received: from AS4PR10MB5318.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:4b8::15) by AM9PR10MB4941.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:417::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.7; Tue, 11 Jan 2022 11:50:46 +0000 Received: from AS4PR10MB5318.EURPRD10.PROD.OUTLOOK.COM ([fe80::84c:ef9e:baa8:5ab8]) by AS4PR10MB5318.EURPRD10.PROD.OUTLOOK.COM ([fe80::84c:ef9e:baa8:5ab8%7]) with mapi id 15.20.4867.012; Tue, 11 Jan 2022 11:50:46 +0000 From: "Schmidt, Adriaan" To: "henning.schild@siemens.com" CC: "isar-users@googlegroups.com" Subject: RE: [PATCH] fix(sstate): don't fail if there are no packages Thread-Topic: [PATCH] fix(sstate): don't fail if there are no packages Thread-Index: AQHYBsGQEtq4Yu3MmkG3cevSDfH84qxdiZ0AgAAOJZCAAAdoAIAAESCw Date: Tue, 11 Jan 2022 11:50:46 +0000 Message-ID: References: <20220111080200.3365264-1-adriaan.schmidt@siemens.com> <20220111101358.6ab6a30b@md1za8fc.ad001.siemens.net> <20220111113106.40fc005a@md1za8fc.ad001.siemens.net> In-Reply-To: <20220111113106.40fc005a@md1za8fc.ad001.siemens.net> Accept-Language: de-DE, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: MSIP_Label_a59b6cd5-d141-4a33-8bf1-0ca04484304f_Enabled=true; MSIP_Label_a59b6cd5-d141-4a33-8bf1-0ca04484304f_SetDate=2022-01-11T11:50:44Z; MSIP_Label_a59b6cd5-d141-4a33-8bf1-0ca04484304f_Method=Standard; MSIP_Label_a59b6cd5-d141-4a33-8bf1-0ca04484304f_Name=restricted-default; MSIP_Label_a59b6cd5-d141-4a33-8bf1-0ca04484304f_SiteId=38ae3bcd-9579-4fd4-adda-b42e1495d55a; MSIP_Label_a59b6cd5-d141-4a33-8bf1-0ca04484304f_ActionId=a92c3826-0cac-4293-8d03-ea93146f74c1; MSIP_Label_a59b6cd5-d141-4a33-8bf1-0ca04484304f_ContentBits=0 document_confidentiality: Restricted authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=siemens.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 9e77ea93-8fd6-4a03-d207-08d9d4f89af9 x-ms-traffictypediagnostic: AM9PR10MB4941:EE_ x-ld-processed: 38ae3bcd-9579-4fd4-adda-b42e1495d55a,ExtAddr 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: l1vFBah7KBLi8qZUj007IVQ6VlGPuCG7OKIb7puSfNT1LEgCBGRYzSzy3ZFuPHd3NHNVAy39zzkn5HSwIbvlmLMrFa3SmJ1vHKbvCaEhrxv/C6hSHvsFulsVvx0rF/FlazGeM80CdnfPTrYN6k6883JDUOc3uwNGsBLX67w71y4xvN4nfwDuOwaF2fIkSf+eYBH/InI5qyQ75J/S89HGuka9sSOOYDMyAbBDrCimqjaaxMUo40FHLQPtZlDn/ghi5y38Syzva8RgWOwKIXrZ/yVZoUT9cww3pbZZGm+6/EFyokUQQDINHCjJOWRwbeFaKpSew5OmKgXp9V7mvbj8FbuMbQM31PwlnIOUIPDHTkXZKEVZOKx8Vy4Cr/zQ9BLJgRchyeOelVjLVNv1sGUSNn4vROjmj66wt2yFkQClZWot7AtX0eKArBLDoBF40ivJ4rydVnTdi4JHNyOo11CZes89e1uYphrgwUjBv5v+INhXSRorPFbQEKfRgOSzjLjRyhYGXIaSRojRJSiyN/hjCOfRqBY9F0HvF4+pdzw7Am7x/WXhSACEcgdkyJCfTx5bHGwqymZfH0M5bK2HIMr0TcTHq1rfI3Ium3+ikrxswrmVbgcyKf1slAHFjsjj24QKZotvPXZ/klQa/DOCugXxPa/OYnIVQ1/a3dS2YFUrYvXDNSw9xH/X5UTvRIvLrt3oY6O88uFYh738iToFOwW+BjrTUaZ2K+pbW3B+7U/GHC0= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS4PR10MB5318.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(4636009)(366004)(6636002)(4326008)(66946007)(66446008)(83380400001)(71200400001)(8936002)(6862004)(7696005)(86362001)(64756008)(6506007)(8676002)(66556008)(2906002)(508600001)(9686003)(76116006)(38070700005)(5660300002)(33656002)(55016003)(316002)(82960400001)(38100700002)(52536014)(26005)(122000001)(66476007)(186003)(360504008);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?cgmQ1ESQ5x0fI1k/9Toby8BWD0q24XGmFtQ/JDR/qo3+10X0f/4/MnRn8dpH?= =?us-ascii?Q?8zkAejlp2q2TUCNJrHPCj06TRuuI1o9xa9znqTmhIish+06/19kX6CC7wPvN?= =?us-ascii?Q?J7H0T9UO5cKZqAgdiNZ+zhca4VVPttyojd87k7YXhpwslHVlnOdVtY9380Nz?= =?us-ascii?Q?ZF0NpQXkVnelKzJmO3TNhstXmFcqjiAtyqCUkhATdtXpyNn/0U0cFRvHc0gh?= =?us-ascii?Q?sz+ZAbOppd/KsXVh7hVsnJ0nive1Iu7xeyGpz93jKduBCl9+yM1azrLZP9+g?= =?us-ascii?Q?6AL2iX/r7o5QbaD3WpCWnogJWdhEcd1ggdD2qkFUpuwUScXvfs5qQD2E66FX?= =?us-ascii?Q?kGs5AMUTZ4aZmU/LV3yRI3q6aU9VfSQjxh3u+yxtTJQ7uzrrxQYVt6Xj55tS?= =?us-ascii?Q?VqKsZUET01YjbOBuUXh65SKjv6SKh9P2U7VB21b5TdUiDZzGFvTorG8TVPLy?= =?us-ascii?Q?gAKNEgSeyVgFtuhnfSq+MX4xsE6zUYSpDN5DrFD0M6P74okt5twwoIwBBurh?= =?us-ascii?Q?D3ueehVuUqALbDCaE3jIxhS7qTuUj4u3mxOVhukNDdkRpSamN/jvrKhNb7Ol?= =?us-ascii?Q?1sUTQLqcXyVKxwueT0tbn4ofjePd/tGvTV2FeBPohfvlmF74zVYZzwkr8I+B?= =?us-ascii?Q?8g5Ncuh38sfsAJ73HcOPvC7SmcHB/QzCxyV75oVCfAQxUwl6xYCNcI+AZ1e5?= =?us-ascii?Q?0AbCt6v00rGKSIA/zqmSQQW/Ud1kB0+vcqgk1iev8Qwy+DkZpXoUIJxIgigW?= =?us-ascii?Q?pF0kTlA/QDw3SA/Du1yRaKUsfVe5qQZ4fiWKd22MFaARA5v5B0SrjsspcbKq?= =?us-ascii?Q?uoq50vHgtP/TU2RcF712vxQGq2TM4ZvVdcQTzXvW3lS0QmvQzQngBhVCEI7Y?= =?us-ascii?Q?Whq7E5oCxx9L00FBE8aROcyUl2XvdgOPei8/ic4h0fLQr1s1mgw3e9LuwZG7?= =?us-ascii?Q?glgjDiiJxtj1Mi1TFK6BCqy1Un8kPDdEqT29HHkFvl6uq9SDOc/VLkCC8c1C?= =?us-ascii?Q?MMN4JwgdYJJKc7n1XvUKIgl70chNZnEbLOePC1lSJqLhV3N1oMydz+/dMCcl?= =?us-ascii?Q?ztb/mpwujES9l7Ez1KnS2yTlKMblWuDqy+f8nx3lpmM6Jfu4oWkbvDIr2f1s?= =?us-ascii?Q?AN//fbK3YDTrD+JMIqZ62rxYtI9Fi0XMe+aj4HeJx+2rsp2s5omCr4y2t7/p?= =?us-ascii?Q?eTd7H37wriDRm2MHpqY3314kW3y391gTe/8m0+ruHKdFutxGoiynqjSAcTbW?= =?us-ascii?Q?LYZc2HIDNf0Zp0geZ5KOguzTUHJMge0jYQzB6/8wIjOGkwoi+3BiCEJiS+gL?= =?us-ascii?Q?ExkRi0jCkEf7ghM1nPMYNhgHAA9SLmvfZ4UEsEMdsyMVrlFTtelAfOwSYsZ0?= =?us-ascii?Q?h+UdOdKKgYQOzCL4xN6JJvqJ/KtUXK2Vgjz5BeKgwbsoDHRFAR4KVeZWYgW0?= =?us-ascii?Q?UU1GbUECy8rd3NK87jn5/qZzsi1ja4qTrjAleyClN+zADOO/u44RYQnLmOiR?= =?us-ascii?Q?HmPARhbCeRLRUHG68K+RqBu530MYhGD2uDFhEcYcfqOIbBIxF+FU+c09MeqV?= =?us-ascii?Q?jC4ywZez7hKDjPwYVLnU5NagjKdNe1je92PeifCXX41uNJk/CVeI/NdHTLrv?= =?us-ascii?Q?BfPXNhH3fDe2MZZHOsbrLhzXe8ISmHk3KQKdWK+EyqeROyYRUrhgFrycRIa7?= =?us-ascii?Q?37u17A=3D=3D?= Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: AS4PR10MB5318.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-Network-Message-Id: 9e77ea93-8fd6-4a03-d207-08d9d4f89af9 X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Jan 2022 11:50:46.6052 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 256oKVrm8CqLX1fs8YAmuioNRvRlYVgTBS2r26pQh7IPA7uHW68giCvZgDWD3p//A2WnvohSBVBplnQ13+04R+XRuX5CzgHazHDUQWurpvE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR10MB4941 X-TUID: gjn1s9JYNreV Schild, Henning, 11. Januar 2022 11:31: > Am Tue, 11 Jan 2022 11:23:41 +0100 > schrieb "Schmidt, Adriaan (T CED SES-DE)" : >=20 > > 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] =3D > > > > "${DPKG_SSTATE}" do_dpkg_build[sstate-interceptfuncs] =3D > > > > "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. >=20 > Sure ... need to skip that "-n" as well and just use the return value > of find. No. Quoting "man find": find exits with status 0 if all files are processed successfully, greater t= han 0 if errors occur. "no matching files" is not an error condition, so won't influence the retur= n value. Another option, if you really really want me to submit a v2 ;), would be: if stat ${S}/../*.deb >/dev/null 2>&1; then Adriaan > > 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.) >=20 > I see, was assuming DPKG_STATE to be under SSTATE_DIR where different > fs could be likely i guess. >=20 > Henning >=20 > > 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() { > >