From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7051855893335375872 X-Received: by 2002:a17:902:ab0f:b0:14a:691:c100 with SMTP id ik15-20020a170902ab0f00b0014a0691c100mr3217669plb.81.1641888146441; Tue, 11 Jan 2022 00:02:26 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6a00:80a:: with SMTP id m10ls5641023pfk.3.gmail; Tue, 11 Jan 2022 00:02:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJyPi3t3l9bOCkPWfN0Q7o3rpo5t/7CTafXWggP2HACtVh2ureZp/K3dsi90HDun8/oxMuDV X-Received: by 2002:a63:b511:: with SMTP id y17mr3147737pge.442.1641888145786; Tue, 11 Jan 2022 00:02:25 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1641888145; cv=pass; d=google.com; s=arc-20160816; b=aw+ggy4MCpiLW72B91I62d+YG4yjzpe74QpBkqZuoLRzqOaRZ5tD8e3uEEhwAnSUPm sHc4w+cn3l5ahhmYh5tGa3Izzs/YFQmrhfH5c6XAWLIZRza3Z9TUC2pnsVdW22CikIkY tmXix4Y/gCJVHWSi3WPhVwj5YjyJN/ezKA4BOSrBAeaFnzbFUU/vBl/a4I15psfCIBVZ qegZGy0Sie+ZdInU6kj7FHxUEQZu+FtimrCrNgnqw4yovdlNA4RZk5otEUma7Y8DdGuz o6VB5moSGJdAaGROwu+YQbefxhJHZ7J+sACJzM4VxqTlT6aLNBEZ8yKnmZCC17GED35W h1uA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=0GqL04DU8GdVmrm+XuFi16AO1XGjCJDCikuOaKsKfhQ=; b=Gzz36jJc4zb1om1Su9bE+ffuvG2UMv3ybVNDAnM68gkTpNpBn83CjxercU4v+uQlXf jnSBEBJRkfml8YvHv3zDODab5+vTPMOkUQlQ++HX7T46yxUy5HUjgIF7eci1CHeCRp6Q v8XH3NvQbplZExn1sLoJ/mRgUlxjhw15t0Dv03cYDGkwpGy7W5IO61RGr6x+SV+xMA9l oiO7OvaW8u0xAY28XCJiQrMZ/WOOgM/b2Wbzq2+9i+MMzIRg4aUeSlqyAYnw9YI9/lDw r8qTdMih/rOJJe3I8W8ff7Q0aSmrHCbT3k4CsnCreTmbdwetoaS89Dx+1DeopDj+hQpA tgZA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=P6rsIkPb; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of adriaan.schmidt@siemens.com designates 40.107.4.59 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-DB5-obe.outbound.protection.outlook.com (mail-eopbgr40059.outbound.protection.outlook.com. [40.107.4.59]) by gmr-mx.google.com with ESMTPS id ls16si108444pjb.2.2022.01.11.00.02.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Jan 2022 00:02:25 -0800 (PST) Received-SPF: pass (google.com: domain of adriaan.schmidt@siemens.com designates 40.107.4.59 as permitted sender) client-ip=40.107.4.59; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=P6rsIkPb; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of adriaan.schmidt@siemens.com designates 40.107.4.59 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=iYk4PQIvxhFWKEcMxwtCFofHWQtjSPfA+nSxjBYE7WXvzl9bEepwX0FwwfisdnAMo+CGHmfjks7+Gi0XByHopmXp+koRRIB8ZkTR8RtMmEB7zPFICW2mRJFuaoUVxoBZ278hgygQq9OXGPzOlnyAS/pWKjwFYQlflFobwuUKwMZlo79CmLtNAiK2C7GEfZdAxQ0JD+0oVErEFKN5V0WPBGs/MNrJavyglxAPTh5bv3v8kyiWDu1icg+ZD3rdRZ0l3gQGiz0WoR86LlWbfpxgglFoMTh0s22smSAX+YRnannUJUYditfQDc61WUpQ3wU7bUiCbqv4Khxo7ZJXZWQyyA== 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=0GqL04DU8GdVmrm+XuFi16AO1XGjCJDCikuOaKsKfhQ=; b=ic3bg1nj9yvJ0/bBszLGngwmes+AMpsFQNv37xUm/GzLRJc9R6eD+r/+qgPgj+TW96cVKbTmn+mSircl3m6muggrZ8k8WHOUQOQiXoJyy001/cCR+Jp9hoASPxcKeAFr+PW3u53/b6rBJeokrM1Ro7bN6ORwBKooC5CayvwTlUZtVrj5zeE44CL/NjeGX1WZ9UrKqxcWpIZ8xRK2mSsQD2HuHIFAyN5IaLbu3vczp4Xa7ez51pUkzYksL3S/QY8ng/pgg8Ytv1JUkTS+PBEjSSCFQ0Bwdv87//52+a7lYZ/+FjsELUu5gi52p9OXeXMBE6nVvazvd4ScLsQ/Gh5ABQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.70) 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=0GqL04DU8GdVmrm+XuFi16AO1XGjCJDCikuOaKsKfhQ=; b=P6rsIkPbqnCRIwFRBDOLxc0w7KTQRLr/qNXmh6flGVCVtjor+Iwc26R8tMXhezpvAFPaN4BRjfsj7G3mER7ocAY3HGvo1TJVDhgONCcxni/A78u3jPWGd1sbO5C8sVdBCTV+7Ja3nDHgagwEEhUqon/BDB0LHldbdAdr0ICObumV9nxp8mwaUW/0kJyOifGaKqfT4aFEqkYyacdhgPj7/xoDf1GIGy2mSHwtIVF6A2a1IPJSxJ2beaB+VR3/VGuVe+S4QI+dvk22+LetXQl/4S731L0D5ZDu0338Txv58sZ0c3GC6mH5caBqxauGEOIslRYA5uVkyqVQI+4ygMaquw== Received: from AM6PR0502CA0044.eurprd05.prod.outlook.com (2603:10a6:20b:56::21) by DB8PR10MB2827.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:af::29) 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 08:02:23 +0000 Received: from VE1EUR01FT020.eop-EUR01.prod.protection.outlook.com (2603:10a6:20b:56:cafe::bb) by AM6PR0502CA0044.outlook.office365.com (2603:10a6:20b:56::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.9 via Frontend Transport; Tue, 11 Jan 2022 08:02:23 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.70) 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.70 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.70; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.70) by VE1EUR01FT020.mail.protection.outlook.com (10.152.2.234) 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 08:02:23 +0000 Received: from DEMCHDC89XA.ad011.siemens.net (139.25.226.103) by DEMCHDC9SJA.ad011.siemens.net (194.138.21.70) 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 09:02:21 +0100 Received: from random.ppmd.siemens.net (139.25.68.25) by DEMCHDC89XA.ad011.siemens.net (139.25.226.103) 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 09:02:21 +0100 From: Adriaan Schmidt To: CC: Adriaan Schmidt Subject: [PATCH] fix(sstate): don't fail if there are no packages Date: Tue, 11 Jan 2022 09:02:00 +0100 Message-ID: <20220111080200.3365264-1-adriaan.schmidt@siemens.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Return-Path: adriaan.schmidt@siemens.com X-Originating-IP: [139.25.68.25] X-ClientProxiedBy: DEMCHDC89XA.ad011.siemens.net (139.25.226.103) To DEMCHDC89XA.ad011.siemens.net (139.25.226.103) X-TM-AS-Product-Ver: SMEX-14.0.0.3080-8.6.1018-26646.006 X-TM-AS-Result: No-10--12.230400-8.000000 X-TMASE-MatchedRID: FSxjOqe5tUPRz2aNAQRg8+5XhwcbH3zJ+Qwnt0uz0REHXPih1Aq//BQE j9RZgbsWTPm/MsQarwPjE7v208scT0UW7vZW63Vcwdn05DOOzrw9d1nHWxkekJsxrkAXmCq3k56 Vfku2PNELBZEuqIL9SoA+sls4Cb83K8fWbFGReKyx/P8JGgaRQsBvT9NZRcVl4vM1YF6AJbbieY V7J8ae4wtuKBGekqUpOlxBO2IcOBYC1HLeENgz440Y6zkK/Fn6DNLq9KvlaXxfEeCp1GF+Cc3vy pqUzAon X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--12.230400-8.000000 X-TMASE-Version: SMEX-14.0.0.3080-8.6.1018-26646.006 X-TM-SNTS-SMTP: 00BF02C34D9849FAF0DD874242D9E807F737213351DADE4FDFDAB2AD66F0504A2000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d2447693-2cdc-44e6-8113-08d9d4d8b333 X-MS-TrafficTypeDiagnostic: DB8PR10MB2827:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rQUvj8VTch49nTtNGJFuVHI8IUguB8XGXjLerpZyHs6AvpYF3zNIaeynftpobaBawPsIZNYyo3RZTDVCL7t9+oW2svUrHBSqNNHJwN7mFc2HJHlId99KFbuigVqjhF+OabxKAd7EE7huI99qmusaCQSHUTn/ccGMGBfhH5ZF4n9Xp9xsSGJHoUbj9kEy333WbQtYzKwArckiWpvRk296dznKop+6yxCwG39x2L1AXhBum9ovQGJere3oyVPyFDUcRwZYBn9ieWnOOmZ6zZTnzkqo/HWOC/h+alLifsIySICA2HFqiHSh3Qgg0h3iJ3B5bC6D2asA9zk7mxgSqv3snYXwYS0IutZIWrwSDjGUiSR76DwnCzoZnZPfgbLknPJO+y+PTcUu3SrPqmO91asxyy9SZveicTd/m8jc4WwDe04gKKQH+D6ExoOTApaQI4SsQOCefGAK1blAET5VP/bP57B3wDp3YOluBNjyA7V5ySkSofAptD5FhJsSX77sc7op5eaGAJEDWmZKl7GzZBtXa9V15k0cOaRu9xkRbbQf8ut6IOdAwM9YPe/RbEst89YZ050oAjJfcQz06bsKGH7E5lYpBRTqnWhq5Ca5ZCxXLd07fLssqAassgnYHOa7dAtp47WgdQ4mWOhqjwf3qtsPyTDairTZthgBKsHt0E08jmk1lt5iZpDhG6aVQdm5fcVzMgzmBoo5vdkg/i7S1P5kafJmhcfd48sebipClsbwrFaLn3bA0Btva80J4SeI2NBo58YkAzBTwm+mshl/K6/Fe9wEZbQxfMtIHnsIfhOSd8g= X-Forefront-Antispam-Report: CIP:194.138.21.70;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:hybrid.siemens.com;CAT:NONE;SFS:(4636009)(46966006)(36840700001)(40470700002)(47076005)(107886003)(83380400001)(44832011)(16526019)(4326008)(186003)(956004)(2616005)(1076003)(336012)(26005)(6916009)(316002)(5660300002)(8676002)(70586007)(86362001)(508600001)(82310400004)(2906002)(8936002)(356005)(40460700001)(6666004)(70206006)(82960400001)(36860700001)(36756003)(7596003)(7636003)(360504008);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jan 2022 08:02:23.3588 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d2447693-2cdc-44e6-8113-08d9d4d8b333 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.70];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR01FT020.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR10MB2827 X-TUID: 0CcMP82fmOxW 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 } 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() { -- 2.30.2