From patchwork Wed Dec 15 10:03:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Weihmann X-Patchwork-Id: 1525 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 3AA5CC43217 for ; Wed, 15 Dec 2021 10:04:13 +0000 (UTC) Received: from EUR02-VE1-obe.outbound.protection.outlook.com (EUR02-VE1-obe.outbound.protection.outlook.com [40.92.69.13]) by mx.groups.io with SMTP id smtpd.web10.38541.1639562652048623452 for ; Wed, 15 Dec 2021 02:04:12 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@outlook.com header.s=selector1 header.b=QgPHpT0c; spf=pass (domain: outlook.com, ip: 40.92.69.13, mailfrom: kweihmann@outlook.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=f8n3qrH0vGYZTkog+pwKMcrXL1YX7owQf5ceY1RUivHH4hNxEQeaB/AsgYPyHMt9/P9Ha9DoIhq4zZdsZTtzQvrDz0bcGWk/xGVJl6w4UBlhqWbHSyGzye5OLmW0MFlgL1FYCrmFXIs9mzWEOMK0DTDG1I2BLpOMMnz5fvEcKrf7srmQUrzjso1vCpkUCUEyftbbhU5bZwsAqEQ3m/eJiFyu3ERvknyF+iBECzYhjfFAjXDkGInDTWE13mq6xt8zXEf0tRGJZqwuzNqw/ncvUIWjli8L/5rP+HkqhkB1Bbq0+ouLQzqqOlAxkVJman7nEZTn+f5AakFmDhKg1zVb0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=U0GGBaTyTchTdSiHfErT8pTf652cU/VmyoAhOV2TE+0=; b=WiPtrIsdk4GF+LFnURdZFZx+YBQByLSLI1+O0aoP8N/dGq2NKOa0FECybLqvacrNIIcxv2ce+u3Fpjvm8zrLjG/SWH56QmNQXmUpezbzudz5FjQrvraLj9R3G87Ytr6S1VtmpIWfPbwTjEhEnVQgHvBo+GD/AJuEjRkE98CgzaDrs5TZG4n3qd9WOZj73s+4FfnFZy0PYo8cJ9M4TgwclxN4S4Tp5BDIVDQ36/p9P4G3U8GfnrZAtKX0tmKV9IL1fLLi4q14z5o9IuZfy7kaJNp6eHEpOPxMlCYGFar/JedQd3goaRv774iUfbYiySx5ddq35obVVoFdKWopwWiLwA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=U0GGBaTyTchTdSiHfErT8pTf652cU/VmyoAhOV2TE+0=; b=QgPHpT0c94FrH7Kn9peixphO+7bSLAWvhxkES4IXNwajFVHtQU7/ngbYeygybRY5mMr5Qhfjvno2fJDrOgG6JlIsv7zWTl2rPoEOa5oHONYJJE6Bko0rEInZ9ToNuY5HrN4naRcsZdxCm/Q26Mc4IdqcN6WyQ5G5qi045kgGCN3vE/8xw6pAL59+tS4jbUFA//VpBUvBXg6cf74LM2ud61HNwyPGs5M1qYBgnK1bxOvFfx77oRZNL8WtbVqmAdebx1hUvUDlobz5vCINk28HYwikvKDaO2U3AaqpS1ZlfY9Lk41NWneo19CXE7Brftcawpm7w1yC8JqbXJqAcd0QuA== Received: from AM9PR09MB4642.eurprd09.prod.outlook.com (2603:10a6:20b:284::24) by AM0PR09MB4068.eurprd09.prod.outlook.com (2603:10a6:208:191::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4801.14; Wed, 15 Dec 2021 10:04:09 +0000 Received: from AM9PR09MB4642.eurprd09.prod.outlook.com ([fe80::782f:9964:348b:b2fa]) by AM9PR09MB4642.eurprd09.prod.outlook.com ([fe80::782f:9964:348b:b2fa%9]) with mapi id 15.20.4801.014; Wed, 15 Dec 2021 10:04:09 +0000 From: Konrad Weihmann To: openembedded-core@lists.openembedded.org CC: Konrad Weihmann Subject: [meta-oe][RFC PATCH 1/2] oe.lib.recipeutils: add get_layer_name method Date: Wed, 15 Dec 2021 11:03:43 +0100 Message-ID: X-Mailer: git-send-email 2.25.1 X-TMN: [pZ+0P5Rp1hUsF6yJWQyaWzJNNVdpWLgKF8pYxwuG4RlUrS+xL485jrU11U/1FUYs] X-ClientProxiedBy: AM8P190CA0006.EURP190.PROD.OUTLOOK.COM (2603:10a6:20b:219::11) To AM9PR09MB4642.eurprd09.prod.outlook.com (2603:10a6:20b:284::24) X-Microsoft-Original-Message-ID: <20211215100344.3266900-1-kweihmann@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d273fd1c-d85b-4e34-c030-08d9bfb23c50 X-MS-Exchange-SLBlob-MailProps: tBYDyRQCPclxISl++lM8ZOjhKIfmIxnlsQJipVrfYqxrB/YR+UuHZGDv4XcgTpkwJz6enfpEVqEUxuU79L+i+d98lRE94Lh0NjPFEMkSgrrHj0+bLaSz9xmk3s/rz5A9c4L8XJLenfX9MLFO216Kv1fqfPOXWDH5M5CvfeGoJgdr+8Po1wm7kfxbbObcf/9+IM7hS3TKLJ+XNNVTjxLQSuvSkH1DFmGQF9OUDBNezSO6jZezuWyxxAHSoA8ns2PpPqAiSJGDfh4e+mQgsrQTuSN3Ebul3gOoqGdsu4BEsRHgGdYKQNmcNbuemOv2iYGtq8/deoXp8nqcVBGCB75ZjEqM8cAig760DX0Ub9uPys16vk5ymCCqALAJ1cXteaS4sIYIWdYxuT6hMpWamMnE8ZemegUY12e9PDLLwYCn+TMjN7fKLi4bEbOPz0qBEDavz2VA2NWAVGM4aK5Z+xA7aA0ukgKo8/qz/0ep5Zz8XT1UacKEaqs+UuavDWvDMczLlQXCjVvFAtJw0l6oigZ57LdWKR5HXluiwm7V+K7vw8dyJJnsoX6o/m8eR+4MzuHs3jVd9S3ycMVilrA9jf39EVE8U06mw7/clFFpcRawylvmCue0PbzxqT3c1tQQixdkBgcnzh/a9sWTruGRN/4wQb1DfPkuSFRa8b2OF8ozOtCcF0Jdr8ojiDTILTahtrFCv4AkwZy0H7RhXGtDgSB5L/lkmShw7PJVmv3C38umHSa0iXHC3gxdpcI4tZLPd/zukX+Ut6XLxsU= X-MS-TrafficTypeDiagnostic: AM0PR09MB4068:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hmlBQWk8ACtvgBMoq9bE0gAlk0MdQLc/z5/aVZfUfaEo3f3cJNtixzgXcRM89xF+aAXqEPs2OBJkijDwz6PutVWjKZ09Of4dQA7q9cHcM8vJJSzoeVZSsRQiR2ZIgsTccOIXQ0kgfoNu9fZ1fcKYwEyMkv5MdbBqGwlnSQ6OaqCWBcWpTGOTQmPpL740I0u8/fF83jQpxyfC6g8QF/laAYRo/1DT3GG7enH1NtWlNOv4EwtimHnSGbc1tZDuG/DQX/Mw9kNCC7FikZ9MtMuSC8QgnVBS7GDuM8uevW2QNpDTi+70rRVKd3VrHnWfOkY98RxXvkbkCHup+TRKOKbVSEpxjI8PNmeRVMqtJcvscoyJi/0e6GwIKkf13RycZDBC6rSBkKUR8TtZP8IMcIXOOlA1LHzuKo289PmrRDfwdHfZCZro7npGf8u04yv8zVlVZwjjVXAwGNP+nFdyYgReVdSOVA2JMB5Zv0QCnRGsd4BTTqZD55hFccvcmJ7QfTaz9FPyBj8qCEG9veiHDwxvABpkKXaXyUT2dDGQwYY1Jym5sIeriklbGL2Y2Aadq48TwZSbbfXBwAIFQlwhQ2EqHA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: S/2p+X2+7uc3Ecr0r9h7mWRf+TLOEfGzvbh8E2fTSMWVJ84n5AreEPJKCZ2prCpDldtC8wOXLe91l5Ojr3OoMoD10hj6TFhAnHLd2pwjvCPFI1uVWCg4sDWEDWoKPPmrQQAPRnAU2BSxboZXa15cEGCssRMTCB1cKJnzfO2Hq9aw5sm8+w9pOTlfI+ljghCHWiXnLoc68FgmPf84XKmJjvohmYM8mjSPhUK4mhBZAK1ZeBOOsj+rhtzrNA/rGnoBjxgBI2eUQt3b/bBij0EmFPCaACaa0gYX+JsB7vyzR4VZPG5l5CAB6eAouW6zuRgXoeMjYiZTpTXuZUshaFgtz1xlXZPwcade4K7Jidw2EQqw7dSAGV+1kYzITlKBNPrboW8nKV6+E2WfNfD7H3uVo/OM/Jt3spOoZUdvULIQOHN0gMfzwnJ/A2fnjLAzbtwQ4NMtob4Lt5DHn7BBSo7FgtUpwNcdkwy0cxaK5d+t53FRS/Ux6uHXF6rzl2/R8L+Y0Ca77LgqOrGXG4B9MycJNuhsvAWZwUkYaEt1C12rV9sq8mqZDTp+YAZDg+NdhhrBOtUc2yDjppnoKeKUNFqwrumB/S3gww801iC5vX4H5O39bzYWDR2X7OwTR1t9SOIDNm8zr+hQTKLY1lDrpThHNHaMRjOQlcLgZ4QMulyfHxJudOMuieC76pyGsHYm3jIir5XlPBBl9taMjR97XW7m5JZGYdTy46rpn6EqyhYAmOoi9RCW17wAB7CLu6mPvVt6dy0KGxq+nJWvEJmIEG3X93WfWLodxQQ95dKfgZ+VNMVzHc8G/GhTBTFEX97KfcTlbNHsyvPaR44CYBwBwCHkUOgeSiWNDdIZHziYOQ4eFclWb38M9zOQA5VgDFVD/z9v3pBXTlYjnZelXpILIHttzgW958aYEKZ07z3Lhd8b1ZInokwp4aEjxMgxoQt869v+PHPX1kOSfdjpSzeD60pm3Q4s+bMQ/Nykw4xhA9LopSxgUr7DQBMksRueMd/1HZaywUlZsGiYFcmCUd9Te6SJfg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d273fd1c-d85b-4e34-c030-08d9bfb23c50 X-MS-Exchange-CrossTenant-AuthSource: AM9PR09MB4642.eurprd09.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Dec 2021 10:04:09.2268 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR09MB4068 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, 15 Dec 2021 10:04:13 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/159717 so one can get the layer name from a filepath Signed-off-by: Konrad Weihmann --- meta/lib/oe/recipeutils.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py index a0c6974f04..a0e8840c8f 100644 --- a/meta/lib/oe/recipeutils.py +++ b/meta/lib/oe/recipeutils.py @@ -21,7 +21,7 @@ import glob import bb.tinfoil from collections import OrderedDict, defaultdict -from bb.utils import vercmp_string +from bb.utils import vercmp_string, get_collection_res # Help us to find places to insert values recipe_progression = ['SUMMARY', 'DESCRIPTION', 'AUTHOR', 'HOMEPAGE', 'BUGTRACKER', 'SECTION', 'LICENSE', 'LICENSE_FLAGS', 'LIC_FILES_CHKSUM', 'PROVIDES', 'DEPENDS', 'PR', 'PV', 'SRCREV', 'SRCPV', 'SRC_URI', 'S', 'do_fetch()', 'do_unpack()', 'do_patch()', 'EXTRA_OECONF', 'EXTRA_OECMAKE', 'EXTRA_OESCONS', 'do_configure()', 'EXTRA_OEMAKE', 'do_compile()', 'do_install()', 'do_populate_sysroot()', 'INITSCRIPT', 'USERADD', 'GROUPADD', 'PACKAGES', 'FILES', 'RDEPENDS', 'RRECOMMENDS', 'RSUGGESTS', 'RPROVIDES', 'RREPLACES', 'RCONFLICTS', 'ALLOW_EMPTY', 'populate_packages()', 'do_package()', 'do_deploy()', 'BBCLASSEXTEND'] @@ -928,6 +928,14 @@ def find_layerdir(fn): return None return layerdir +def get_layer_name(fn, d): + """ Get the layer name from a filename """ + pth = os.path.abspath(fn) + collection = get_collection_res(d) + for k, v in dict(sorted(collection.items(), key=lambda item: item[1], reverse=True)).items(): + if re.match(v, pth): + return k + return "" def replace_dir_vars(path, d): """Replace common directory paths with appropriate variable references (e.g. /etc becomes ${sysconfdir})""" From patchwork Wed Dec 15 10:03:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Weihmann X-Patchwork-Id: 1526 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 260EAC433FE for ; Wed, 15 Dec 2021 10:04:14 +0000 (UTC) Received: from EUR02-VE1-obe.outbound.protection.outlook.com (EUR02-VE1-obe.outbound.protection.outlook.com [40.92.69.13]) by mx.groups.io with SMTP id smtpd.web10.38541.1639562652048623452 for ; Wed, 15 Dec 2021 02:04:13 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@outlook.com header.s=selector1 header.b=rBA+2guF; spf=pass (domain: outlook.com, ip: 40.92.69.13, mailfrom: kweihmann@outlook.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TbO9xa9WTI8tz70CFNLkI49nfsNH+V6G00kQtjKgqfgaVQHik+/PRkLSiKBBN5lgBjAp4tymUummny22x5iNG0APex3TKgtzRliOSn9tOY9U/VqxiR7OVAdYavq7gci5RzH/ZtM5jKejzbcjWZhSDB6O7gfxiWxdTVzEd2OSg4jgl8QF+NZAfNwIKblQLiLK6lstaiZodFh3M61pweU3xuqzpIRgxXvO8a3ru52XGCDz1PXnynZXXMpwKNTyA4tCTSlzuxT5tibjUlCR1Yl3QlpD3sErXELXS5nudKtrf/GfPmYS0qjRDIrQ2+N6mOLx1whquWKGzzokel5kH7w0hg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=IpYidvYhR3wIuPYNVEUPs/gqCG0rI1d0r4eeKBcGpAE=; b=dYJV9fQYRcVvt9C+QrrYUHUlC/IyHuPbS9BZItrxYo9SKDnCrpixTU74uE5JqLYAtUi0oAOXKiZeLaDpHuehvuk+9Gh7huncIVCQ1NCqUE32GdYd0kXTmX5agg+I0q/6i1Mb/N21+0k1tFpKM96eVtWmEYwbKctjrzqcGFvPdaDQ0BNZ1kryAXIZRFZbbxU5YTLRJgllLLrzJaVTFavfzmjaOT0a4+rb03d6L+daNpJlu9JKKlM4jeYBl8N1cPv2ZvsPk4b9K6znCcXtMe9NGnKpbg5nHeRPAoJeNjW+3OMgo78mPRlM/l6H6lCb6rPjynGPfac/bN59e1iActW0iA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=IpYidvYhR3wIuPYNVEUPs/gqCG0rI1d0r4eeKBcGpAE=; b=rBA+2guFC90qsb4vLBHlCwJ9R65GGQ2ORKooC0GXQOeobwdE/3ja/ZFtqvQWAAw7TxDIFM0wdJtVLsEiojs8qkh/yEGeoZAK1o7saVuiQUpyvzypC/GjgNlzuOU89/Z8DwqZ+z2SDuHgf2tyTwfE/kwAdGaq+pbv6CTt504Jz+0R/sEW9t2dlJRT81Dqylo5yjzIdU/RL+Fjs0h17U1A6Zn3PIyJwu5gyKpZFNLIOQKQtn+qM048kxizH/G8kVJovCpMYDVzUi6VHgqrx16S3N/3thyWkFDbc+DRWFbMzwT0Ktt+jG2xqosp1Gxtb+L9Qy6nY39rwpVMi9gEzDty8w== Received: from AM9PR09MB4642.eurprd09.prod.outlook.com (2603:10a6:20b:284::24) by AM0PR09MB4068.eurprd09.prod.outlook.com (2603:10a6:208:191::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4801.14; Wed, 15 Dec 2021 10:04:10 +0000 Received: from AM9PR09MB4642.eurprd09.prod.outlook.com ([fe80::782f:9964:348b:b2fa]) by AM9PR09MB4642.eurprd09.prod.outlook.com ([fe80::782f:9964:348b:b2fa%9]) with mapi id 15.20.4801.014; Wed, 15 Dec 2021 10:04:10 +0000 From: Konrad Weihmann To: openembedded-core@lists.openembedded.org CC: Konrad Weihmann Subject: [meta-oe][RFC PATCH 2/2] insane: make patch upstream-status configurable Date: Wed, 15 Dec 2021 11:03:44 +0100 Message-ID: X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211215100344.3266900-1-kweihmann@outlook.com> References: <20211215100344.3266900-1-kweihmann@outlook.com> X-TMN: [arsNxVgVf5pn8xzje+jug800ptiQN8xr0pT1NdcTfi+m3pOzgsioMdBvjMDY/DOX] X-ClientProxiedBy: AM8P190CA0006.EURP190.PROD.OUTLOOK.COM (2603:10a6:20b:219::11) To AM9PR09MB4642.eurprd09.prod.outlook.com (2603:10a6:20b:284::24) X-Microsoft-Original-Message-ID: <20211215100344.3266900-2-kweihmann@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 90165419-fa24-4cd8-28aa-08d9bfb23ce2 X-MS-Exchange-SLBlob-MailProps: mBRmoEB1kyKESGhdDjLi5cUGKKByotZqnMKKlqrcNR5RXX5H5x61tXcBBGw+KkimEcnGSprHvShHZ4MYKy/ZV8bK5bMtgFzr5PF8zh7V06hEvoEA4t0jbkMbx7/eMXU+vFDRh8JoQfg2oQlJEcSlqmCWzjnKltlkLxDB/3vFV6GUmKAj04TISfIyo5yqRJcV0lLdCAuXNxuGd6Fr9fzSm2iokkRiWch4Lg4o1uDZrYeHP6Lw84c9MeYvE98yOWTV2kOC4N79+XqpxEKQ/LGNDlgqNYbmTmLMkqf7y1FuSeW4+fjPg2DPDa5Nf5lMbgC5tZDmEqVCEM7M/OFgqlom2PPHnR/qsC5qW8Dfc2/OMqbxsFABn54renZuiA5k47SxB1urN6NYJ9jkL2H88l7lSSr3pzQq83K+0egiCdPAEPm7JYTGVXCUq13aoqEMNwvQGV05+xit4t7aIVoLEvNXKd/w3e3VE/sc4F3IRD1wjYdl3KswZ++U4KVXb7zVDhug6GODoEwcdJnIVViQTSvdGnAENmLQtfjK0kDY3GKLEQH1qcC/OvQiYuSa6LxcvRGHAzDNAYVabTcHICudkafxB2PmcW8RF8Leu1VYH5wfQYNAw81MACd+pPv3rluqmf0kg6SGpBSobfXx6xqfnsERgbc12aDdLD6RhY3aGS9VHYXa6elATX4SzoooRsY/fgdi0QBndhdVMu5X/gZmh2psQmmLxpZ3HiuM8uhMzswhjvDzojc4nOBCTpZiaLbrFREdI2CoV8XfC8U= X-MS-TrafficTypeDiagnostic: AM0PR09MB4068:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vWFbLCtMIiX/vUXao9bTDRjHkECUaBikrvx6JuD12f6Os6JWoVj6ruQydW6ZjwzK6SlM7OCE4RPF48QO3gQBOxMU+U9ROJ3hX+wzEYZEYweOppaNKXAaEXhH+vAAKFEXyJkiZwmqtz3rshGmDYlW5ceJ5XFus8MdmiiOg9HfIqCPiks9xbHJXrixLUK4HjW5v3Krn7hJL+NwmHvLiAOwIrhTWWH7ZuHxQUHWQiSbNRPC3lPwStKh9kyV5xOQN9TT28TlZxOFrpn2KBUy9+zi07qKMu07vsJYGcOwTJQeqPi44GOn0t3FZyNOOZmQanO9otsmn4i7iofybXK6eJYRgCiQEccKlYwy+xAzp8MElGQT1xTyIoGaCCq+6gKzqvf8N2PukwvbNqC9xEppkD5QdnUK74O7HKHkB9ehwqSPJaT1ayqlxGx1XV1QZkTF6ol8I70DZLAZ27ktEXeoX/NCoJqocXB3gMnPRFS7cKkEqf2OKuwccZN2bFjUbAljb/ByZpLP6PXbsh5U5B49hmiCbZqS2XbQprdbfqELHbLoFuHcBxlKd/AGxmhdlcz87SCJuCRk7UgH26R0mNEtt0Z0wg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: zp9G0jPkSrKFZqsfOQaYWAlCjZZpcM4hKsQw66lbzFGacLgDHpcIVRW0ll7qVb89BmI+gKKo9Ku7FYvBbKN4bFTXTHF9xfCtSz1I7b1AiU5IQHeIv/KSllii4Youd3w6I1qPT6z/1joL/09vSC9UlFZzp3+9pqYXVJuuOTckyP8d5derIcvp+U889FwdEf1haIFxPsffrQ3oImMlaiEqxQ42fAurKbP924XCVWrST9U6vp4RiAq+198iGnxIGaKiam3SypEFlb4CgbdnbYkus0qPhRGGs4sA454odM+lwFVCwuuW50OT8Qb4RAdAkE4QB38CzxTqFzjjqeoVB7HZ79D85L8ltUIcx416uAvUPt0qHPQ7OO3JWsQhsPmdQvGhOGET5SCZhhs6t3kYrNGQ8PIeMreEm2mdcoUAFBaNVNT8Ltkrv+aprzEyQE5Rv5lNPFVJlNGry0hdkAnIxFu89yzL801o+yBodCtuNfjrbVo46kc21NIWU1ee8UHJAM6IsR9tf+M4r1c6Myjzjqdd0hrwnTfpqZFr8BR+ACMIC5vqOSOCSCQTivwe9zXpt//PGI0VC1FdpeqJ2uAUfpf04A5vPK86K4ykcD1qzeBsnZ4bdG6hug6Mvph9NMxeCLJ5nKhdj2MeuYqC2lFTQHK42KqqJb89nUt1HVngAm5AD7+PkqzAte1TTRzSGLjKzd8/Hb8raD6w5+lNHDGEhnxz4+m6kjTfTFUlf+FgIYoaf9+3GghsE6cvG/rUyk1M5j8TexMRhnYV5lSf/aKpE6N9K4pdMKjCFvbZB/lVOr1i5qc2uWdu/0fqgvm9N3dASPr4jdCTNeJ1XWepsbB8NTpNpeUgrwk4MY4kyB9HpQyvnV/QK++lYYe/reUQstVA8BV8B1w2GNbwgL1DEgvKknPM7HkyGthKJ6/KHk776NiIH2+DWoTYGGvUnMuc1QLokCxg0lIaG+PLSfyJA/h/fnNEEunq1n5GKpzRTZLSDTrFOR5QOKNmcPi50l2xemJarD0eRizwc/aDhA8bYbe5KSeH9Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 90165419-fa24-4cd8-28aa-08d9bfb23ce2 X-MS-Exchange-CrossTenant-AuthSource: AM9PR09MB4642.eurprd09.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Dec 2021 10:04:10.0392 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR09MB4068 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, 15 Dec 2021 10:04:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/159718 instead of hard coding /meta/ into a skip condition introduce a variable called QA_PATCH_CHECK_LAYER containing a space separated list of layer names to perform the upstrem-status check against. as this will add BBFILE_PATTERN_* and therefore host specific paths to the task hash, we need to exclude do_qa_patch function from task hashing. As it is a postfunc it should run anyway, once do_patch needs to rerun Signed-off-by: Konrad Weihmann --- meta/classes/insane.bbclass | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 240f3aad62..c19cc6f629 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -65,6 +65,8 @@ QA_EMPTY_DIRS ?= " \ # message if the directory is not empty. If it is not specified for a directory, # then "but it is expected to be empty" will be used. +QA_PATCH_CHECK_LAYER ?= "core" + def package_qa_clean_path(path, d, pkg=None): """ Remove redundant paths from the path for display. If pkg isn't set then @@ -1171,12 +1173,15 @@ python do_qa_patch() { # Check if the patch contains a correctly formatted and spelled Upstream-Status import re from oe import patch + from oe.recipeutils import get_layer_name + + check_layer = (d.getVar("QA_PATCH_CHECK_LAYER") or "").split() for url in patch.src_patches(d): (_, _, fullpath, _, _, _) = bb.fetch.decodeurl(url) - # skip patches not in oe-core - if '/meta/' not in fullpath: + # skip patches in all but the configured ones + if get_layer_name(fullpath, d) not in check_layer: continue content = open(fullpath, encoding='utf-8', errors='ignore').read() @@ -1298,6 +1303,7 @@ do_populate_sysroot[postfuncs] += "do_qa_staging " # Check for patch fuzz do_patch[postfuncs] += "do_qa_patch " +do_patch[vardepsexclude] += "do_qa_patch " # Check broken config.log files, for packages requiring Gettext which # don't have it in DEPENDS.