From patchwork Mon Sep 2 10:31:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pedro Ferreira X-Patchwork-Id: 48570 X-Patchwork-Delegate: steve@sakoman.com 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 6216ACA0ED3 for ; Mon, 2 Sep 2024 10:32:08 +0000 (UTC) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (EUR05-AM6-obe.outbound.protection.outlook.com [40.107.22.84]) by mx.groups.io with SMTP id smtpd.web10.35607.1725273122732170815 for ; Mon, 02 Sep 2024 03:32:03 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@criticaltechworks.com header.s=selector1 header.b=ANaVP9hZ; spf=pass (domain: criticaltechworks.com, ip: 40.107.22.84, mailfrom: pedro.silva.ferreira@criticaltechworks.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ZS6ZGPjAarg4LjoVtmTQPo2McLesIq38vqwXxCsTiu4jJaz+ziH22ADlgpC3G61VxbLUiWdTL209g/NrRd3JKB9bF0muyTUOXfvpiJVxbh88Yjv43+zSTXE86k7RSHlo1or9s/f3zaAt4wMzEPhU8Yz+7CkZ9d4AoFv+4rc4nZJO+V94Z6KRgdrYHRdwORQv4ure/qAZW/343UUZDddst+H5zH81YkIchBc970UyS6AnYV9OKZ2ZqjAwqRDWRIBZ6tHQSNZM66BZRFyezchxefsxfHEDoKD+MQVqsAZ9OVf8I2jxn04HjeIWRespSQY7bbYkqMmY8faRgLHK9oSxBw== 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=TLnII5IsY1lZXJLQn+C8rhgwjVC8LF9iz3DVNMDMcbk=; b=jfxSJOyQgLWRg/iBf1ybEj1bjqJSiUpm6AGUSqUc4kQMzVCigLgbKT9KnsKvAvzBbpMU6u394haaUAq+f6SKFd51v7rMkD7/F/26JJqcafjPUvqOhTODhyqnol2HYeWJdAPU/pC31UKBHIExRSTyiZwt+ndak84tZDDh15HbOwHpTIIXNE/PPV1HBsIiGsNPNAfXh4q9CRxnBc/1cQ9yoD8l2JHBeQCo4gN13cz39o1/0Sb9FDG8Sotx7ECbFhaSmRyByL/ExhyCtQ3cNPW7D8+Rd6PzN8K3zrsOedtA2PixbTKjQKladDO6qQdKSwbUQT3BiJHeusXDnMi2OXf9YA== 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=TLnII5IsY1lZXJLQn+C8rhgwjVC8LF9iz3DVNMDMcbk=; b=ANaVP9hZ8MJg5zEv7ddzKNYAUZehOqcU8Sm7yNksyGEk9/PirWG6di8lfazRaELQhBLxMzg/2ZXvg44W2fgzXJEc0GavE38RL8rMzna2089TO8K5ToiY85J5FOyWXIXTm/3v7cqhMRgmjryY5QxxkrWQhuRWy/EgqsC6vxa2p4NpNvoM4fqi35O+sRqNh3AmEjsUI/OYuKSnFqYslYMu4q3M4DB331llmQE3UP0fff0MteHGQKCtcsTJyk2Lc8zjeSBTTJaiuYB6GbhekYMg++A7X4jGnwJVIvKau7UqReAKF8ouWDY6KRZ/qfFZFalAdjw7WymaecAhDFCYGJBXDg== 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 DBAP193MB0890.EURP193.PROD.OUTLOOK.COM (2603:10a6:10:1c7::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7918.24; Mon, 2 Sep 2024 10:31:56 +0000 Received: from AM8P193MB0900.EURP193.PROD.OUTLOOK.COM ([fe80::c359:f497:ed59:65a1]) by AM8P193MB0900.EURP193.PROD.OUTLOOK.COM ([fe80::c359:f497:ed59:65a1%4]) with mapi id 15.20.7918.024; Mon, 2 Sep 2024 10:31:56 +0000 From: Pedro Ferreira To: openembedded-core@lists.openembedded.org Cc: Pedro Ferreira , Pedro Silva Ferreira , Richard Purdie Subject: [scarthgap][PATCH 1/4] buildhistory: Fix intermittent package file list creation Date: Mon, 2 Sep 2024 11:31:45 +0100 Message-Id: <20240902103148.3762538-1-pedro.silva.ferreira@criticaltechworks.com> X-Mailer: git-send-email 2.34.1 X-ClientProxiedBy: PA7P264CA0502.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:3da::27) To AM8P193MB0900.EURP193.PROD.OUTLOOK.COM (2603:10a6:20b:1ed::9) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM8P193MB0900:EE_|DBAP193MB0890:EE_ X-MS-Office365-Filtering-Correlation-Id: 449eb939-f422-4216-47a1-08dccb3a7807 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|52116014|1800799024|366016|38350700014; X-Microsoft-Antispam-Message-Info: NZAgf+nmQvZDn/dZkpGA0ujckt/79LRG7IQWRX3Pq52P3x02A8yv4v6EijVTtZqJEE0xNY/jDl4AR2JW/nxAXt7ZFXC39aCWU67r1qctMUyV8y/KHuD10neeRPSNJebWHsyTRgOMrLzhDQpce/O5/zJUWA1O4XIX/v71a06+LYcS4AZls5pyOZWcLCYGO6/nSwINF6vQ7NSZuTMxWGylnNMtBMJaBd372ScVjl0OhBdFAGGprwfhk4eH3DlAAjCl8b2M5J+UzhscNSSjlr/K39Hmc4SoyRaooWqDd9AQEKxUufPNdEDklHRuo38hifcweonFsh/q+9pzEWkHKwndgwsg5Cz/tcBC0w4rwIks9WgLBz002xWWVDq6sija8DLaC7jtL4hRnt7CjaKs2jRg1YK6OPcQWXT/PNg/81MHzb12gIrve1VRVGAF86YqrPHbAbvyEMHiEDnvU0WvmcVQ9VPPlrsQCsHQGO3PNvXmsqyqJ1VGRihhPkWPD7dajUvQk76AyNcC+HmfBaHwfBm0FmXu37OXRO5ukEbjC17jaG41IBBK25pkm3C2Mub/FZIz2ZhuvwN3+1fPhH/y+P4ghP32UAxyQCqRvAfPA24PdNZZrLtzjd7D0XxZjExIPRv6z+tTvLHo3jgoK+qoFRerKDscYWVh4yn31aa9hkn0VzYXw2N0wR2pXoW3ZdWtaDgYNkl0ttYt2najTeSVWGBozNFeK6NC5+VZm1wRegu8LyfNCyZsFH37V86QW+G0cbjQdajZAZUWdarfpXP8fONJ65tj9IgHwd18XwgE5VkS9pgowtiHSXpTjrP+zbkDRO0LMWqH2P/CGxD5z5bewYcrsJkiW9pbT4z6dn7WTC7jWXOhP4Zi27niYb3gp/o82tQ1OFt4ypU146GCbLjC51qiQKJVHMfmXmpMvluHS6ahsEv8dEhnj8/CFDDzTIiQALIxfGnszEj6vy6fMbonP7n+OH2KxQKYGRNeGmMSsHPR4V8yrIoMspRF68fU8/2/H8KFkOZ2m+56AOE8ZMGU+IJGEumTEGQpHcuNUSSKM2J5jLdV542AeyTXS5k+xRE9NNrcklM7XQuwPn2JR6KHQdtS59cT3/DrsQGyXcRRXHuw0q8ANGWoPe1H4dV/tjJdiGoT0R9zPjIEVqdZAHXRJdhv7Z04Ssvli6qKNHrD9Y+ntAEVS2PrlwYpyw29Ai1b5EjrIVOLwuGUAvtx+PDBRrbEy3U1GN7xvIGYhIkcBagYcnka1U/LsZrKGBO3P9WkIGOsvyV1ybbxLB/BcjtYWhmCZcJ4kJ4sAkq2nGc+hUU1F5TxfTynyXg1zqMXO6QJNiQwFGupR8z6MqpIOb7JQxMO1m2zI7tzucrTYTa9RZEtXigmEH8bAzqNHx5kY3uRUVUOd7YyrSsZRaGHS7fe4o1Tdg== 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)(376014)(52116014)(1800799024)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: OWPDj4pwDj7zzWJlgD3idETtAZyk+uPO3QmP5USJ1BTG1wpTlFz68MCZmiep3mSnwi8Mf3M0C8kypmqIdU92Yqe17rU1OPDdujeZ1IdCL6LIKYsUaxlqPobmRg4/nqQEXpmTEPK7kL++PmPX+BOO2ae0KMJc4mXx4at7vZBpYQ+DzqBGUFozr4lX4ejpmOkLGccvJQuts1SYr07zMeFKNzIzSdx4seRGmsVlWDyNpN14E4hxieQxkUzkOd1rluEH6G2pQpQOfra6cmdA7wUqGQ/IZ41kErnTTMabjRNdOToO+fKU5XXrzjkq/gbEnEXelG7vO8kpqaTCJO9FmXLhQhL6VSpJyWbcpm9NIxyB4GJi7vyaH6J8rGUNPR0XdE1BhvvvnILzi68jD0sUhzfRtcwVJWmoqYrwejETAibWk/p72uZbNcQ6MeL9mR9Lh6yM+FL6eBW8vhlRSrE7eTqbUzDudweYSlL3y+E6hxlOLuvJz6SeW/4la5ziDEng+M/k/Th9dYGw5pwRyi6fyG94155LLRVDOh/0mzFER5j5uo2ia1A8mAx8mA5mwppWU6J7dZCUM4FNe5900dHMVmUcA6Zg4RoQp31vA9TLJJVPg8W8azfH3XA6rCORnR6/0zxmXM5YzosEguyycC9bOOBwVTW/qL9DJtycocQbrpZTYCCoRDm1khwFLOHtrGtFFOTVg3Jktd5Lum3oAoPsoM0pRezmwzgmQTk2bjF5qJMOTLXfBNTUI4qI35ZlbQd8pmDQbhDSs8Xg/L7lf4DKI4bRr3oDncRyyBkiN1AAbQX1CfibBGEp2NYM1rf7/uXfWsaKUgoyzSO1SazxFc/cYyFD+szXHJcqW5mCER5+jDPCjrEDV7QoeLxN4I4oSYiaQsqeUUUFHmHV5dPRsMeXoWpJNLsecHVMeCNqcZGElirUlJjibbJ35muCQcRw0fDXYNkv6Qi7aW5mINo5ViA+XQ4uwK7YYm3k2y8V1zVWeDWZLN1WkELIBXYsDlfVyYZ33WyW6q8ioM8+l8cPiZ9OiX0vimJh8gDmSs1QiqzPj4Z21DRh8bYcHzxJH1fxCXAK/Mu5E7OQD7fnlE50K3A/lF04ROUpsn6y+YRpp+FKfQz8k3lhIIJGXAE2f24xUYOUh1INnMzs3mAzR/xABJC6b7/cTDPALiYo+Tj+Ok4IuJdy9GiBRYeP6pt3hezDXSf+G4GAxgqG67lHQLySAIfmtmUDioQgQZbfaclV2gaLnG/cKJmFww/7869Chr16mOUfS4n5ZCsjNGYc+CEeLd/FESL/qohdPAiUEP2TZytv2FzzWq/2oQ8JXIYgpHLhuoZ2PSxWV7rBxdOX0Bat3pmkiH35B0/vprsUXS38K3smlj+MD8ShBj0Q0lvM06uYNC1oXmmB0GTB72nD2IgKK1u0KELGV90FKH+zgGTyMxq0eBvczoJMccw7C2xT8uAkdus9G3sR5X0YB0VTS1DxBg25nJe9jh+mhSG3L4rBl+bjIgUEW9/6f5MmIxCwuW+4mNHA1PCRjE0wZZO9VmlDf7Hq4dAq/pk5SlbQ6vAw8QsM2EEKDuzqIjPnDFK0UKvRzRjcJVBtn9QWmRl9Z73PFdC0s/ZBy2RmOuSNLzNxO6MKxTlpj+w= X-OriginatorOrg: criticaltechworks.com X-MS-Exchange-CrossTenant-Network-Message-Id: 449eb939-f422-4216-47a1-08dccb3a7807 X-MS-Exchange-CrossTenant-AuthSource: AM8P193MB0900.EURP193.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Sep 2024 10:31:56.3271 (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: rU5Ep4Vmh20iI68jEoVrfg2wh5dxcww0Cz8nVVgvZm3uWbvWPzxUZfphub6QSw4w5MHUH53D4hCCsc/Rcuq/kKe6GlY3v2+4Yyughc2Lv6I= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAP193MB0890 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 ; Mon, 02 Sep 2024 10:32:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/204080 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 --- 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 2 10:31:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pedro Ferreira X-Patchwork-Id: 48571 X-Patchwork-Delegate: steve@sakoman.com 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 759ABCD13CF for ; Mon, 2 Sep 2024 10:32:08 +0000 (UTC) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (EUR05-AM6-obe.outbound.protection.outlook.com [40.107.22.84]) by mx.groups.io with SMTP id smtpd.web10.35607.1725273122732170815 for ; Mon, 02 Sep 2024 03:32:06 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@criticaltechworks.com header.s=selector1 header.b=WXc/u7CU; spf=pass (domain: criticaltechworks.com, ip: 40.107.22.84, mailfrom: pedro.silva.ferreira@criticaltechworks.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=cyP1Kumb4+fpd3ZzBLM+Z8SBETu67Y1NKXrClxfoyauljgIuhJahhyuttbbaAEfETcvRYhpN6HR0iat0vFvgARK3Z+HpwNiiymhpLqNoNQOJt4ROXwFhS2e8CQhfPV0rzKeW0w+f7kXwAUFKIyReSkTp21UZdWusNEVhA2EDGzuzAbTAUDM0HL03+53Gwb0lWUYkfU7l8Tpij5DKF5+KL+OkasH1cBA0TEuubqS57rGyv3/T73PEBuL3PQ56t+KkhI+iA2FJ/9bCvqUX/rh9h643i0c+BBJ0/KFzqWryfBKvWnT4hjxLzI9UaUGX7ATRpp73R3P18oHtQmmVvfWLqA== 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=h57vZLkjF+iXFPLDTIysrCjmF2EfwomZvHFyCiFCYiQ=; b=l6RrFay3cQKNnLcaZSNnc7HsuWYTj3vKA88Oa7jlLOQoMILnNtfPEdeDaA4/zQlxO8yM81zgPFCxZ0tMcKSvyT/puD5clRluUZX9Fjz3AVbO1ctlMPfhd+sUr3H1rJMGFIPvSBC22CC0bWlyCIQ83GL1LHrFZt4P2WQh9MxJ/GZMJdOArzZKrkxXT6THPcoLqOB9QWRJmGsnUCyydpcxcEfBx+0/ysmDxN+herRs8JohgP/wXGaqB0RNHlKZYFvl88tqiyN/gXqQKosxzl6l9AAlQ2KXV0eFOhcfqOhEAvCfmZnpnaF42I4MOTFDKZEmCwWTVBGd+AnpJZXGmjEcSQ== 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=h57vZLkjF+iXFPLDTIysrCjmF2EfwomZvHFyCiFCYiQ=; b=WXc/u7CU++oT81yzEQ9yVmYZWuH+4NZgVlWed3Su8P0eTFaLEJLjlS2apmMwrJow07OtOz2WB7f957yGX0M168Trt6UfqEtHDX1wp3PDLUwL39VyWoAa5DdhcN11FpmInOrCfD1rH7vQrz46KGlOxoHPD2mxi4MpVXEr3FQIr0EtTac055qqFC8VVVPPQzsloSu0snPwMYLaHhRUzgXalLdEg1AAGG5pxMfpLC5kuFtJXG6Z7ZeV1Tl9B9aoDPJDLUJDVIojaMb++CP8SjPs2RmAqfq2cvKqCyuDkB8afhCbYm01HD0aW9UnZQlkHb4NnyR2Vd9KsFbCsz3Dgiavgw== 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 DBAP193MB0890.EURP193.PROD.OUTLOOK.COM (2603:10a6:10:1c7::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7918.24; Mon, 2 Sep 2024 10:31:56 +0000 Received: from AM8P193MB0900.EURP193.PROD.OUTLOOK.COM ([fe80::c359:f497:ed59:65a1]) by AM8P193MB0900.EURP193.PROD.OUTLOOK.COM ([fe80::c359:f497:ed59:65a1%4]) with mapi id 15.20.7918.024; Mon, 2 Sep 2024 10:31:56 +0000 From: Pedro Ferreira To: openembedded-core@lists.openembedded.org Cc: Pedro Ferreira , Pedro Ferreira , Richard Purdie Subject: [scarthgap][PATCH 2/4] buildhistory: Restoring files from preserve list Date: Mon, 2 Sep 2024 11:31:46 +0100 Message-Id: <20240902103148.3762538-2-pedro.silva.ferreira@criticaltechworks.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240902103148.3762538-1-pedro.silva.ferreira@criticaltechworks.com> References: <20240902103148.3762538-1-pedro.silva.ferreira@criticaltechworks.com> X-ClientProxiedBy: PA7P264CA0502.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:3da::27) To AM8P193MB0900.EURP193.PROD.OUTLOOK.COM (2603:10a6:20b:1ed::9) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM8P193MB0900:EE_|DBAP193MB0890:EE_ X-MS-Office365-Filtering-Correlation-Id: 1bc3b715-7990-49b5-562d-08dccb3a7853 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|52116014|1800799024|366016|38350700014; X-Microsoft-Antispam-Message-Info: smw4TzuG1ikIbV2pbqtSxUgaUhPMjdGiXeGhUIYxmBYeMaMfwN0Jm+67/OLaYD1o19y02cfu4kV0AjneIpzVNrD3oKkLve7Pj5jTRp/u7yc0uLKSvvRYE6BfHn9Cbw6xo87c8pHYvh13KDi8N1oSfn90APuxlZWH2uhTJ+6FbEMoov1s32pznzAedXNQT4e5BXFpwuzQTXFZUEEEmKJJvOxXM6VkStE1tpC944IPzP4m142RP6SDx8+kcIGwgKZYBMUMlCsnOqA66DAK5ltiXgSHO+nqy5ARUJnBggGhcQoDyCgTWIRfN5wfWvLNZsrXx66H5Lk3a0KawsIj3bFP3l9t3sCSxTdCpkfYecbsx3JAo6bqoODcqNMUxGuU4mExP0nZ1atD3/o8MqnheyDyOTLKImME9BabEi9eSnRxqM46Tfe80ZAru49qLATHhMvl3Q5cdERGaCsvY8gwktt/w8gS4XC3TZmmpTO9tb1j6Noslhx2XRdY4EIa6JM3jNYzjzgfGGyppeOuP7QoR0VTNcMI9F8bUCYl1a6cH950/Acc5UxO/GMfjw03/qXyINL1ZmPm3ge2q13PWJqSVxYr3fTlEdx6CskcQGMyDgqFf0aaoXoo8DtTUeMsZ6ueLBnGVASwWp9nircViteTOUM1wcivNFowwpuZ6GP7GbvKtX3pgpxp1ycGz1GTlD9KbDwBMyhk3SLMI9hsgJIEVKPaCApetssesMe2LlyixNM/o0RbfaLK0ZghVhXIc9ssgWnkrXB67r67Gs2VMbAbAGzeaMlNt/t/1bXbCOTQCe7tHhApXvISukSrWe4fy8s0P/NVhdqgYOxAXH/EtouhOu8VA7rlHcYN5KLBgVPrT3zS4HSRKzmmWpiXrD5J2x0En6InXmWvCCOCGYd4gntZWbhfAI0PqB+lLXkeAEpAvVcTnbasyhPRv9c1QUrw5eOVHp/cMf4VH/CMq/twFDLM1DIkeogWf71z0WLRFTIYiUf0JOs2LkR5ix9rZ3+92C2DFctB4i/kQ3Mw27adQ1qYeYOEEBns1t40T6LBAOX9bMBA01QcJ0re0dElzDhSKco8KOf1ev4zpMHkDQX7VjqlwFJyryONK3HA6vcZkJmLK9sYdlVlylEBVtTmWV0/++2GGB3fnFkogQcnNiLNKl/CbNO38r0TvugIWtQXKckKRPKjVO5XaBtKd/8a7AFnElQn5PBHXbJp+rUi8Eq/0NVo97SIsUI51SqrbFf3/Ae1eIoMXOIyHZqUyuQm4cDSv+opq7i3smpwRGVU9QfUurtFgpVBvS2oHiLYXkXXNbvpvZ+v6LDw23G54M0Krbv4WZEiukGkmVhBFVrVFR3dGbgeagVI2sjGOmT8qBUm4iieclBB9otSFKL/lIXDYDk5BzGXDoHGlQFFsHRVt8fAPwjgixskDg== 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)(376014)(52116014)(1800799024)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: HStBYfMhFh/aeDjuDw3EFlZ2ktwcMl58uUah+Gzj4DEI+n5JIumAubN2r9RuHkP0wprqv9+hjZyR7FggWsfGwma7I0e1ELbpje35Bm1PGKC/eicOh2W0Zo/j22LeBjo7mv43t61oNTn75zewb+lpu7/G9mFMZ2mfjtqUVqlHZoBPO8iW53ZcqXXTpV/d+EcW+H0jofokv4f+RnDotzQbFx7NkhwRvsiO9eKHbxTc9Zq5hB3rbm3Dmq1/ON1XWJIYkV44nnjF/6Jd1H4nVqmd+OvHMCNcJtSMSC4eFVT69RGd2VZ6NzMhgGcs2t4mI8yakaumHSRyrzif3IbUGnWqbBqKR4Hsw5lhEw9r1IOOK49oOjl9ZoNomJ3igRqkcfu4EaTWo8g49NPga7wndnxrh/266Gk8TM4Z7zkQpLrLbe1H+f6uGryI/78qszBNPbVivMTW9XyZHpPVeNyXntomXR38p+GV2McugGJYAWuROWZAmNCyqL1K7nKkMfC04QdPb2aw6ZQNeEIGtajun8x36bjaYgrQ6vXhDk6iWEqLsH2BgD6fttuNNam5DrtkFavaPVtW4RZkkQWGwAghhDFGabQ6b+xC6uwriWdxHv2bVLCgp+HAJ4lcQWwGkBs1R+hs/KDxgvkKyLK2daGUCMGtzQQ29DFKYgKoCSXcPxrle7Qy/abIva0fGp3440VJ9vFGvUWNzYIvKI5abr6i4AX8WmIs4Y/TQ4tXngSim8b5MQIehkGXcNDNo6UcA85/7uw6NKJrWArBVcDeVlnKOtvruN7mDMOjiPc9EGh7WgR++baZG+0SA+FTQQg4MBuK8UiBVovZdEBKW4CQYvM2oPegbm5W4ERwBjeB20Sb4upDZEy57S0CKIvmLocIZq4fTQE3+tG5bb73nDXeAzJGvO+DvmFzUbQc6UpyxeOoGbBHQfNujHFX+5g7oWNF7TdkjogyRLOBzwAol8e3iZRojtY3ZNBHga8C+GT3wmdpq+WYpV6el7jC+2b0hwZQgFdNKBgzXxHo0sWsMkQ7dtMm8xAYG/dxBgX+TYCmvXWfEPHw+SmI5OgLVrRhvJBmfueaI4JFNkucFS8JZfnUR9AfszdfEhrcj/Sb6kOO/woO7lbRksHXqc1tNU05BokV2rcKEGe+iMjwM3wGhPALXdAE8Jo47J0yNCpsnynenw7P7jOUhGgrq65lu/9lGEr4xF43y2JCAcXLwKUvAQGiuNLFU3hcLMq4+Qh44Icxb7eacPlIbNUROtrcdt6Tf0UmW/gPvf85R0i8js0giyhBTWIweIoqT8tiwiTF/Nl7kXo6XndFZrgp/rtyMSEin6QZG+jCxVV6CwdgH36b5j/e9PwDQ3X+526jwMTnMVkSfpoIgjWrjYHZMnRNwn4of9xrXoVLhHkxqJsONnxWtTk+Jd+EvQ/Ojw/QVD3Tqhe7SIzLCFpCvDuyQCJYrZlEtIKkd5FzwlZGGJcLiJPbYH2R2KJGPouoUpOIAE8PIWMO5fVIqfEpgU5t9YFeV/QPN58louiBeyU0hdf5emqHEBQoMydD0PUhAP8bHKmAHpTgHkm1+KEhCUxWPbtqxx6r0kstrk0kX1RyQMv0idVvh7oqNFtsIC/bEBX++6XlH506Kt9Zf0GjFD4= X-OriginatorOrg: criticaltechworks.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1bc3b715-7990-49b5-562d-08dccb3a7853 X-MS-Exchange-CrossTenant-AuthSource: AM8P193MB0900.EURP193.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Sep 2024 10:31:56.7940 (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: Fh69cN6JtUAdOACO1ZyEDp8GNFdfw0aRwD+PbThvpoj9UIE8ApsUXm3PjJJYmbvTjJtWF0dOwxdVra+KRGWss/XPdyHIJI9GKsKqWviw5Ks= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAP193MB0890 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 ; Mon, 02 Sep 2024 10:32:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/204081 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 --- 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 2 10:31:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pedro Ferreira X-Patchwork-Id: 48569 X-Patchwork-Delegate: steve@sakoman.com 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 621A3CD342A for ; Mon, 2 Sep 2024 10:32:08 +0000 (UTC) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (EUR05-AM6-obe.outbound.protection.outlook.com [40.107.22.84]) by mx.groups.io with SMTP id smtpd.web10.35607.1725273122732170815 for ; Mon, 02 Sep 2024 03:32:06 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@criticaltechworks.com header.s=selector1 header.b=CRKREcDp; spf=pass (domain: criticaltechworks.com, ip: 40.107.22.84, mailfrom: pedro.silva.ferreira@criticaltechworks.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=YPOADPT2DbvanvuyeoH5kYVSXTwIpNkR712LqKevND5tRZFDk+no+b7IoOMgb/cDQ3Ie0EAnjP/1KVeJToI3p2VjLqIgGbBbvHMFmunrOimjBj/6i2mlquDzPI2IliKvxcuNGGOnRS4pU5KnWgc7r38iT3n3F9Ec0yRj48s7cYgqLVLa+EkyVEBvyDF0yz+N9Khnpku2p/l1bCBzSsO7qbaRmmJHs+8BG2lzetWFUkFqvsxmpnlUBJ1/BiL2VGiuKYlecL0OePaJO+BzsQkTiV0KTqvRzTIT0+mNliwkit2ofeLMBm6l8/JOzBrZPWaB07y3BPX5DhxP24jC4nu+rA== 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=8tp/YyWRxW2yhZAhJfN7XXC/eOWwvKxNJYq7V3RsUOs=; b=yt/8o5qSdUFVi7rn6MnE8Zjuek/j9PXE3InnizAruze+uGDGz6r6JDsBP00DbZko1eTz5uExNuvCOHwHtigqkpwOj5CySnpiEZjnMBFqwUGaXN+EZgXi2zytXRF6zMQy3/GX5I3kpeWnrsp+L3ddmPcncm7U2ojDDoSITAFZTdHKIxjoBmxzpIKx16pvVmLIJ9z+tAvZYGOIjWAaAWml28yJY9Zapwe1otXUJ6UcfqtAOBsWUn796aW0lAkDiMS+/i7gRlNRmh7/UGDgviGU8ZJrEi8jyRVsJMkyQg7izMRN6gBXaZWnmQhNuMan23ub2rQ9r4eC9pPyLRHgImAtwQ== 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=8tp/YyWRxW2yhZAhJfN7XXC/eOWwvKxNJYq7V3RsUOs=; b=CRKREcDpEtsYYzQlMkxDE4eZ+qBzqzEdfVDTgD0D9UDYSJJuOQoCj74dglciMb9J/Y+f3A+TZ5tW0VrXxQF+1AXkmfsCFkpK3Ip9Tqer9SgpdNoVClbKe0J5BszHxMlam1o80q/7xBISXozhlMXt/NoAIlFIjWwblSXyGQZsHyAc6ZyU8syLFYtpatDkeX2dZWQXUrjCYEghA15njYDBCkw0IqFGKVk/tO31/Ps8juvI6NX1qDIG6NpRA8Tnoxq2ESrRwjCF9LMT9x2XRLd8rdS8yj54xiPFPd5KFaCMkIZbmskKWM1ceoViXCE3FF8l1YsYjRANcoMSTSJYYK6ieA== 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 DBAP193MB0890.EURP193.PROD.OUTLOOK.COM (2603:10a6:10:1c7::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7918.24; Mon, 2 Sep 2024 10:32:00 +0000 Received: from AM8P193MB0900.EURP193.PROD.OUTLOOK.COM ([fe80::c359:f497:ed59:65a1]) by AM8P193MB0900.EURP193.PROD.OUTLOOK.COM ([fe80::c359:f497:ed59:65a1%4]) with mapi id 15.20.7918.024; Mon, 2 Sep 2024 10:32:00 +0000 From: Pedro Ferreira To: openembedded-core@lists.openembedded.org Cc: Richard Purdie Subject: [scarthgap][PATCH 3/4] buildhistory: Simplify intercept call sites and drop SSTATEPOSTINSTFUNC usage Date: Mon, 2 Sep 2024 11:31:47 +0100 Message-Id: <20240902103148.3762538-3-pedro.silva.ferreira@criticaltechworks.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240902103148.3762538-1-pedro.silva.ferreira@criticaltechworks.com> References: <20240902103148.3762538-1-pedro.silva.ferreira@criticaltechworks.com> X-ClientProxiedBy: PA7P264CA0502.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:3da::27) To AM8P193MB0900.EURP193.PROD.OUTLOOK.COM (2603:10a6:20b:1ed::9) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM8P193MB0900:EE_|DBAP193MB0890:EE_ X-MS-Office365-Filtering-Correlation-Id: 759d2b23-7e6b-494a-10cd-08dccb3a7890 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|52116014|1800799024|366016|38350700014; X-Microsoft-Antispam-Message-Info: Bv4FZLurhdfL7l5hw4dA7DVwsPzS1PazodOe6unZjNovJ8oHL/tq2T9LHzMTOo1+PrJIEQwvJJ64xGHyr4OL28uLRHVTRdvFfk+jE5aYw3L7dXej+IkpOGBXYPLR7yUhO3Vv6XGJL5TCioY9e2cpiocO00DarOgT+iCtxBJ0UaErnteaUHYSdD4XHSXef5LsKIv/kleXgS3vUovCn+fLuiWySq/sfxEyKKmh9shlSVupC39BYfXRjUNGhD/Pd7eNdIWn4SCj3zS7e94jc/pbsD+rFb90n/WLEZrRNTr9gpRwDFDP8OcRyGFFaYFnBJfqvuj0tJ0p//+E1rDdT9hdV6dcmhhZr82PLi0jt3wJeDkVE822CCMpy7rhr5WxXd+E+o00TbKkEpBpU9x7rT1t7xTI0a+fnFdNsI22G3cLSFprdaMzqYkYHWs3llKHgXkx5D7a4E5VupLKMFxjhJ//RDRN+puf+t1+xQJwHyJNUuip1S9A457P9CPpp4pK8BrlW7LSsrJLMolUdLOVWIzZzF+YRIByMKLMjqGFGDFWHDX4fEncyVkYfkiFF6Eaa407O4w7j9xtIjjVU2wO0eC5oHTJIjNt99F7S2mjuXWI7XJs1N93dH8rc16w8a33q0j84tZEGfgJKw8oNuETXlZDr50kx/F4RQEO6CGLIKWWOfPEjwXxsWikaLgWql9fGbWlTYL2nHWrdnkg0VYESrHQPw8XVGdcd3fJt1UqLIzzwBRM+Pq4LoIag6TWUfBUYrkWYC6umhgN2waRXSAmxdif3r/3M3QBuc702OQEV1J+FhYZAEy3MY4WxXl7XSTNTyUW5dW7JOLzuwY8/K4rynTTvJgUz3pDCPih+H5etj0J6dCCvzHxqZ+P8RmwzB6tgMTHwfHxgoIAw8JDGLo4g7HMU081QxZKIxRjefR3wmDR0QTB2inzSEXpgD/zZARvQtA/mBQlXgwAsJAE5OmAA3iQukJ/cT4ve6ReLEfrP2aqPqDoFfnftsMe+Qjwez5OFjshQAyRjQkZedktXTQ2Sa0FfKsM182nUXJ9DtHpVsCFA1g2I3VKKHIdeLaIkSKYPmFbWi+YHcXFKilQzRVdiQQ+R7nuFfZifnQLkPjHgHXoR6CpwcO9Nu7/cUbHMW0DGvQioCZfGYODO3/C2lsB4U1nzTLJ9zcezwEpr/bldKSbDPYphGmtqzd212xMA32oVkYbG/i5K4IRoUmB1xZVsB/15oDryWavStr882hRPEOr3UsqG4TqbjBVBsVwhGsTv7Z9kq+Px7yHV0+9z714bv13hyeBLRRKsgfhFqYL2cOSFwfH8STsUqU4sBZ06kXM3LlN7sZhhelFRBwe8TQDCmQWh7mGuMlq/1T9RXQms51og53jXzXFwc9/sWQBggprrqzWxpghqCkyCslckCFkKYiSoQ== 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)(376014)(52116014)(1800799024)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: tGI/1u7Ma48yXtaoBQaO4gk7vSXs+XrA8f9ZDD6Bl35bAEewcjzyGqKPDvqLUHlqDPDLkSJsyO6YwdE6d7m4p6WudwiCSGzx7e5zVQF/DKmK4j3/so6ZBc76/GVSFB2u5bvpFhExrzQj7qdsK24/th4JJNDMkHFiTNFWCX/082RloUTo60L/taR/Xz+HbAJEvG23XkZPkBHKjFj+NZHD7B810ZPHCZCADZGI31Km2VIs45hytWsBPjMTiYcjz3PhGJQM0lBmgGpJqN2cpG7B6jGHbgRJWRVedAmCBvCDORkvIOLmqK7L9nhsHBmNkYB6/NCA9ge94MMo+7qsUNmQolQBvxupaKE/5uIWZGCJwPcgMm5DC8oe9cI+1W38r7pVpH1hqggldQo5x2DDL4yIRsZ4xsYJ/jrQ087QfuKgOn9I+51W7BUdwOYhakG0qY41X2AMMsQWrmpEgZhI25awQYz4erWOXQlskLxuIpx2bkjZQGFU0zPN/ujqDKq8VJOAaFfh5ES2stpo7319RMbU4GzYcgBqimpQvN78htFafobmVXPbjvT7VO8SB7LHjAlFHz/0jRYJbu44SPjwA1LfpzKspaF0vJRDxzSnKnGwYY8jvH7ZSoSv0DkWAvEO62HzJJ4nGb6TLKq28NA4DUkiLgKw8XZYF0Vza7iqpHUTARCcnR9rtQufhNPI/nAcMtAT2bBjLXSx0myHdpkr0LEN3FPQsvMZLKOnhebf+L7nizUWqQD+wa4YBDx0NGZAjvQfVan/r20C5b6njRYYKlLaUu7oMt5nfawRWIB910wil2glgUwfap7pWN2p5cKDiYA2FCZjJKAWaYj2bEuu7gPMuKVR7/0G7dtRVGrKXsUDriJfjUpDu8JabGHaNP7I9aaAqxSnu6Ngv8Ybl8gdaExqrlsQQ4oA5NhAAy4KGAQjVs0uoej5ZlPC8WYfYIfKa31uMnIPBjFdG922vHWhAxFqc8zMSbGkeb//4QTIpn+wHtSnRRrgMEzq3K5kh8Ujz34bxcun1lL1GOjyabsMmVbO5jyVXMhK2KMwWFHUj+LpLDpTzZgjF2ozs+ppCHGGPcFVBXA5ijOgSMU9pRRvy6hRLrtcG+KZAGWsAIMEfLQT/cyrOqnvLdkhSDiW00qIExBm4tr4m949eNROD+cbsNoiyjXzWeiiJY3wyeG7iYGo0xKdFWz/tTK7g2/S17ALOV09YWJz5h8baSeX0LLBT7lwKrkzNgZ82snzRyb9U0+15tKQOLaxZtVRtZCZgAOQxXxYGpi4GWU6rks0o20bq5/gmZ9Aq+ogv/ULH36k1RaU9WkAdFJf/VbgK00oHWcW2fVphUVH1PGxgU2p6TT1UJx3N+9HhsJTwJzxLGOV67Dq2NQQI43IUV3splIkMlIPQbGCkyhR+NMA6ZhRluwPgXxVUS62W0tassWsZFaZH5D632C7CsVmljF79NiavlnsINfYJkVyOrqhM81VhByh2BPkTCPtmuovO3gjUrXX1M1Li/V0qZ9+BBtEL74Uooj5rTowHA9kvYe+D0db4lF97/6BM2FFuwJqHHz0JsqVqJHHjjcJR1VJQfDZXivM9IOVZ/GTS8Ay1vsNEIAVyKJjPFRkCa+DhjJXNkKLSSiyf8faOdE= X-OriginatorOrg: criticaltechworks.com X-MS-Exchange-CrossTenant-Network-Message-Id: 759d2b23-7e6b-494a-10cd-08dccb3a7890 X-MS-Exchange-CrossTenant-AuthSource: AM8P193MB0900.EURP193.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Sep 2024 10:31:57.1789 (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: J3V9PM4PilMv7G7+b4wb+zvgmSdnflCElw8UFXUGQez931oaxFQWrdevD+m3HUWvsMAPG9xo0jRY9u//glNRqt/X2wQWxgprlO/nygP6EuU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAP193MB0890 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 ; Mon, 02 Sep 2024 10:32:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/204082 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 --- 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 From patchwork Mon Sep 2 10:31:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pedro Ferreira X-Patchwork-Id: 48572 X-Patchwork-Delegate: steve@sakoman.com 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 44C32CD13CF for ; Mon, 2 Sep 2024 10:32:18 +0000 (UTC) Received: from EUR02-VI1-obe.outbound.protection.outlook.com (EUR02-VI1-obe.outbound.protection.outlook.com [40.107.241.68]) by mx.groups.io with SMTP id smtpd.web10.35610.1725273129449070220 for ; Mon, 02 Sep 2024 03:32:09 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@criticaltechworks.com header.s=selector1 header.b=JV04GD9t; spf=pass (domain: criticaltechworks.com, ip: 40.107.241.68, mailfrom: pedro.silva.ferreira@criticaltechworks.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=USIFi1W+GAd8F1xZYLbSC3uOsqtsopVVz00TyDDVcxoW5gNEpD185kBlZxgZhnTHlbZfMDjubokZ0g93NSZtJlANAe5z6HK6PaHjeKrMoVohl823VJ3Sk5gdOVmkXJE6+lmHLtIQy2VJWzisYvD3TaOHuB31FKsLIXXtHhUH+AcD8MHlykUEcK9g8lYrEhY9jZy1oS+29zMlisf9ehklnicnVdNhneznzGa5pKaO97P88Pn7ilLWJjTiZ2Oi+MeWILZ5mJyumwaen9G6I4q569QWsPUM7NE6TvQofx/BKndpj2xilRAo98vyqumTySp9wqp6nOQF82/E2hQTeq7onQ== 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=uzEsrRWS69FEHOLQDmlu4Eu6Ovs07WFvcpCFjt2Ja78=; b=KJlIWWi3cCz3xiVogUzupU0cek0iodDQNYc3s1vZ2gAyrGxmPEwW3ezgI7MBnxMnA+CXVxolsqg3wpSIo/wlSTf4xM6jgcB1QZklgfP0XWMnEivJx0Qee+1FVXRbupK4qFV4JZKVf0jacUnN+3i8tSbVB+sTQPpsTI/YDFBVSKE/mhkuy8+cnBUIQ7SYu3zEFLJgrDWgpnS6VDocZ5y2j+UpuoOJykxfOaTtwOYohgWcuqYm51pBYJHOpsUao3RCia2rVWW2OPwaAdEUFiaMPlj/4DRXlTRkPEU5TRLsTJ9EXP98A6uHZ8S4X4y442E2FgOna6lJZNQ6Yd717cIQUw== 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=uzEsrRWS69FEHOLQDmlu4Eu6Ovs07WFvcpCFjt2Ja78=; b=JV04GD9tKskmK0FmOyy/Fi0Kl12ExpDLFwxoHZy9U7uMvdSWzCZ+H7qByindOAdgbekEth4TwMTqhn9jUvbsorbqLH16jusaviXypeLbylwKFTQfTNNHq+zdMEzcOKhR6GB0znQan+m1JSRQY22j4drmzEIcg/5IinSPpPZLH8qCzXxszCfU2KF8IEotlsR/15m2U5EOwKsx7PvDhlkA2Ya7IHskzBbjRoS0lMMmPfvGwoakbsRMQpZF2szwLuluCMRa+7hRUXB/fBqphnHpjkd0nrg919chsmAMd37Rt58JopyAFSV6v/qkcha5nKP8MU4wIQ5NnZ3G+pOZQY6VlQ== 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 DBAP193MB0890.EURP193.PROD.OUTLOOK.COM (2603:10a6:10:1c7::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7918.24; Mon, 2 Sep 2024 10:32:00 +0000 Received: from AM8P193MB0900.EURP193.PROD.OUTLOOK.COM ([fe80::c359:f497:ed59:65a1]) by AM8P193MB0900.EURP193.PROD.OUTLOOK.COM ([fe80::c359:f497:ed59:65a1%4]) with mapi id 15.20.7918.024; Mon, 2 Sep 2024 10:32:00 +0000 From: Pedro Ferreira To: openembedded-core@lists.openembedded.org Cc: Richard Purdie Subject: [scarthgap][PATCH 4/4] sstate: Drop SSTATEPOSTINSTFUNC support Date: Mon, 2 Sep 2024 11:31:48 +0100 Message-Id: <20240902103148.3762538-4-pedro.silva.ferreira@criticaltechworks.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240902103148.3762538-1-pedro.silva.ferreira@criticaltechworks.com> References: <20240902103148.3762538-1-pedro.silva.ferreira@criticaltechworks.com> X-ClientProxiedBy: PA7P264CA0502.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:3da::27) To AM8P193MB0900.EURP193.PROD.OUTLOOK.COM (2603:10a6:20b:1ed::9) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM8P193MB0900:EE_|DBAP193MB0890:EE_ X-MS-Office365-Filtering-Correlation-Id: 0a4cc4ae-012a-410a-f15e-08dccb3a78c2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|52116014|1800799024|366016|38350700014; X-Microsoft-Antispam-Message-Info: UHJLhGKl5LW7MPOs+aj2DVX5VhxjtuQtP8mBj9NHHWmnXrPrTidY6BUIDPaIK8CDGL2cjSUo+8GQU/mY5e1J/uWPCgvZCGwqKfSz9k2Xnpp4ac5Bryvr4jtOR0fKI6VretntFXQVFXCIgDsaqThw/EuUQfCEXwbihvAz/rW3/T81wiYsZMWCsHgOWgBhA3pYjQiILvKgl2zv0owougeRugF5ZLvd9WInEHZOspr4MQDPmfbMf0T24+dWZsQOxkoHILzZryMP8O7KPiwm/AoU+FSsqtTrU6MVWYZcuySzArZUuiDUfp3gIOgM13qKhC1bJAHx/J0X1Qtinl0e0Kph5ihdDQlcF11njSdyGbWudQrXZH4aeEc5QE3t2ynDivqSUCfiEpqkSnmdFhBzgmoJhrNRSVE63fQJbdPu1j0FBscFaNTcXp/68hImPrOFlZit4H9mn9QyC/KFRSU34PxNi1zEw0HhhMDhLibDP96M/c36A2453tiwPVwv5059ouXqxyhW7MzM4JZ33iceADE4lHCkL2NV1cG3g2fcUbAJ9FgAB5WJy/3JCUhgJHJB/WGqaNE68X9YPzT2mHliuQL2sfDrZ4AqX6BYkpvoiyOl6jEyyn8XroTUKMRlzsvaJQcTFgV3oXGQTHOa5y2OsG8KG+3pbH+mUNIgq8hT8z41a8p3GUyRvbI1ViHSUaO38Ju0hD3NViwXONjYPUNA9Ae/0xPPD50Z8RiC4PSQNOBFFULPPQex4UwQb7Pj4ISxItk3DQZvrFH5ltiLif4l6GbWeEdaqNBvHNs/9Q8wH6F7Me3KnopUFV7a+EZ+3lFwvrxDilrwnuWjn+uFE+M62eKupTjAZ4QRwu9QU+qahDSdW0gE2SQKivYy7dyMq0No2PQicab2nPROoZuYeU1Qbu8rd/BORTbtF4tQ59knEm1/9oi5+TbSdC/SUW27/azEJZA9lwR2Ck/KwsTIoO18kb1Cmg5PENWnwgjxZQJjtDFVS74hu1RwU6B5StHTK+l7nhZksYSdeXdb7WXeyZVcKOLaCAS9JwbXrMl0CbHkNk3w0IRECvnf5c+T248PjENwB1mvhtxf2/lrRSykRpuRUCZ0MI/7dasNRt6+v+2ugdo725u+DBkxczntWLYTOBav4BB8HmNc+mLZbP9r6wt62n3Ojh3X8WeH5WnqNNQzVX73Og8dbo9U04wLxzWI/XnaAxfLpyhx5VJlICDyZzjTKC3KON+StbkfDosHdsp04KiLMf1gFA6ZaKNMfAw8/pJvyX9QAwKO44Db3Ypx0+KJruIAYdD8QZx66fT98xdm2L649R+n9MG6xvgqzr8TyJrEc4SfnHnzF1TyZKQmYohBIIemsOpW2C8BO5GmTN3T9+4EAJAGQHtY7rtpggjnkGxanRTLaEwGJni2zEN1S6XeZjsklg== 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)(376014)(52116014)(1800799024)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: MlVzX/r3DUglJ4VZufHf12D6WFvN8vQ0tXxokbsrQvdNmOpl0QzbR0xZNnvNC2vdtXnuCJBna2917ECZAH57QVEzOKFBUsL+ApBCOzYf8tD1Ft9m1J7agXE/XQ94xig+QV7c1+todyDWlqmiJSWgUPvwUucBs7kZrT5URuzfKHQVGl1rx64GQQSDCJ5RdtgI+KQGjdQQWJwRa6weFcno9boyhfvKWlOyRZaMtp174pvVvBd3BTQ6n/shD6dSeGXucJuQaOM5i10LttkvNYdJ9In/8bFU9k6t8gc1k7KqrryhL6pQ/EgwBIb41GbhsdKcqLhrm3MvO+nZ7KYeQIp+z2ed2o+knsvYcEFsSSg8bFSMigKmXn6v/RsR1y51oWd2lYmVTJu+dP353kJ6huA59ov8JUX4ICUznEBoiS8Yczoch4vBzgKaEyh5hZzTmoYVWAbTwrQCmk2pPdVadGvqnZwHFEZ7def3hLqkDA75h+/vFoQ35NpZMY5BnSLzjoAgwgGXRbCf1mHF/1AFRsOqwZXHOzBP7o1TTsH3T7Dk++ZbExLy+AscTc0vEHdxMvI9PXajonPBg/f7XQG7/Ddy3CZ0ftUYb+Jf0TD6/WfPImsLFqZfbVfauR4vM+Z0p23YbTe2hOTNBfFOHcIbDmmvOhcaliwfrxgW8Z+oa6X0fc+hWUu4QCud0iq3pgFdWN+2sovI97z6DIMibKvshwbdkNR8PE0sA2WQvuzQI8j7XDD2PNm/miTQkws3Fn+9y+jr2zQG4h2LUmibyprC45o/1gYeJbQPFolhvoZjmrlDqj+sdvoB4UMB8RDZ7iHVJKuiyxaIA8pyiAUdYSdcaeKvcdG1eMgs+lkTi7NcSK/ufEZxiEwVXQb6pGIJCSd5SqnZ3xqFydEv9aH4dAgrggY0fRR/cYIMGQSWgV9ABbJWEdCM1g6N/4et2LHNoxRKsrisMSLKVYxuBCxsaNPHhEK0eiC03OTCYYCgkONTioTqaovu2yZf6TGRJeKim6YT+x+aqbWS6bhB6HBsi5y+ucHAAz2R+Egm9rA6KXFeXlqDpt+ZxEjUKWn8Xfe7xe9/unbGgeJ54pZIF+ukgzkbsqhfZ+Xk1KxZ6hbrCRi2i0+fRXmNOGUtaeNod0R6QDIxz2/PHHnIyssBBkbQjcspGXUesB8RXQLl4wwV9IdBffyteG3iHXifN9Pz2VByEh3ftwPbHkg5qlaD0S/FSMWzn9eHNrHc7F/B6FsEuFCG/2Z1XjSVuRu0py1uj/V/W43nqWXFpl0E7DSnCnnNi82rtzv/j7DEScl1wZpExi83udOF8hZHUJtmI8KwGJngSdPiqd6t4k0OZbKIE5elhqvoiTUc6oLdj7PdbUsJGbhcKkKclYy6Fnxb6WnHhH4lFa7vhOBdBj2hrOPcblIETdSVVl3FFreUTnHF7ZZpVOWM12/1OsgZeaAMby4DSoPtIiMM5BEj9IUwZZEuM9F7GoOfvQGC0sZgxgNDcBF5+6IbWrtCU3YjsvhDcvw3oDpoLmV++Ha0i9GNwadWGfq8CWKC4LfNhTOVpcfpa5YBU8rYN7q+EctXlrxG/B1Rf37fQuO/Dtakk1E/YYOj/8Hk3erJ6hJvGJLeqp/MkelwEyMZmEPU0P4= X-OriginatorOrg: criticaltechworks.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0a4cc4ae-012a-410a-f15e-08dccb3a78c2 X-MS-Exchange-CrossTenant-AuthSource: AM8P193MB0900.EURP193.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Sep 2024 10:31:57.5502 (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: SNKT89hC2FJHkCAInOmiVPc1MKdq4Ukhb5xzYDg6kzLieIcGOkI2Lw7RcxwTi4OX/XPK18YpBeHQSoeG6AonQnkAHPrjiC8W7tBFi0FijYc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAP193MB0890 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 ; Mon, 02 Sep 2024 10:32:18 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/204083 From: Richard Purdie This was deprecated with the introduction of postfunc support for tasks in general and only used by buildhistory. Now that usage has been removed, drop the code from sstate.bbclass. Any other users should be able to use postfuncs too. Signed-off-by: Richard Purdie --- meta/classes-global/sstate.bbclass | 6 ------ 1 file changed, 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-global/sstate.bbclass b/meta/classes-global/sstate.bbclass index 93df5fa9e6..42b7e03513 100644 --- a/meta/classes-global/sstate.bbclass +++ b/meta/classes-global/sstate.bbclass @@ -103,7 +103,6 @@ SSTATECREATEFUNCS[vardeps] = "SSTATE_SCAN_FILES" SSTATEPOSTCREATEFUNCS = "" SSTATEPREINSTFUNCS = "" SSTATEPOSTUNPACKFUNCS = "sstate_hardcode_path_unpack" -SSTATEPOSTINSTFUNCS = "" EXTRA_STAGING_FIXMES ?= "HOSTTOOLS_DIR" # Check whether sstate exists for tasks that support sstate and are in the @@ -332,15 +331,10 @@ def sstate_install(ss, d): if os.path.exists(state[1]): oe.path.copyhardlinktree(state[1], state[2]) - for postinst in (d.getVar('SSTATEPOSTINSTFUNCS') or '').split(): - # All hooks should run in the SSTATE_INSTDIR - bb.build.exec_func(postinst, d, (sstateinst,)) - for lock in locks: bb.utils.unlockfile(lock) sstate_install[vardepsexclude] += "SSTATE_ALLOW_OVERLAP_FILES SSTATE_MANMACH SSTATE_MANFILEPREFIX" -sstate_install[vardeps] += "${SSTATEPOSTINSTFUNCS}" def sstate_installpkg(ss, d): from oe.gpg_sign import get_signer