From patchwork Mon Sep 16 07:16:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pedro Ferreira X-Patchwork-Id: 49251 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5F377CDD550 for ; Wed, 18 Sep 2024 17:00:59 +0000 (UTC) Received: from EUR03-AM7-obe.outbound.protection.outlook.com (EUR03-AM7-obe.outbound.protection.outlook.com [40.107.105.44]) by mx.groups.io with SMTP id smtpd.web10.20693.1726678850529329324 for ; Wed, 18 Sep 2024 10:00:51 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@criticaltechworks.com header.s=selector1 header.b=YbeBmzzJ; spf=pass (domain: criticaltechworks.com, ip: 40.107.105.44, mailfrom: pedro.silva.ferreira@criticaltechworks.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Ek9NAGpBdGnjgApwPp6FKg6AdGoJjLL2IBlwi1g4Cku0jI6W7GSg03WMdt0pk49aMu5R5YB99szV09gQ+RxVxS0hpHtJaj34DemI3c5QBbEjldpEVdFv/9aj3Uj/DG3Cny5B7x5V3UVy/j90xn4ikGHP2zRFDLC55Qe5zuf/7xMMv+waevEyGRwM3raZUNoJjdaNBFoG0LBVnL8vtE8uO4CIBUjLzVt360/jEjPKmBf8JWL7xsBoEXu4GMBNbmArFa109L4JzAt1A/Ys3zQEI1OqpixxZnar9KU1bFE6XADph4o9rDxUnNqTYIvQrS3LOU3Yz4+YpAxNGY7yEybKag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=3sw8DhYw1rpIRitWQ93RjK3fPGUxlIr2Oos03MQvd/Y=; b=eSNGGk+PxsCnoXFNKUKQTawOF8SGvZ3z8b2RlEUPuhonRnZsw0sSramMjReaUGT8NqPSe3iJjvFZFz0RlY9jUYe997F9eaxLTDLLcq9fljAi25YaiD2TlhAYKsG5A1jLg4Nk+osQ7VFB3MoYGtXjZpQYKdFPysSy9qhsMk2IZLvicEl7yzWHLvqxtj+aMGkbKE3SKcCjeX/DLVyfI2UKmUNUkX4q20DSK/VxD3AP43+mQMZ6tYivIUTqs2zvgJMWtbOPbvNwVwRpW7TNt2SvEoEviNtRf8B61VSX6H0xmXGSvn3EqhPLBQxofm+7Mei0jhbZWTngOoOBxmqPqAS3vw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=criticaltechworks.com; dmarc=pass action=none header.from=criticaltechworks.com; dkim=pass header.d=criticaltechworks.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=criticaltechworks.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3sw8DhYw1rpIRitWQ93RjK3fPGUxlIr2Oos03MQvd/Y=; b=YbeBmzzJD5DyFS9YInXSvWn7lTkBZTwkIQoz5pMbrSxXZOBaF3jYLv384DdSKF9nd1GafI772HTir4xJ04+oKEhIdUrRGdpmS6p8h6WWLzzlDOWsl+w6FKClDuIOw4uQwlzs13Xth/QIMvF5pTAPHzY70sIU0LDG+USbLKDT0pJZWqqHAsNu2mIcP0olH4b7CcvT36iMm5AuiTzLkIaU2mHEZda7cC9zqpEXvOrgQJPPE2W0oY2DXRQq09yzUzJ6pxsd4uQESBictJHSpxWT3JU2yDsYUSyMrVULQRqUCJK2FELpIY0LFm0/AnFl1FT7zCREjAbAKDBRU2hlUDpdVg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=criticaltechworks.com; Received: from AM8P193MB0900.EURP193.PROD.OUTLOOK.COM (2603:10a6:20b:1ed::9) by PAXP193MB1278.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:156::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7962.24; Wed, 18 Sep 2024 17:00:45 +0000 Received: from AM8P193MB0900.EURP193.PROD.OUTLOOK.COM ([fe80::c359:f497:ed59:65a1]) by AM8P193MB0900.EURP193.PROD.OUTLOOK.COM ([fe80::c359:f497:ed59:65a1%5]) with mapi id 15.20.7962.022; Wed, 18 Sep 2024 17:00:45 +0000 From: Pedro Ferreira To: openembedded-core@lists.openembedded.org Cc: Pedro Silva Ferreira , Richard Purdie Subject: [scarthgap][PATCH v2 1/3] buildhistory: Fix intermittent package file list creation Date: Mon, 16 Sep 2024 08:16:18 +0100 Message-Id: <20240916071620.2831989-1-pedro.silva.ferreira@criticaltechworks.com> X-Mailer: git-send-email 2.34.1 X-ClientProxiedBy: PR1P264CA0152.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:346::10) To AM8P193MB0900.EURP193.PROD.OUTLOOK.COM (2603:10a6:20b:1ed::9) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM8P193MB0900:EE_|PAXP193MB1278:EE_ X-MS-Office365-Filtering-Correlation-Id: 5f799aa7-5421-4a26-0795-08dcd8036fd0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|52116014|376014|366016|38350700014; X-Microsoft-Antispam-Message-Info: PMFAMsJCly8pcA90+/U4stXxlQbg8x6ZmLB4GaGSg1/ByteldF3QUCPaOMni21kN52KhKzqE7L4a65RGZaUhtdfoG8XGjsRLXsk4+zBT58ExQoV4uYlkUbIYMUb2kht2v1JIBtSjNIRgcp64XCJg0ex3q4yOgZCFin4TzEhGfy6e4hKElW2rhb+HjZGU5C4kikKeT4RLUZkopAnBgjyOHhoq9s6GAbyNlEz8B5DKsBs8gm2GW7+CUSjPlmWyKxzeiiLtkfgc/oFVIa1F64ncQfL9+QGijjZYxW8El4OXktd2LSxm6XihhffZkiqrf9Yi1j6yvwZ9DCbaPKtiFspVXlNpXPM2+MHEAFiy1sHFWZAHf2Mw/weTQl1rHGIjLBzcRgC5cmQ9+7T8ZnQpPD2WvREowpf4t2hpcDyZtemQrSKWkp+CiaTXtDD3Se42AtLY8KPZmfyw09Vkzg3d361dazALnu4RcVCCoBFHTkmsKXyU1IQoK0MvTpHSHxZ0sUxj4y8L9AdPEIXldeF8TkV7Nb2HXbRb230zc7j97i7aFMCFZm6WKlB7a7tBQ06ULVFBCn/cJqAAoIUdSPWatIK4TOBUSRaxHLQr9g0Kc8Zh2fsFlVnWbRX01WfKFz5sM3oTtoIAxWsl0my7TRmefLc5IGquu48YTMh7M+nlAy5kE9bsLV9o3OMEoTdiE1K68GX+3RxWi+N5BnjP+D6x1YIYoEF1lHDIX2FSQ3guP7te5VC0k4wDnUiYNJpF0FIEB1cb4eehtdDMefz5O8b8ax3wBcEJxVwVz1pkuDksokBtRFCjoCeB8J1uSflorC9ywhMyxYiBdUBTQfN4b++a48Ac/1InAdzDiR72NBSyreXRM1XmDgvV2bsKUafCXpqE7tYR8h0A66bbOo8My/pMAOJb2dhoKb2IIi4oZQsntmAqVYl+BrPbCm1V/m19fdLodniFIHXaP4SHJZAm6xTCzE+WSZ5hT3TCai3b7MWct4EosV6dagwbFxDn45QH6uy6w+PGwru9TlrMc+OfzBWcjQf5xpvjSsi8GoJc0yzJXkJuve3wGO7XuGMzvRYOuZ2hWqdD+YX95kGE4/VRxF3Y5CNTKBrupKsI/3qDNtPuBoaKhcMB4uDeTRHg1ho28BRazXiNkD4z7Z+iyFmfEHIyTQQ6gNM6nR2b8RdrChU6b/cfnh5j1H1MEKVHCj/3BjAYpkM+G6DGPqc/biQO8LhrzJLqTOWGd83Q40cWbzqVChq2fXKWInEI1x8i3gLokxGFlBFLw90OlYXpMEBB1wiGIZHGGV4LIP3RMOIeYhUYMpBkMvV+rn6O6PROJttiXn3NWu3/dKdIiKlK1Ofxym7myHXry0uuNY8eWY0Cdzg88M2lPNIVok+eAfwdttODPNbmFVWLJvaEvWLERqni2Eb95kizuw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM8P193MB0900.EURP193.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(52116014)(376014)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: vVO6k9nB0rea6oT+44U8V4pvB5mwQcEsEPB1ppfzQxyT9N8CSuDTcKZXHl0x0r5zIti8oRwyZYEAnYb6sbLOx1ORWtKmrSntM79U3px5wvtZLiPIJxFf4CNd/G1+L9gvk0FgWlyLKKOP8N4seRIg5ArLQ1FCbi65SXehJdW/aPV0PGLucOjn2FU2mVryPxK+o1F+I9+0w6G1Hp5UnKEQ2IPXiidtXp2q1Um9yl5KAkFfrJ+EJa3cU18Tkg0W/C8RTYytQLbM6YHE2vi7vdTufBoVVqHlKdbZauemXDcQrcTML7mhjmBkxnnvP1cprJdf1azzqVaWZ1RecHMJi5b+CJZYkexCaJnRwTNc+urgVzMwnuB33ip2Ddx0+SodxtOEBErh0kwrEBFP9j5kKL6ygncmUg74eUOZvAufi+P4SYNcmVdIfpnBWO6fAQc3y+ZC1dDO2S/a6BxBb1WpLxaqGcBCd8a2e61ES9zMrx/hBG6CXwNYMxo2jTBso8dIhox7gn+modsdvrUKoe5q5kIOSBex6Ps5honKZdEcULh1tQUxG/pkylhfd1rrs7LGKtFO0zFkZAka1b3unJW682fZrBfqcHS1SsOhK71xYtx/E1Y0G+7vvTkrLDqyWG14zMUelwpPQK6fT3UwDzJu/CzdEsNCbjiGmvX6s/PriiMIei0zMqNt0i0/wXa+7D0UxBi6xAIR/5scBYGZ4RVFkE/7TkBu8nUfvhSli5wS2Fmshf4pO81ZDmSBwG6G9TbvIeAba4xRD9Ulb/8mlKdjPq9yEIuna4nGYMqKPY4HiQ62fTOERVUPu/EAa8YqdL5VreUvXTOdNkzrT51ckOALY1NCPJ/AfUkimBzJrEtLq4/zSP1zEOK1tlM8jEMYZIVqRpuZFOI2wwDn78ZshwGe1VJU1rrQeap8GEG64Z5ZaVfPDsCi5KIso/3Hnfn8xq3/jHjkg1xBSctlTQOL4KAHXFZ+AFHlQiqqCLvAAcOOFmuWtnl8uuCAO48A7J7Qf+uPmgARPZRAhZMNSMUkjGOZX8XHc4rX1szBeGEo1UGurzDk+AFzQbXGoZydodSkT/yJwMI7Moi3y/pFmN8Uv/d5WWIrF/D7fENhEwZ3GnbSftektp+5Cx2B+fvPKOUJMtQcD0uJ+GMqG0RX6Pu5yNEQM84VPdO83j/JGVrrk0hMYs0sr4BvPiFlfqEFPyWiEfYrLASCXD7deuukha2A4ejQgCZwTunWjKZvtVU+J8bUk/IEvufFzSfRPWyk6jislyGetageJDkNEVX0NbyUkg15U/GiRbEOLK2LbxQ0LT5OvoiBDMVtn6/qIaaWHctM91S68cbjchwNw+E05t7YrW6yug79mKlvDXMPXbeLlMdfPFAmONV5ZW+fymHQAJUg2+2xCsFfw2Q1u20HV7Yz+3AHLp3mo99vornjIsSHBh4RJN7uwaSVtwXkls1WADSlE1txMU/APXiBK0I58HEGEriA/UslMIJysOS8QmsHq7XrICWpPimeDx9wuBjXelGjsCM3Jy9wHqV/sSAc5UMUihYDGW018TZrDzv4Xg2J4W122lzchBzBHvi+PH4Q6/XuuimLGE3OgV/cpR0z2ZgZem4qxz9GdBm8YLwlrRqIQCRhwB2xzo8= X-OriginatorOrg: criticaltechworks.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5f799aa7-5421-4a26-0795-08dcd8036fd0 X-MS-Exchange-CrossTenant-AuthSource: AM8P193MB0900.EURP193.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Sep 2024 17:00:45.3165 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 61f30b8e-4f6b-44fe-9bc2-041e3a9f7346 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: cuL0kgfVhzlXYKJ94oXq1cp6IAqKYpu+MDudWh6wMzUSjZvTFQiKstaxNj6rK6Y1HG+yWEX5OlGz+oFFTr4OOptn5l/7PSBGE0S0QuX8SGQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXP193MB1278 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 18 Sep 2024 17:00:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/204652 The directory that buildhistory_list_pkg_files writes to during do_package is created by do_packagedata so a clean buildhistory doesn't have files-in-package written during the first build since packagedata happens after do_package. Ensure the output package folder is created to avoid missing files-in-package.txt files. Also it ensures that in case of `find` fails we leave with a hard error instead of hiding the error on the for loop. Signed-off-by: Pedro Silva Ferreira Signed-off-by: Richard Purdie (cherry picked from commit 8de9b8c1e199896b9a7bc5ed64967c6bfbf84bea) --- meta/classes/buildhistory.bbclass | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) -- 2.34.1 The information in this communication may contain confidential or legally privileged information. It is intended solely for the use of the individual or entity it addresses and others authorized to receive it. If you are not an intended recipient, you are hereby notified that any disclosure, copying, distribution or action in reliance on the contents of this information is strictly prohibited and may be unlawful. If you have received this communication by error, please notify us immediately by responding to this e-mail and then delete it from your system. Critical TechWorks is not liable for the proper and complete transmission of the information in this communication nor for any delay in its receipt This e-mail is environmentally friendly, just like Critical TechWorks, which lives in a paper-free atmosphere. Therefore, please consider the environment before printing it! diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass index fd53e92402..d219519f86 100644 --- a/meta/classes/buildhistory.bbclass +++ b/meta/classes/buildhistory.bbclass @@ -599,15 +599,12 @@ buildhistory_list_files_no_owners() { buildhistory_list_pkg_files() { # Create individual files-in-package for each recipe's package - for pkgdir in $(find ${PKGDEST}/* -maxdepth 0 -type d); do + pkgdirlist=$(find ${PKGDEST}/* -maxdepth 0 -type d) + for pkgdir in $pkgdirlist; do pkgname=$(basename $pkgdir) outfolder="${BUILDHISTORY_DIR_PACKAGE}/$pkgname" outfile="$outfolder/files-in-package.txt" - # Make sure the output folder exists so we can create the file - if [ ! -d $outfolder ] ; then - bbdebug 2 "Folder $outfolder does not exist, file $outfile not created" - continue - fi + mkdir -p $outfolder buildhistory_list_files $pkgdir $outfile fakeroot done } From patchwork Mon Sep 16 07:16:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pedro Ferreira X-Patchwork-Id: 49249 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4A804CDD54D for ; Wed, 18 Sep 2024 17:00:59 +0000 (UTC) Received: from EUR03-AM7-obe.outbound.protection.outlook.com (EUR03-AM7-obe.outbound.protection.outlook.com [40.107.105.44]) by mx.groups.io with SMTP id smtpd.web10.20693.1726678850529329324 for ; Wed, 18 Sep 2024 10:00:51 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@criticaltechworks.com header.s=selector1 header.b=BWDei0S/; spf=pass (domain: criticaltechworks.com, ip: 40.107.105.44, mailfrom: pedro.silva.ferreira@criticaltechworks.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=jXs7aacwIn9RWoFFH4mj7nB7DFNqOjmkV9gm3+YmW9MeN4O9MQYe++y6CDz1VoqvAo2Wr9bJPZqwR2Ajg5Xc27Fwu4sPgumVF5MVPGzF5XZvSUr5SPbRKuPf74biSIwTSHAM1CJJ4hp7AWJlNJuh9N5DCynugglBloqrEwxYvTI/Mf0PSza0+GMCzGLAaxxzcS24BC+evxGqKJmkMx+W38cTB7PmDIdBCuwxKA59rBjUmii4Nwllb5lcO/bh3d+uWTI2FtDywtGVsXuUs3EXfjiWM8jQf1HyFYg7bhqjSVXpo6xa11nNyrAzcQXzXJxd7XAehQf/gYbP3AAXyQyBIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=dt9QUPxeNdmqES2mhcFlC7kngxBxSdiTGiTeonM9Zkw=; b=f460eK7jpcgQuLiMSmYfjvsrVA6NoRFnPbAE1xOF5zbUE1+r06Vjxbmj59fRE7Xb4YKs2zY8skMdTANP0fDrFP2GkoMqKjRzSBBpL9i/25Mg0TvDUdXqIThUvEDJM3drKoM+clMC+zm3I09rdfmHc9nphMpQS3QtxD4u9cK5YVOv/xNvFbvZcIMDiZaWwiIVPIoP2ArWOzPiN3YIBtFM8d0013doMPsf0dnEIEw+14jcEwCYgFJnvUa45YGSGoWa5U3lwMOQXaL75NMtPVL+8mHkfcGjbc66w0i1k/13eZmp1vbV1QfBBaAV8GDwMg3cQGhv9TCBpo3D5MP/BQmQBA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=criticaltechworks.com; dmarc=pass action=none header.from=criticaltechworks.com; dkim=pass header.d=criticaltechworks.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=criticaltechworks.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=dt9QUPxeNdmqES2mhcFlC7kngxBxSdiTGiTeonM9Zkw=; b=BWDei0S/aTTNg+giGhghnbqdd8PXiScma05SHvZnGnzHOzAf/xbXjZb5o2laNgKQ12GC0lyDYNbZlifoof1S9n2bBK3gKxEVcAYuO0irtoNQQe7wgjxEodLNHyxS2Qd5nG2kCMiY8TIjxcyl6ElY/NtY1qOzTG5Iu3ArD+NNmwAurQSimPgj3Do3XqjfANiSPrNksQ07deymPNHqTAbFfNzHXlprevtppcSByjktnFQlzYJ7iQAPxX7Z+5K1PN70S+C1ikvk5fbdgM//Ht6FFEcSW7v8PB0gZMvA181uol5idgg2C0EMKJJ0P3OFAH54mHSLhclUImSM2NWGnRsejg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=criticaltechworks.com; Received: from AM8P193MB0900.EURP193.PROD.OUTLOOK.COM (2603:10a6:20b:1ed::9) by PAXP193MB1278.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:156::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7962.24; Wed, 18 Sep 2024 17:00:45 +0000 Received: from AM8P193MB0900.EURP193.PROD.OUTLOOK.COM ([fe80::c359:f497:ed59:65a1]) by AM8P193MB0900.EURP193.PROD.OUTLOOK.COM ([fe80::c359:f497:ed59:65a1%5]) with mapi id 15.20.7962.022; Wed, 18 Sep 2024 17:00:45 +0000 From: Pedro Ferreira To: openembedded-core@lists.openembedded.org Cc: Pedro Ferreira , Richard Purdie Subject: [scarthgap][PATCH v2 2/3] buildhistory: Restoring files from preserve list Date: Mon, 16 Sep 2024 08:16:19 +0100 Message-Id: <20240916071620.2831989-2-pedro.silva.ferreira@criticaltechworks.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240916071620.2831989-1-pedro.silva.ferreira@criticaltechworks.com> References: <20240916071620.2831989-1-pedro.silva.ferreira@criticaltechworks.com> X-ClientProxiedBy: PR1P264CA0152.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:346::10) To AM8P193MB0900.EURP193.PROD.OUTLOOK.COM (2603:10a6:20b:1ed::9) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM8P193MB0900:EE_|PAXP193MB1278:EE_ X-MS-Office365-Filtering-Correlation-Id: 048bcf64-2fd9-48a6-982a-08dcd8037017 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|52116014|376014|366016|38350700014; X-Microsoft-Antispam-Message-Info: ucxwfuojq2lEN6MYBBIDcR2mptguA+DmFw4xvddt2OeEKf09RPNiKjtCJweaLxQQEYxI2H7IggVHrF12ymamnXpUlRTOcqX2mqwYvp26UxbRHvIiSWAEmQDaGvVjXiFWz6LiavmZ05m+0BdVbfr7D9552P6WRS6cHm/x9Tb7QJkFqDlfaP64rzR4cogEj1m/zRYb491/f056mRWrnbJ/VA18Qo3pv73p/wI1Wm9pP6ek3CIn6p7nSZNyxCfGgHDKaPyj9lljvdvwX8Cv1s8grRy6oxWLBRoUJv3UzKUb9t+UQJtFusq9bHsv3vNe2xDHBXJDMkKayRc1scfOa+4DVplK1rTYsPYr5giS+76sYIku4pz5RdxnENC0DFQbWTAdFOo74frkMRR5+l8rgu/SlcyMQmSHikKbKX+ZBJMsibRYrpOVJupT5HaiAEYpC/SdEqhGVt5a/FCnxnraRqxqFWr6IA612WLA/PRgyBaAaXPpvlgUS+V6Zxa6AZGm1hrXtFermEOKW5wTEvsPPt5YRyu5BUp2eR/eOxD8lbmPOrt//dDBLBV+KWhwOxKFGRSzo+vruhVZkqgv+dFZLYdyjVKHNWvDEEcdW5rI65eAatoIZuSGIeqijC4NNGI7op60WEICkhKutGVAyN3yvFB9x4bp407oi0WmpAtA7ol85Bsz9qd58oXJgHErq6vKtUHUqlSf9QSG+c0oqrG/fL5IAlJ2ZEG9PlDwevEeqUHlANyOCcTZHiUMr91kA9f7AWjek40JWqKIiPfbewbtJt0RCTezow7NB1VNCagrD/HrluD3fjwkI0CS0THTJNvM+1aQ9EFDzo3bhKOFBgqD93kkrsga62ShtaPczSIZupZSGnx0AqZXT1uYR9d1K0AXWgq+Dqvuf9LIXYu1OgjdLfQgYX6F+T78FCL8Ngtc9BZCmDvPTotiDzB+L3F3CuCiOuCw4JDRTWMG65PSAVJq65fzBWAiu6Rl/YCM5nhbtmG3+zWFlSYnIlBo9MY3WfL3xWx+42mWi3QYqnPpe6LRwD/Vz45igMmG5IH1aG9DdDzCOye9EAxjix8euzGsLPNK53pFB53eku4SRvtHxdbo5RXze7c+nNbIvDDB3fvxvM8PChxtplFk/+k7jH6o2sumBu+xtJ+CAfw5Vbdv+hI9cefzMam6p6JOcUtQiEGTP2XkacgoHHf6yJE4klxA2+D8xq7QBvQPJBIjj1EhLe4/5sud6c24hbaNg3t2mHUbjBqlngPd8s+Nz1T1eIvRUe+uLB+8XSf50U3pJWTXraJE38evHKh3pqRUws+L4z2uycDTcVtooW+dT8E0tvIo5L5IkpHIqFeKhdrK66yQKkiV82wsh+p2f071VMi9yzKjdHMeYywVfe0ZM55i85p97fVwCxe78VcQAiuIsK/CEOWuOGBnqQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM8P193MB0900.EURP193.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(52116014)(376014)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: PQgCPLA8SQXPGziZOMu4IH0gtjzyb4PkOjGHnFVngxD1GzzLqL2c/Ahhr51jxdareJDudoOEBxbJVniSIQ3IfQSMQiI9DEnGUEtTX8hxT30ug2pTkeo5V9nJV1G4IOHD6uftZoZFpcfxsmtxgbhjW7ajGjQ/C8BAkTiXaIUb3Aweg6PxjS4V64zqoDgYwVMAghriPCrjwJ7rJk3yWvF+QfKJ2dOfRBFDIQTdBmUFLJ8jLfWHXNIMYzDs7S5pUxPrr7ha7sdRynxxXPmcrPvLW0exsEWW9FESFXKKhyVviYQ9V8zKyr97Z9oT7YttIah5bn5GzqSIxnByHaY7zdXrW74jdB5eUjrHxEvXFh1qcRKk7DyNyAk/ErgNWYvN9cb9lgcSwsQbaQNqyywLv5LOu26fcauRZNFXrTT/hHuHxY5zAxkza7ejCVMUwvC9Md6m2KAIDZ5zdSZttOjYUdVXrFOcEGZ54pT8+gfdl9k7TUJATfI6pQHOLUEOqL75xfcHqZkp1WhxmhnGRKPwQe0m0woHMvUCtXk9/zAagwmIPEDQBMAMX+I5GiSLPTvC4mupl3kKeZDTPquqRGF4FDDwGiL26YcL7kOJOY68M0JQozkIfgarGrcOsw/QW7vQrsmvIXl1imyo2sulfBI4ezsla3Bs439XifDrKXc9ne2TqIDT+Sjrapn8Yckit8TOnu4exIVNzO8ire+TkagSkHaI87d68Si76ca4ZzGuK6wrjOVWxiTxzZNP+dlYpnOm4pKbjx1nnloR6N90rYK+9MtH+8UGyYJ5tUz4Bx8ZMHMhfaWELo3EPYzy9FrVOGFZqSIhzZxqQ9oiFHeoBW/7gEUjA7odAeoYTDEyjkLcrFrp4QShlh3KKZJg+W6zj6L27/WEK+11wzRBBg7+vGBRSStOh+ZRmASa5dLpUy9VUub6XWp4WXPiKicEg2+MUZZplpb5KLGWzPuAXryZ6DjDAW29ZJ6PBmOv5ABLPET7czue83t01+DHlgC3h575MkuU3K3+3Yo8QqmyKwvMdc9CoHwkp5iCM8iGRLfYncLqrwfTiPZ2FlNDBHZGS34y0zycX1XmiPe7GoBtNFLDavAzSQmcPC81kLZrMfJnCF//aLhzZ9iQyR18mdzcStH3HFXa8JnjmowBHkM9AuARU3KJgwwOaPaujkJ5NQouMgzQTHU7x57VypTVdc/JZ57oJpfbFJ1ARIxeiYtv0/Col4IzppWmbokHviXHGgh/VW/LhrsB3sB14efGr+mgHxMM1Ge1Y6oO0JctM9RmJDVWUze4E/oXn9nMTqdBdzt1TkrSpFGV69OMqR2ycjDbSYxb2a3N7+YbBTbApmjlYzzI2plyQD+kbFCCSGA8rUiqB0n/Zs7h45ovb28wOir17p+cclQwVkex6xAGBKgWNMi4KQZVcPDAahyyij51L1+1mg31u530bA0G3KF6aR0swViHxF488HWTTNPeGzHNapuThVeZeZ6nJzbWTLX045Mb5+p/GZ9G41yD09FkglyHGwk+3ciefStfM99Xurkwf/1dIYY41ZYx3b8Pk3Ua0kzfkAcfI/2ivu+9jSa/ZllA74FnWY+lr6c6QxzNFnVZC9NSxFOGfxUaBcf1WZETzMBoBGyQmUOa5AY= X-OriginatorOrg: criticaltechworks.com X-MS-Exchange-CrossTenant-Network-Message-Id: 048bcf64-2fd9-48a6-982a-08dcd8037017 X-MS-Exchange-CrossTenant-AuthSource: AM8P193MB0900.EURP193.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Sep 2024 17:00:45.7888 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 61f30b8e-4f6b-44fe-9bc2-041e3a9f7346 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: tv0sg/l5fQj4GFS19Y+cSaPqmsBCSrJlwLjmp+HHUyQnh0p27FOl2by4dAuQzThTLmUA+tF5fVlKT6k0cF7gA3er2JC/InvLzXzAfYGwCK8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXP193MB1278 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 18 Sep 2024 17:00:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/204651 This fix will ensure that, when we activate feature `BUILDHISTORY_RESET`, files marked to keep on feature `BUILDHISTORY_PRESERVE` will indeed exist is buildhistory final path since they are moved to buildhistory/old but not restored at any point. Signed-off-by: Pedro Ferreira Signed-off-by: Richard Purdie (cherry picked from commit 9f68a45aa238ae5fcdfaca71ba0e7015e9cb720e) --- meta/classes/buildhistory.bbclass | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) -- 2.34.1 The information in this communication may contain confidential or legally privileged information. It is intended solely for the use of the individual or entity it addresses and others authorized to receive it. If you are not an intended recipient, you are hereby notified that any disclosure, copying, distribution or action in reliance on the contents of this information is strictly prohibited and may be unlawful. If you have received this communication by error, please notify us immediately by responding to this e-mail and then delete it from your system. Critical TechWorks is not liable for the proper and complete transmission of the information in this communication nor for any delay in its receipt This e-mail is environmentally friendly, just like Critical TechWorks, which lives in a paper-free atmosphere. Therefore, please consider the environment before printing it! diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass index d219519f86..08970aafea 100644 --- a/meta/classes/buildhistory.bbclass +++ b/meta/classes/buildhistory.bbclass @@ -110,6 +110,7 @@ python buildhistory_emit_pkghistory() { import json import shlex import errno + import shutil pkghistdir = d.getVar('BUILDHISTORY_DIR_PACKAGE') oldpkghistdir = d.getVar('BUILDHISTORY_OLD_DIR_PACKAGE') @@ -223,6 +224,20 @@ python buildhistory_emit_pkghistory() { items.sort() return ' '.join(items) + def preservebuildhistoryfiles(pkg, preserve): + if os.path.exists(os.path.join(oldpkghistdir, pkg)): + listofobjs = os.listdir(os.path.join(oldpkghistdir, pkg)) + for obj in listofobjs: + if obj not in preserve: + continue + try: + bb.utils.mkdirhier(os.path.join(pkghistdir, pkg)) + shutil.copyfile(os.path.join(oldpkghistdir, pkg, obj), os.path.join(pkghistdir, pkg, obj)) + except IOError as e: + bb.note("Unable to copy file. %s" % e) + except EnvironmentError as e: + bb.note("Unable to copy file. %s" % e) + pn = d.getVar('PN') pe = d.getVar('PE') or "0" pv = d.getVar('PV') @@ -250,6 +265,14 @@ python buildhistory_emit_pkghistory() { if not os.path.exists(pkghistdir): bb.utils.mkdirhier(pkghistdir) else: + # We need to make sure that all files kept in + # buildhistory/old are restored successfully + # otherwise next block of code wont have files to + # check and purge + if d.getVar("BUILDHISTORY_RESET"): + for pkg in packagelist: + preservebuildhistoryfiles(pkg, preserve) + # Remove files for packages that no longer exist for item in os.listdir(pkghistdir): if item not in preserve: From patchwork Mon Sep 16 07:16:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pedro Ferreira X-Patchwork-Id: 49250 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4A838CDD54E for ; Wed, 18 Sep 2024 17:00:59 +0000 (UTC) Received: from EUR03-AM7-obe.outbound.protection.outlook.com (EUR03-AM7-obe.outbound.protection.outlook.com [40.107.105.44]) by mx.groups.io with SMTP id smtpd.web10.20693.1726678850529329324 for ; Wed, 18 Sep 2024 10:00:52 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@criticaltechworks.com header.s=selector1 header.b=W0mCA6Ee; spf=pass (domain: criticaltechworks.com, ip: 40.107.105.44, mailfrom: pedro.silva.ferreira@criticaltechworks.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=jAA8MkdYgHsYwSekm5+0PtpjBFve94D+z4KlHTXThAXBPwGVXCLpPxwvM9JFzPIn9yYGQ+3X7VzS/dw+mUzVX4OJEqTWshH1eJUjTeRYVb5ym01S09YaV/vqZsUvep6ioEWPVEG+b6oXpkMbD4x5HmPPlyamZKCwA5jph5owj34cCbPEFhY27lhbgFLFTZdla9GMA5KTe0FgVyeCGaqa159QzdnVRoiSnbXlUighqWeRt3Eokn7AJwEsihq/4RQ/9VnCTdV+ywY2q0aLTMbtZY0Xd1QsWqzND5qC1qTN0g7HDw+UCuxWrAJ6xAKA1PdQNzQQdTX3BWF+bFYtxoPxyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=eFr1b7RmfolQW2g/Gr7I6xLFLbvJhYPuwcpu3aKBH3E=; b=ZlLytK7zQfpEwqT+BI+H0kZaQVuiUE+Yn6KJEFYjbxXRzZRdJUHPnXfIXpJPv0TyU6COOMl8OBOcC5cxbXBi6yOO9EDRDsZY9M3k5S92gR/bFvs+qCiWfJ4C+P0K0sPqcSn+KQltNYB+Kz//o59YCOKYnm16O5Mb209/lpxJE2eroraPT+F3RYEAeRubENxrGZGQUUvAwLqI7qHL6mOg8iS3HuXbCNV6CEO0P0L/lNl6MpIkz0MYaGNsQ5L3uiUV+iLFWAXnU8mnKuujDCtB1JzqJxUM9Zwg6f08UxicIAY/iE0F0AxEdGmiar3oZd3kF5CYCoZqOhjBN8hmRn3BZQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=criticaltechworks.com; dmarc=pass action=none header.from=criticaltechworks.com; dkim=pass header.d=criticaltechworks.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=criticaltechworks.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=eFr1b7RmfolQW2g/Gr7I6xLFLbvJhYPuwcpu3aKBH3E=; b=W0mCA6Ee0G2k9gMgJ/E0+P/PAjJvjl16A7JmE+A5yvBqiDl2/qzMd9udjsSzxjuv/3Ab9/GN5atT1rQvqAnuwlgFwTlXmeHs6QASW4XOhiuvBKQZqqhSw0u+FdkadNt1tjG/DCLsZ3CImgGhfibjFzNO+3J2m3rJLccbxg9cghIfs2myDFeRvmFENeXfNKfy+3tXCiJvrAyrtaLqGjFN9jq3MlbTZAa0IyIRsTWFXbvr6TqWU+hfqS9BHn8eZYZUTZVt7fbxVsR5OTz5kEdYi38YeIXU07zzOXVhVIFZj0ZJ/9+lXyfCUwbOtkmrljOvIsgUoxhnGWTpi9p9tPTG3w== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=criticaltechworks.com; Received: from AM8P193MB0900.EURP193.PROD.OUTLOOK.COM (2603:10a6:20b:1ed::9) by PAXP193MB1278.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:156::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7962.24; Wed, 18 Sep 2024 17:00:46 +0000 Received: from AM8P193MB0900.EURP193.PROD.OUTLOOK.COM ([fe80::c359:f497:ed59:65a1]) by AM8P193MB0900.EURP193.PROD.OUTLOOK.COM ([fe80::c359:f497:ed59:65a1%5]) with mapi id 15.20.7962.022; Wed, 18 Sep 2024 17:00:46 +0000 From: Pedro Ferreira To: openembedded-core@lists.openembedded.org Cc: Richard Purdie Subject: [scarthgap][PATCH v2 3/3] buildhistory: Simplify intercept call sites and drop SSTATEPOSTINSTFUNC usage Date: Mon, 16 Sep 2024 08:16:20 +0100 Message-Id: <20240916071620.2831989-3-pedro.silva.ferreira@criticaltechworks.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240916071620.2831989-1-pedro.silva.ferreira@criticaltechworks.com> References: <20240916071620.2831989-1-pedro.silva.ferreira@criticaltechworks.com> X-ClientProxiedBy: PR1P264CA0152.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:346::10) To AM8P193MB0900.EURP193.PROD.OUTLOOK.COM (2603:10a6:20b:1ed::9) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM8P193MB0900:EE_|PAXP193MB1278:EE_ X-MS-Office365-Filtering-Correlation-Id: 742c505d-1dc4-4ea5-2a7f-08dcd8037058 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|52116014|376014|366016|38350700014; X-Microsoft-Antispam-Message-Info: I1T0ZB9oRGuCv7iHR2dV6L+m7bi655CaY7z+jNNLyHvsNePX+xd5CYJNkYppHJiBHI5UmFux5Vb90VTRk/qRrf2Y5zehY4Dd7y7TMqRru11hAjzWFe9akVAObeqsw0M9NKgooEDBP5lwXWLXpND+9CfAqXYGWle54V4+1pyV+0FtFvKIzF6YLm6+flDjLA5V9RrdR1PYVLF9FjNx8B7WboTHSUbsx4yOsvK+zZNZBi+lyLnjR8J/Fxlf4Oy3bnXLbrB9QheHrD8kUqbJPzZHuC08zD0wxXovXg2cRHJmc3uLotE/VshdCM9l2J/5lIgZN3F3KG5E1VazZg/VsnZVgmT1FtOB4xV6WpjAkKcxuXWbZyxjmBNe1N0TZvAd2CKvdljfh+kiWmV8ftAoIm0/qMkmREzAtjmhGrP1ptR2WKhwygVI7ZLEsKmKghNqvt7Ws6kFeS5mBmuX2nKxDLLdQ7x89fdqjwtfxlh0FO6r+MzXv0yDkq54dJ4uxpH7kSEmcCBC4bC1gIa0VT0RXbt763i0gRXtNI52uR7ZQ214X9SOdIZV1HT1AZeelZCWvEfmgcx62fUIQ1Q6xM9zxmCQFWhp/d0hoT0ypDu7JUqaX2VyWqA1SlXeo0qi3cZGYyOq+Tt9vV8wLdOnxeqKowZbOnXkzDRLHyHEMck8K9cNJqpFWtF+3FHAsNfoGgqElv+KKdFAKtYRRCbt5im6vi2Uhgxo6Qa/eU3zx/mPxUVKSbn4SbJZ3N6mpxSoFF3oe+Gmv5wJNTdFfxh92kx5VDgdH0caQGu4O3zXaaeUyI4JFzJpPyggRXHto1xMJcq7U4+AQX9AYXPNZ3WQD1k01lfAqu6DXrkjmK/EnKni39kjrLoCQmjX8p0I3kyFtuN+vJWxoSWNrXxlR8uscSYjWMzhfkj/Z/O4MebRHR84WKKcXztzS5p+EGI6MMxLsK+7iqaGIWnhymSKZ91Qb9ieqRLaTz7JcqG5VkFdTjShgFN0lnt7fC+pN8V34e/+/c69xSgp3FXQsxQXdROONeSFKvHGqWvX+Nmy21UVTLKVdTbNmr5wz6NpmXXs1a94boE3cGlbRDAyS35vOm8j70IkJBU9NH+UqAHa/2moow4I9Ut+ZotdOdm4aO0ycADzwO33IGeXlPjgUJnTJY4WYVj8sy+jzb1PP0wT++wDGTXleMWfP2EmnsR0dxeRukKEU000wvJlbKdHg3Q5V/J/tXVHedmBr4RD+jachDak5KBtwUsxm7PWoTgSUP8ktL2LJYWH13LhR7h0/n7ef9C77EznqVpdkQ8+l3WD76QXrAsy9ed5dDDqU7RPU90aruFTjpxb07p8UBDgb3PbRd2T/O1kAAw1eFfYj/I5LcAMBfJxkY76vmtkMhAfhmCr0WTknSOld15Iv63w//bMUBhqXd4TkH9JpA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM8P193MB0900.EURP193.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(52116014)(376014)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 09ott2Lw15g+rWg9kuRi25xVlD6adpHjex/a2HULxaPk8FheySpGshy+1RqiPqjoxO7KhhM9wgAUqHuDxOLyrDUbldtrJ96QcHEYDdSFZ/KXjRHrlpHQ3h5XtQsZCOVfcZVCwKFBUgVwTl+F/lVULgm6NRSgodVv1p9t0KrGcjRRkeWbXlyyWioTmmpGn2PUHesyqbOv3V9DSK+buhQoD4DSWxxXpzYFBNMDYoUDiy/3h95Tup3Sk+R0vkLBhxIY4+81facRvYuT1eGSY3qBxvkEAQ1hFjwVYb570ULqvIVK+aNhFnVFh6E9R1HoCV7NtNrpYPa0I3HwIP1Ph89LYTSi5Juy6cIUyMYfwyE2Hp3YtyXpljiQvGb4GgITkeXDwjrCAAyPcyPE/6Hk96rhlVudKy5pOfRj0fFRPz0O7tt6XvoguJ1lcbfwcdR+AZB5yhmI52m6EHHXHGLvnrXhp/zbXwmlvVXg+byW/q0mT2MDEqBbPvMFo/l6WcZXocUckbnxw1yKVyBepPum/MlijsAdA96T/WYuzfwQIh/wuEvzcpXdedrq7Ejdgu6Ii7PU0r4PaqKVD4pdwBLJst3z88RppS1YZmfEmQ/lEVLLwifX2FYbmiYCd42MLqqAJlg4CH0/8mBBvPdxTcGoVM3TVsuGzIZ8RCLcrOHDazB+e1AdrNqHidh8xrFRlOpaioCM3wBYhcGcOWse43C3n7E905p0Wcz9d5P9fUpSwm+PSFB6FGdV47NJzJ5mesbCZ1a2Wb75eUP2IocQHXXMZHllSUyp3v3pXz6NT3ZvaPiF9GEpx+ZF0ufpz2BvUABoEkI8cC5Jz5lk0PKFluCEAxnYTdYPfSMaoIH7Di0igjduaROhzONEbjlSngTFcpZf9yrWErfnxnq+5CauKFqrmk6cW6fmpImduHu67Ietlhuf9YTyM7IhNme5LsrUEk7MIP1eWPbRWwPoXUeImEDPuybruejGCo6QojYfPbNiNG2LE2bzCwpUNfAOWE3SJ38J8XKpfVOXAHd/X/aJ2GwPxUKcSrNTVo6JBeXHbCKImuCG9hfkKjkg+4IVLiy9lQGD2AIsLJg9AK+xLVNMDNFt64tauB0q+jztUYvrrzTkX93PkuGgQ1JT6DJPCOsXqtA/69sdtI9XdjtsdxlPRPnnyUL3vw/8QMqt50SfyurS6nXCRG0GZVHwoBPulm1SZnA4/6XnfwsYDX+UPAqc+EsyNt8njTkJdNsMNtI29gMzWHNF9yPsBaLgaBIu1iNZ6gI6brTHG6ZwAzi8ob6GktkXMBdJLXoy6Psyr2Y8ZJv2m3C9pvFK3HbJBrAaCnLBoP0DoGuLovOk5TYDloXzIArTeDPKKgnXv9V7xwi8LRJbHxVOLuqyy0SGUp+1vYz4OyEDipXvhaTfL3tCs0cIbJBCm80rjuNAUMDEL4T8j4UWX11Y5G2Y6p8n3pl7B06fkesBgdIYvwkkhoZTWc3z6wm29AhCVbKVqRRsNz2wQLKqZ26EoeMlV5QhRbNqr0Gt0dFtTNjoMoBe2gq/9V5rrlN/3opDPUIL91CoN7aZKGQYU+m4XkFjP0b0BNrlED8ucT3TLiatBLAcoMf2v7bwcReEjLn0j+8Qk/90sb8x3CVWjHmpozQ= X-OriginatorOrg: criticaltechworks.com X-MS-Exchange-CrossTenant-Network-Message-Id: 742c505d-1dc4-4ea5-2a7f-08dcd8037058 X-MS-Exchange-CrossTenant-AuthSource: AM8P193MB0900.EURP193.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Sep 2024 17:00:46.2247 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 61f30b8e-4f6b-44fe-9bc2-041e3a9f7346 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: h9QSEcGVBfwsKhNfYohWejIu0lim3vrdhZ8A3Rm4FLUp8BGOHCQyLU4U/YJMa851v0Yj45QK5CUUv5pWMWO1YJ85KNM21dAYbkgVQUEgBGE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXP193MB1278 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 18 Sep 2024 17:00:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/204653 From: Richard Purdie We planned to drop SSTATEPOSTINSTFUNC some time ago with the introduction of postfuncs. Finally get around to doing that which should make the buildhistory code a little more readable. Unfortunately ordering the buildhistory function calls after the sstate ones is difficult without coding that into the sstate class. This patch does that to ensure everything functions as expected until we can find a better way. This is still likely preferable than the generic sstate postfuncs support since the function flow is much more readable. Signed-off-by: Richard Purdie (cherry picked from commit c9e2a8fa2f0305ef1247ec405555612326f798f8) --- meta/classes-global/sstate.bbclass | 5 +++- meta/classes/buildhistory.bbclass | 39 +++++++++++++++--------------- 2 files changed, 23 insertions(+), 21 deletions(-) -- 2.34.1 The information in this communication may contain confidential or legally privileged information. It is intended solely for the use of the individual or entity it addresses and others authorized to receive it. If you are not an intended recipient, you are hereby notified that any disclosure, copying, distribution or action in reliance on the contents of this information is strictly prohibited and may be unlawful. If you have received this communication by error, please notify us immediately by responding to this e-mail and then delete it from your system. Critical TechWorks is not liable for the proper and complete transmission of the information in this communication nor for any delay in its receipt This e-mail is environmentally friendly, just like Critical TechWorks, which lives in a paper-free atmosphere. Therefore, please consider the environment before printing it! diff --git a/meta/classes-global/sstate.bbclass b/meta/classes-global/sstate.bbclass index 76a7b59636..93df5fa9e6 100644 --- a/meta/classes-global/sstate.bbclass +++ b/meta/classes-global/sstate.bbclass @@ -161,7 +161,10 @@ python () { d.setVar('SSTATETASKS', " ".join(unique_tasks)) for task in unique_tasks: d.prependVarFlag(task, 'prefuncs', "sstate_task_prefunc ") - d.appendVarFlag(task, 'postfuncs', " sstate_task_postfunc") + # Generally sstate should be last, execpt for buildhistory functions + postfuncs = (d.getVarFlag(task, 'postfuncs') or "").split() + newpostfuncs = [p for p in postfuncs if "buildhistory" not in p] + ["sstate_task_postfunc"] + [p for p in postfuncs if "buildhistory" in p] + d.setVarFlag(task, 'postfuncs', " ".join(newpostfuncs)) d.setVarFlag(task, 'network', '1') d.setVarFlag(task + "_setscene", 'network', '1') } diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass index 08970aafea..0b1bd518fe 100644 --- a/meta/classes/buildhistory.bbclass +++ b/meta/classes/buildhistory.bbclass @@ -47,11 +47,18 @@ BUILDHISTORY_PUSH_REPO ?= "" BUILDHISTORY_TAG ?= "build" BUILDHISTORY_PATH_PREFIX_STRIP ?= "" -SSTATEPOSTINSTFUNCS:append = " buildhistory_emit_pkghistory" -# We want to avoid influencing the signatures of sstate tasks - first the function itself: -sstate_install[vardepsexclude] += "buildhistory_emit_pkghistory" -# then the value added to SSTATEPOSTINSTFUNCS: -SSTATEPOSTINSTFUNCS[vardepvalueexclude] .= "| buildhistory_emit_pkghistory" +# We want to avoid influencing the signatures of the task so use vardepsexclude +do_populate_sysroot[postfuncs] += "buildhistory_emit_sysroot" +do_populate_sysroot_setscene[postfuncs] += "buildhistory_emit_sysroot" +do_populate_sysroot[vardepsexclude] += "buildhistory_emit_sysroot" + +do_package[postfuncs] += "buildhistory_list_pkg_files" +do_package_setscene[postfuncs] += "buildhistory_list_pkg_files" +do_package[vardepsexclude] += "buildhistory_list_pkg_files" + +do_packagedata[postfuncs] += "buildhistory_emit_pkghistory" +do_packagedata_setscene[postfuncs] += "buildhistory_emit_pkghistory" +do_packagedata[vardepsexclude] += "buildhistory_emit_pkghistory" # Similarly for our function that gets the output signatures SSTATEPOSTUNPACKFUNCS:append = " buildhistory_emit_outputsigs" @@ -91,27 +98,15 @@ buildhistory_emit_sysroot() { # Write out metadata about this package for comparison when writing future packages # python buildhistory_emit_pkghistory() { - if d.getVar('BB_CURRENTTASK') in ['populate_sysroot', 'populate_sysroot_setscene']: - bb.build.exec_func("buildhistory_emit_sysroot", d) - return 0 - - if not "package" in (d.getVar('BUILDHISTORY_FEATURES') or "").split(): - return 0 - - if d.getVar('BB_CURRENTTASK') in ['package', 'package_setscene']: - # Create files-in-.txt files containing a list of files of each recipe's package - bb.build.exec_func("buildhistory_list_pkg_files", d) - return 0 - - if not d.getVar('BB_CURRENTTASK') in ['packagedata', 'packagedata_setscene']: - return 0 - import re import json import shlex import errno import shutil + if not "package" in (d.getVar('BUILDHISTORY_FEATURES') or "").split(): + return 0 + pkghistdir = d.getVar('BUILDHISTORY_DIR_PACKAGE') oldpkghistdir = d.getVar('BUILDHISTORY_OLD_DIR_PACKAGE') @@ -621,6 +616,10 @@ buildhistory_list_files_no_owners() { } buildhistory_list_pkg_files() { + if [ "${@bb.utils.contains('BUILDHISTORY_FEATURES', 'package', '1', '0', d)}" = "0" ] ; then + return + fi + # Create individual files-in-package for each recipe's package pkgdirlist=$(find ${PKGDEST}/* -maxdepth 0 -type d) for pkgdir in $pkgdirlist; do