From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7051855893335375872 X-Received: by 2002:a05:600c:1da5:: with SMTP id p37mr1608272wms.59.1641892449301; Tue, 11 Jan 2022 01:14:09 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:f2d2:: with SMTP id d18ls444406wrp.2.gmail; Tue, 11 Jan 2022 01:14:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJxPENWn5YBxt9Nm13tBGloBQHXq6Q9xW7QZe1ctF9RWvJ0BssHJmU2MAtVqRvtm7bszPful X-Received: by 2002:a5d:47c7:: with SMTP id o7mr3026372wrc.642.1641892448381; Tue, 11 Jan 2022 01:14:08 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1641892448; cv=pass; d=google.com; s=arc-20160816; b=hjvgfp9awEE6QNtUhK106pLU+Fz492LHhX5B1G0QPFUQdAwjkwte1q0vmwFsuOVdpy wCgH9S0QWyumJ0k+EtWtOBmaRosMOVFEbbBGO1S7EljfQUhhTiv8/K6QJyzOoryHH4Td k8He6Xhdgoh8YGUdIHqkspuVPH8SVY6jLQsA1qYMsBIGJbj6JEBeaZaSiZiaBvXBPm5n fi+yFgTvsyASCqBQ8x+jYfAIlk4FxczM1zZmJZUp3sFpwpTL70aapTOW/qlkgIXTEBV4 /jbGu/Zs41Z3LfAUymz+l1QzVGg4NOZcu0JTBeItRqQLUBn6t5n9YYNsxOrW4LDNsUQ5 if5A== 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=cEsX7zvS8/ttna6ZNIIyO8WL+9aiIDOcWOw8/ATK0Bc=; b=mkNwsaYK0FxkBs47V8JUFTBKl4ZVSn8xRKwU4V/iFPRvjU0DqEJBDF+1GoLQhDxaTi nfYNuSg3mp0bvJ5Z4C25U/e69UEE8n5xikT0UL7knRoYUevX/ySFvLLrZvZvGVEGwNSP BemBGFw9a/8JhwIeuM0Wpjh29MYjL3p4uDacYxJ/C+V97CDaN1s25WyJoVIEf1P+SGYt EMWggUq6qPxB7cyro1dWJEQ0JoJtniUZVYT/u7UfiLqy0tIjl5jHR03DLD8qL8tmzmpC kCPcpSff2lcRtDTUoFE7pxSAjhVgkiNcLi0aJAINFPcN+zNOYEBilhu+5d3L8EKaBKMZ DKNA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b="Y/p7zQOe"; 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 40.107.21.58 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 EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2058.outbound.protection.outlook.com. [40.107.21.58]) by gmr-mx.google.com with ESMTPS id m12si311536wrp.3.2022.01.11.01.14.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Jan 2022 01:14:08 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 40.107.21.58 as permitted sender) client-ip=40.107.21.58; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b="Y/p7zQOe"; 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 40.107.21.58 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=BRb3fa12Ej4ihjkUOsILXObfLmms4FM1FNPwqWoJ4WbDZ8qG18+OK53YnjYIVKnDnrSv5UD3rIOfZoYo+6UlM4pe+xJ2Dc2Xg0IhRAmIo2sHb8tIwRh2rlKT3TejDBUpPk/G9oiGpvTdOlvUzlRyJDBsudHoqVhPCatuWLyRRT3+ZwmDACs2owP9sHA74ZUa8dLNbRqTgDzChu6pYj+xqm5vIks48C9VF33rW9aW+bvzw7il5FctAPw03E14JV6iVIMmTWoAHDz5jm83oNpSBRfBCB4PO20iy380MwMs63QOhogLWA3mJwVHbVpJB2cEM475f1WB/COcA5cg4wzhiA== 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=cEsX7zvS8/ttna6ZNIIyO8WL+9aiIDOcWOw8/ATK0Bc=; b=Wkw9zGXG+Z9zs7k8kRQz4CAR3oCx4vXHsIaMAhEq68oHYZumWreQGjSr2gLqPS51tZ0atQaXLyjmTfhKO76qSTn23yazWi64ec8beNr9O+ZykbRlsBpBSim2j90L4PJZXMKGwGdxoQTSa3uSwmf2S6qpnerR/6AvApdaism+qi5pnpWn2l733/eaNyaeD1SSL3+sAiTpZ8BzTXe6Xqp8QZp0MMjDNITW0AJKoUGph8+RjDFtEL/KDjSSjvOhq0P8JeLOWQZJd0EBW3BZYhQlyim44NgJbO9erjg3aLBfMZQTDjj4R+SNJpDpdNqwVifpG79odcG6Lf/q8dE6s1GVTg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.71) 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=cEsX7zvS8/ttna6ZNIIyO8WL+9aiIDOcWOw8/ATK0Bc=; b=Y/p7zQOeh/+johyopCdUzoZPIWyf4apiRkYX6lyGz94IdQ+3H9rQWIpnuVemtk8TeI4Gws0vu5d46HT79g5rOdB9NaS8MiI32aqczHQv4w/dhUd5HveVayFClIJvKD5tPvZIluFHTooyG/G6KsNQawMg7GWilb5hw7B5d6+KgPS/OeSyh0CdkrTnBTh//yGjzhx8G6dkrkSBp4U8sQ2JPI7WzwEkszcqezPjVIgrDYwHyGsJQbhi3lYWNHUIF+xKyDsHI2yx9NNolTqNiVqddRFlSsRnCU+9T0mPab8SkRkJ6LEwleZDcBqspAvAzRbcvYX0NhBIfq+h6+zi203mmQ== Received: from DB6PR0501CA0020.eurprd05.prod.outlook.com (2603:10a6:4:8f::30) by DBAPR10MB4188.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:1ce::8) 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 09:14:06 +0000 Received: from DB5EUR01FT032.eop-EUR01.prod.protection.outlook.com (2603:10a6:4:8f:cafe::a6) by DB6PR0501CA0020.outlook.office365.com (2603:10a6:4:8f::30) 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 09:14:06 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.71) 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.71 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.71; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.71) by DB5EUR01FT032.mail.protection.outlook.com (10.152.4.250) 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 09:14:06 +0000 Received: from DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) by DEMCHDC9SKA.ad011.siemens.net (194.138.21.71) 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 10:14:06 +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 10:14:06 +0100 Date: Tue, 11 Jan 2022 10:13:58 +0100 From: Henning Schild To: Adriaan Schmidt CC: Subject: Re: [PATCH] fix(sstate): don't fail if there are no packages Message-ID: <20220111101358.6ab6a30b@md1za8fc.ad001.siemens.net> In-Reply-To: <20220111080200.3365264-1-adriaan.schmidt@siemens.com> References: <20220111080200.3365264-1-adriaan.schmidt@siemens.com> 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: DEMCHDC8A1A.ad011.siemens.net (139.25.226.107) To DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 09dfba8f-cc43-4626-9770-08d9d4e2b83e X-MS-TrafficTypeDiagnostic: DBAPR10MB4188:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: s3yS5+rznL0VnDub76mAEXEpCpdM9D9eUYOKP3icsiYkuTWZoC8i2bjhDnY/SYBElFB1qrIdYGiD/aLirklXyW7M5j/yGtiKDmKDEYGCQyUHeenwRsSbCL/oOdcfQ2yr9Ca5t+R9lqw3JVJ1NwJSZIjUYGE41e4BP6gd9ad7xKvB+WGUP1vUnpJuetCrV2ZLg4DoOZiND+5IlzD2kfqMLofX/fZmPx8JK5GUrtdYw6zNeYHMm0LafN/p7MaRlbdZoE+4jrla5jJUWLGFqLVyh/V3/zr3y/f3YrCgmCazmUqkrjsiuhedYYmHEEaWcA9O2AhzkD1Mk/IH3yQfr9BNkG6NyeTIgXcPtQGLQawJp5tQbggj7DYKRKQrhHrmEETsGEJ3sGG32lJDgDWD2BD0Jd03TQBKoK3m5GXRuWHhusPNtRFPSqGS0P5WBbozUcrzbANvK3yqLb8/a+Zq943f068xIMMhscewmldaiEJGRN4CBcd3ewcsZJnjBnJfwa/GsaAgJoPIMOu+8aTxuixUS6l6rH40p50eq3BY6y1OsJ/wjb9BQI/pY+wHyHuy0UGQB0PQbkunsenW+5q4iLUsF/p0LbYAyALiTYibH9P6PXhRcYilR1+OE3jK1g3Pmz1znwSvgLvITen8HEEuSe2sntF8Wm2QJe0NDJ8EAs7QVk4hY6lM3lmGU+fzjgO/zVmaMt5u75n8KBXmiqO2CWXgCKB/rCMUrSbCKt7pTsndNWyy1m0d6iy2toE9CinOW5KOTUteVDru7L2YLPsqYlmlzn0nqcZeuf8e1+96Ozy5tpg0XdFZNdsa5taQUcVDKiS14szAWnJTFjMoq/RKzCDUjg== X-Forefront-Antispam-Report: CIP:194.138.21.71;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(4636009)(40470700002)(46966006)(36840700001)(9686003)(44832011)(2906002)(956004)(40460700001)(7696005)(186003)(86362001)(83380400001)(336012)(316002)(356005)(81166007)(6666004)(508600001)(6862004)(55016003)(82310400004)(26005)(82960400001)(70586007)(4326008)(5660300002)(6636002)(70206006)(1076003)(47076005)(8676002)(16526019)(8936002)(36860700001)(36900700001)(360504008);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jan 2022 09:14:06.7661 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 09dfba8f-cc43-4626-9770-08d9d4e2b83e 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.71];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: DB5EUR01FT032.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR10MB4188 X-TUID: SEzKjKQGpTbs 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? regards, Henning > } > > 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() {