From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7051855893335375872 X-Received: by 2002:a5d:63d1:: with SMTP id c17mr3242061wrw.522.1641896624332; Tue, 11 Jan 2022 02:23:44 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:210c:: with SMTP id u12ls747439wml.2.canary-gmail; Tue, 11 Jan 2022 02:23:43 -0800 (PST) X-Google-Smtp-Source: ABdhPJyxcP40djR2zl+ica3IYF67SyaMQxMPp89dhqmCxeo4Zw6w4xEClNhmaQs/7X//ngBdvJcC X-Received: by 2002:a05:600c:3d8c:: with SMTP id bi12mr1832380wmb.63.1641896623445; Tue, 11 Jan 2022 02:23:43 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1641896623; cv=pass; d=google.com; s=arc-20160816; b=QoiW/IJddGodibKtcx1XCkn1OTDJH5w5hNmQoiPEvO7zzlkBYMIDtJYNSslVtGQa+S 3Ouho56X1mhZdayGKCOqRM0OxWwV5jhiH1Zhsz1PPcAFSxFQOkmtq5mUROsZcWoz23X2 kERk2Rq+5UbsQhyBgP6tirVfyYDbQiRIvTmkOcScDvFTjBzWzRtiKHVka5Ud3YFzZwsR TPGaOSnx5IgRb9pKQxJsSWm1NcF2EOLdFP+4PnKSEp+7b0FpdUzLj7x5C4+suMe6raH8 nS6seQEougFa3rlWS/MnzNP/95rByneyDksXA3NqmfTLXGcT8bpOAUUvMCZn3xMQylML vg6w== 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=zuOvLvZYXUifLdgkxQzaBhyOtzn96raAbWTdX4zS+cQ=; b=vZ0fSZbHcwawSMjsziiLCN9vEr8uqbpcyToONuBJFRftldkdUBH4C3tajKMvp9/UA1 uY4qkSElxn/F0K0KtS5h5tpvtA1BrikmzeX0sGRsqyEYM85FKx9mKmaiYmHl6sLDYP+5 ggBg5jA2w44A9I2SN9xR3fgfTLj2mkGN7vBkS8Qr9nHwLlfPim/qdNxBdUNEOOmmncuG Qr9Fmr1M2CtdIpbiqEBvtgHQ/tsxJeuAXNpQVDIz8UUZxlfBm8DCEm4z6KxBlyIAhQjA Sd3FL9UMSJaMmGUjFKecJQ0nDZkOiJ/yxAWtWVgL/2Drd9wD31fqx1jDrxkUa0qoOqQx IE9Q== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=LuA3CwI8; 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 2a01:111:f400:fe09::61f 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 EUR03-VE1-obe.outbound.protection.outlook.com (mail-ve1eur03on061f.outbound.protection.outlook.com. [2a01:111:f400:fe09::61f]) by gmr-mx.google.com with ESMTPS id az12si367013wrb.6.2022.01.11.02.23.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Jan 2022 02:23:43 -0800 (PST) Received-SPF: pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:fe09::61f as permitted sender) client-ip=2a01:111:f400:fe09::61f; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=LuA3CwI8; 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 2a01:111:f400:fe09::61f 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=Cgj02Bp6mLddgjNu1lYhHa12gYTUucLwNVlsxtzKH6jw6q1NAVlWIJDdlpi1fbhTanj0LPUCaehPCAS8S9A4it6cdD1IF+EX7WmthkDxaxQPm6VhCOnhBcoN/k3fh5r9xqnBG7ZkfD2TQpjq4a4bKqg26oO6hmXTUZWHiRoS8odqrd4v3V9h+fE4Ux49lRzstX89qYHPjRyyOJ2sbjpQQodpqUv2LL9fYJLpnAi1H0ckoKm5HTET0Dvvdpp/MFHVoQOB+X7d87+p9IOZtiRDFQnvLA0TrT/bmdqLHe36eLt8fY1cuZz8KWdO50XeA4owAvdmCIw3Mn+m/nqK3V+QJg== 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=zuOvLvZYXUifLdgkxQzaBhyOtzn96raAbWTdX4zS+cQ=; b=N93PF3ZeYF5cFdCBJrGrEtfiraYFHA/+ZzJ//H/6p5khJwJfBmZ5IqnpmpanDTauawGKT6bU0CsSotQ2U38x9IKo0zp2ikxGGKYmS9DnqZ6eud+77bALymh+wE/OczJ7YsDEBNXjgmzPCyWlQBqS0eva6ipZ2kQXflONuxKQC0BfzgJF+xaGb0nRCpIhWn6i2BWOPbPD8AW5B55HIzwaWfTpCCyWWjFKya+LG2u68A8Pn6rdqDGtsSSrLurywkfwIlXF/pRPTD4kfN4dgmdMeVX41akwnKvH3Q+b4T2NRcVzRb3haZzOwBNkQaZ3lWSO+FWB6URWtVXmX/NU11Emog== 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=zuOvLvZYXUifLdgkxQzaBhyOtzn96raAbWTdX4zS+cQ=; b=LuA3CwI8uREDUwiNSRNHqHoJvdPKEKj8gsu1O0f/hP3m5D+teN9sbt/osLis6Pk94ZydSscJTVQMMZqkAi1jC6R+mzZCg5ZP9iWNz4BoL7eSwt26HB0Dcimmo9OXekGp4Schr+9CFe25jc1iNQ5QNUwb4HIIYgeHRG1Q/be9gOdflFcDC70BCrCFnEtNQpQuOiYEzzOVVt2My+Myj/klldX45TOXfmJ9Na4Iy7msCzAZmOVWwBnqN4V99B4KeIs2hM5JkOSqVUmgr6jf86o668/Zo/TqQLLde91v6g4GZ6SHSjEi0fwWagsNmT2C2ivxJ43bOeihClMSa9fcofV2pg== Received: from AS4PR10MB5318.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:4b8::15) by AS4PR10MB5320.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:4ba::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.11; Tue, 11 Jan 2022 10:23:42 +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 10:23:42 +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: AQHYBsGQEtq4Yu3MmkG3cevSDfH84qxdiZ0AgAAOJZA= Date: Tue, 11 Jan 2022 10:23:41 +0000 Message-ID: References: <20220111080200.3365264-1-adriaan.schmidt@siemens.com> <20220111101358.6ab6a30b@md1za8fc.ad001.siemens.net> In-Reply-To: <20220111101358.6ab6a30b@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-11T10:23:40Z; 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=641a5fd1-7bf3-4faf-8e01-66d0d2ef3d0e; 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: 33a8d952-da0a-4cdf-95d9-08d9d4ec70df x-ms-traffictypediagnostic: AS4PR10MB5320:EE_ x-ld-processed: 38ae3bcd-9579-4fd4-adda-b42e1495d55a,ExtAddr x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:8882; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: RoAa67JX9d+e6b523Y0uxVwbWyC+YOLd9iSpdhPa5yUIrNGbIcWrNskaXcOqXGjVicZ0llNTssH8GplOI2aOfCCfM3/av+VO7qz5M37wk7bUQw+Kpo0yBhwtdmE83k3FwfIDbHpL8i5Rjx+rx9ER5lYd99LawTJpgtb/tay7c8SCf5QnAKDmCAw05Iy85Z0mW+qLhZMiLP4HEje+acYrs9Ymjg35dOF268NAYGWJInet4Db+CqztUpfJLkMyE9FlegtFhim8I09lcMM07piwSHeQHKmP+7kl/qAxbM6iK8xRJq+BzBbEGQwxM0ihXZHH1u0jqIZ/cxHSub6tV8LaBxCAnn1IU4WvavZY7/N3EttwPJvmSKXynDkOKvBdkRyTVQMfzslhFZD3CWnF41vwvgM/866PcaxXzdDnfg68CjCNKKUzq7GRHYtCIdSsQhfS8Yume2hdrKsf7ZyTDjyIqAqg2cBbYawXstnOhLOZdLTr5rItzmGT1mYKcYVa9GXss0TVfQm7wawCD7I3NGPlWqH8CHByHSqQpxy7CoxPxUSVP9EiMYi1p9rw0nO+7i64qrwME3qD98pWiK3Spsx5PCJD/LFMemFFtd4aHRjRBkJonaz+JGA5sivSKkS3WOHEhnymf1hTJap6pXer4GL6f162PvztCnQEO1+cOIixq/1rEQBx9SCRYHD8NpxmmSd7dXtDjJpycJHXZBAR53dFwdrXKFHd85yUROAwgW0zx8Y= 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)(76116006)(508600001)(52536014)(33656002)(64756008)(66556008)(66476007)(66946007)(86362001)(66446008)(71200400001)(5660300002)(26005)(7696005)(9686003)(2906002)(186003)(6506007)(6636002)(83380400001)(8676002)(122000001)(82960400001)(4326008)(8936002)(316002)(6862004)(38100700002)(55016003)(38070700005)(360504008);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?fl7Cakht/fOQra8iL5kyvBm3H9isjMFEA35SLmlzFAJWG9bit3TvEnUT1V6t?= =?us-ascii?Q?g1bWp1L+ppkO5rXEEemZcdso8X8qalax6ijV8FzXQac+RpQ/EkxlnKkfT/RC?= =?us-ascii?Q?yoP9dQrl9xFbNuUuLwSg83TeLd/vJjo7oNv8daRzDAVt0uhWAUiped7cUSiQ?= =?us-ascii?Q?112FN64XB51034gsub4clivD019kElgG0dScCdyXyqvZvLrE0WWoYRdK9uqv?= =?us-ascii?Q?9MM3MTO1MQI4nifPlSza4umKk/KI/u30DCIZZWrJD9brCTKuUVJE6mEzhvxI?= =?us-ascii?Q?0mXRxWZ0vq/IrQJA/R/Vo9bremHJYuWmzSVmAlJsRWszyph053vUNEQHVCfI?= =?us-ascii?Q?n5KH1nIZf5XUhTatMcGbh4jo8Huqdd7dU/FHSXWX8Dz0VXnICT3ScPVxWds8?= =?us-ascii?Q?JaOT5bY6eykGbyiK2ZyrCENXuKbxdjnSkJOrIZjKtGMhc2A7ho30yzNIh5Xf?= =?us-ascii?Q?gc15UI8z3KuueLtv4yA6TOFkmaSpoBXeH0S3s9qkZAYMhnpik44VBFg1pIzH?= =?us-ascii?Q?KOBJqftTlaE4JAmk6pAFCMu+YfkDWJ1sw3M2IjprBgO5zumcHvQQN/sJ9APT?= =?us-ascii?Q?i0CluG82Xr4WpfnMoVElvtMnWYUgo9od1VJ8u7RFsLkW2GFJdvgSDQE70mxE?= =?us-ascii?Q?Z9oTcfOBEX+O9eYMLn9ExGU44bv015/9hZYBieREIRxj0TC0h2AcD/D+weA4?= =?us-ascii?Q?YLPBYVFHUkc8wHhF0sDixdOFehKIcA/v/fmjD2ajma4+SYR1WcN5Y/Zwa16T?= =?us-ascii?Q?JaXoV2UyWSiz1ZJoG/FpXjABbnTA08S6NBZk70kIB0GPSbqkwtjmFoDBKCEj?= =?us-ascii?Q?YUQHYfWJu3gMquyDIHpxNxdGT+kyAiqvJYh0/yudLE1mBjJj/TUFJ7X+Qr3I?= =?us-ascii?Q?45bpayswX6quLFnNdz4nD3LZI3KYBNs3gvnUH9FGVUfbn5jgx9WtD0XdQJDU?= =?us-ascii?Q?j5BCfX/t7bB3W01qiRlcJ1aJsmWJjcsXVb/yrm0pBaARGYg4nymYxt0XZtlM?= =?us-ascii?Q?RgobBKBpGSNw1ScIe6vnIO4661L9sLn/6UjLCuUB7dHZghwgUZGyp4p5uiLF?= =?us-ascii?Q?3DvJ1+WkmnrQQKZXCKjN8pFHSXK6oMEqDdeIwG9geZq6BhyYXrtZaRrJ0p3D?= =?us-ascii?Q?zYa5rXQBHzdn2k6O4achZs7aiDFV0ACniHdkDX52CpFVzUJO+kOBIgYZau6v?= =?us-ascii?Q?3wqHB38Bf2OShI/rnVaEqTikd1AL5TYY4RbF1BVoF6NPw++qqpA5bdYsIjGW?= =?us-ascii?Q?kwOpmznos9WLhCHhCavwi40iDGOHpjpKMehdW5YQHoEpuEkTaxXGg8FW2fmQ?= =?us-ascii?Q?85lDyX3li4xQdSxj4ZEBjL3uPJjvWL4/uYo3bBUxV0oJV1javIV81vnuGupg?= =?us-ascii?Q?J9ZFxJwwRK+qXlcM4RrEAH7HdVjfAqm3beNOf0kathdxqR9DnQ+JtGmR4Bl+?= =?us-ascii?Q?ylggGQip39FnX3R2xlUeyzqI3lmL3Edo8s9ky4zxtp6N0VVecWpGBAw+U+ht?= =?us-ascii?Q?/ml4lSydDQL3q94GSGe59ZvSxtgnRtu8zwRDrQ3sF6jo7lqXYlBzef3mIcOG?= =?us-ascii?Q?NleeRUJcZUadsfjIF+F+Rh0l5Jrvgx+2cOWPMKkOEp4jHFLQWm0O1mPD+3Cl?= =?us-ascii?Q?x9QzugbAQ1i2cz1Avq3QQpo2jotkWJjjCCfhJz0wG5SBh0vz7xOnWkqom1vn?= =?us-ascii?Q?b4ClpQ=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: 33a8d952-da0a-4cdf-95d9-08d9d4ec70df X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Jan 2022 10:23:41.9301 (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: fsDhAGlT3Jf0BYtzDcBC1PbsYqXWwz4uDujfyu20QzyeELOjrCvzOu9gr31ZQTwisHawqpqQV46oJroYMHsVHiQwEw+MAIhlWadKCgkN57c= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR10MB5320 X-TUID: MPGXTH65j0fG Schild, Henning, 11. Januar 2022 10:14: > Am Tue, 11 Jan 2022 09:02:00 +0100 > schrieb Adriaan Schmidt : >=20 > > 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 >=20 > 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. 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.) Adriaan >=20 > > } > > > > 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() {