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