From patchwork Fri Aug 18 17:44:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Johnston X-Patchwork-Id: 29149 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 56424EE4988 for ; Fri, 18 Aug 2023 17:48:20 +0000 (UTC) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (NAM10-DM6-obe.outbound.protection.outlook.com [40.107.93.135]) by mx.groups.io with SMTP id smtpd.web10.864.1692380896295340605 for ; Fri, 18 Aug 2023 10:48:16 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@ni.com header.s=selector1 header.b=R5BfzNM0; spf=pass (domain: ni.com, ip: 40.107.93.135, mailfrom: charlie.johnston@ni.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j9qM6lwVNnqty0EuyksnJ591DvFWgYPSM6h065cgkRsBgX1xUJ2pxDzZI1d+CYppGneSoTbLm0acJBpVgKsAL6T9CznuoG+R5qs+vpki3C3f0WBuN7Kd9AdKVhGLLo1bsESvsDyPZ1QWgm4XKNP8qZwv3Kojy3N2WTz1MiWFZeXlYIgB2vjRyPty/FUv0V9pagXv2VPX/p7QFWzMSxEoHApJzK0FcsYbWiPFKRjOpkNaz5iVbHkH86qmf2CzG+lbvGZa/i1Np4FlpfNNTIHqwp9QIakLAFH6DKEsi+Sk1IwBTlt9U8MB/eWja847+DeGO/QHDBlt1zUB7TKwyIN0YQ== 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=uJu6vLnqp/c9cD/I91bvOTLDqKc/AHTu+f7nL16Hgxk=; b=Ah6ZzOIWDXA7//akhybGYn5N7mvV2g58BmxjcXDAteb0hp5x8r0dv5D6qzk0/tuqwtk0ORQWDNafUuU77b6OzJSGfsuo8qxbTx+XNZqhxRGeODfo6gGBC12+axM7wIkawEwIOYMI14ZGNpd+pvIzlQ/YPYiPXU5jdcvt2uJ9mJX+Twbl4BXp5X7TghvPs/1tGXoY09qMdHIh5AkuHD5P4LxfiwDjwpnY7TcVgP+Md1NJy9DiEzQndrnTeGBdQ9w1+nQxe6UpGmSgy/uyTVqHuUz7q2rOpYMs6JEumW54syMhleWauOAEjzLZagK9o+AwvhisLCIJZ42UesaZrpv9qg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=ni.com; dmarc=pass action=none header.from=ni.com; dkim=pass header.d=ni.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ni.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=uJu6vLnqp/c9cD/I91bvOTLDqKc/AHTu+f7nL16Hgxk=; b=R5BfzNM0nloSdG7pDdIu4c7zTeE8y5EFKuw8B4GIik2r0be/eS0UV+6kCm5za3FSP4DL5I0pfLrpilbl/a18zJtbBfsBxgrFdp1HeVXEh6GqfcXsNbBefWWVMpK0SE/fg2kcPGnUd+GFavwaqqaCctXt9971tz2awfarLsUcewI= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=ni.com; Received: from BYAPR04MB4870.namprd04.prod.outlook.com (2603:10b6:a03:4a::15) by SJ2PR04MB9012.namprd04.prod.outlook.com (2603:10b6:a03:563::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.29; Fri, 18 Aug 2023 17:48:06 +0000 Received: from BYAPR04MB4870.namprd04.prod.outlook.com ([fe80::9f2d:5e4c:747a:6add]) by BYAPR04MB4870.namprd04.prod.outlook.com ([fe80::9f2d:5e4c:747a:6add%5]) with mapi id 15.20.6699.020; Fri, 18 Aug 2023 17:48:06 +0000 From: Charlie Johnston To: openembedded-core@lists.openembedded.org CC: Charlie Johnston Subject: [oe-core][PATCH v3 1/8] bitbake.conf: Add new DEPLOY_DIR_FEED variables. Date: Fri, 18 Aug 2023 12:44:50 -0500 Message-ID: <20230818174754.988128-2-charlie.johnston@ni.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230818174754.988128-1-charlie.johnston@ni.com> References: <20230818174754.988128-1-charlie.johnston@ni.com> X-ClientProxiedBy: SN6PR01CA0028.prod.exchangelabs.com (2603:10b6:805:b6::41) To BYAPR04MB4870.namprd04.prod.outlook.com (2603:10b6:a03:4a::15) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BYAPR04MB4870:EE_|SJ2PR04MB9012:EE_ X-MS-Office365-Filtering-Correlation-Id: 6afdb860-862b-43f2-7692-08dba0134772 x-ni-monitor: EOP Exclude NI Domains ETR True X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DSjRrIwEHVyVIl3l2uF7++jaNXXbZ3drI3RSQ80FaR+bNfFWu4aHVqEdnN7rPQ30DovixCmwCkcRB6bRsxb1QNZkg+06Cw045fHuCiahsKoCibGFh0yDILFtBk16J6gLTwMQaQ7Ix7QLMjrWv33Z99NPt4ayxL7a57hXydfv/kVJ2FtIh3d9dieeWfDufGConHXE4qkOnG2b7QK3m7k4DgIWd3GWbRrbGfx1w/Uu4NVxLZ8McT5lO09NSAzknM91qv7RYuy/o5qAZz6bNh/fUcLIz3KvSmN/hxk2AHhKTgLjbCRznkqrUBiJdZTatSF1/Z7D5M8gdOc8mTKRnL18nvW3CY67rn1l6bMRqNWJGdTeRny1l1y0ZtC/wztkZrZtGl7QsfimSkU2WySD5tPRvYPhgacD5VdeeNeKRrPP21Akyoogs5Kt+A15vGGcP8ItQXWeghxoOkcIQd1EiXJ96pVm5lIJFGPhaOYj9BUmT4HN4w+JXHXIzWtyJN2btxJzpj99m1ZUwKqmbUnZ8TKto2p7FvaZSPdCFhtFiUdc5JjamofGCTR+rn0Th8CRm9nU X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BYAPR04MB4870.namprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(366004)(136003)(396003)(39860400002)(346002)(376002)(186009)(451199024)(1800799009)(2906002)(26005)(6506007)(86362001)(478600001)(6666004)(6486002)(2616005)(1076003)(6512007)(36756003)(44832011)(5660300002)(41300700001)(66476007)(66556008)(66946007)(316002)(6916009)(4326008)(8936002)(8676002)(38100700002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: C+zYHsjhOlE2ZNagpntXaf7MvAHbydYskcUaE8iEDzLLjAFBQWVSU3iR+9NTD7h7x6UQC3PiOGY9mJizHFKVSiHWDUO1zoqLTUqIZYxQWNc4VWjlIWcRAWUZetDBr2xSBFmcFrCUQFGYWwogWazTVJso5vzT8a4hbzAnCL+R0PxXWvw/5EwJo8WUQcuH9SDEINdmTsp7g+DpW1gXGl4kLynn6aodUSmWvsaHEsVA27uyzHKH94FVPcm8qvYZJLBWEplz5rXMu0O08Tx75e+gzdBdbW6FePvSSG/1x+6EcB60xg+N5lqCkmC/ZJLKsU3+lOVC9tNWn2/6rFawciBM0qTKgxGWq/irnHXarKnjFH0zp9oQlO+ZFdSc5UZ7ZsjqEckF1N00lzjR0kBREJYl1ZwrTJ5euSNhih+LeyGayUOFZxStJLSkPFcrtUe49YcyhxhQ0+PoJSk+J97JNzs1rS/kve87gSvV4OhBxilWoKYSPgDIdFbKqCuVigss96K7RMKqBZ04IVCaYVq2yM4qonFIkAyBsoVd0ozgA7KCCU5MkZh6FjAyD/qxv64WlUarP+ROrFRrD5Wdb1/6BXFBIP14WneUbGW8T/Swqq6UlD24SwFdIKnSxs1eg0JU+jSvLKnMQzCWu9yH9B8xc8QVMTUz6yXtOoeRqii9FvTBs734MuZiKn0seuHyF+dX79pILjoCyl8rBOqzcDRQ+0rz0zXTItFnvuhCBHuUHXDbwkJW0e52EMVTN89YLMVS6gnpd6FyF6llGI1UUbfV965ztBACfZeZr3ikGVwmjuk2BlqY11TlGtqEan2PcLu5wK1NOuiwCnKmt+H+SJ2cx9+SckWsEQIWLhlYMJl14804UmJb8Mp8GstWjj9KBnfgeqgnkrkxBeOwVqGbQvWBr6BTPkRZVkyei1Iwlkv64JdvyY1oVF2A57HL68kvqnpZ3Jby/HwMP/sbtZgIINVa/jcnUhrCNzXgSD7I9kPMdZ91+IGrXVYz6Onb+YS/uZF8QApVls/qB5EQbmml2zoV6ZEifV/W5pxUc9ciHV6kkWkxVg2wSa0jsbcodI1lkJywFMErE5RT7t1ocr/3TFOmMBShvgP7b7T/qyjZAzKwBDycwF83iH+5Dq0zFNWN4MHe7wU9AnXUJmJeyVFNzbGkWGN0hMTW1ZiWnuSMVdCVwQOtrzG/08ofA5EQKt0ckDoJ+oXljkW0EYztqluQnp9FuzP3BwgXyVsFoLwET5Ko+tYWShdXQMbiZUOQ65eh0yyUEnaxUy17bhUgybaTr2FSIFwdgoqry0NW6XzfjRdsItcf5s4I7YvBTRiFEPm8jw5lHDMZLGgE/Hl1wl6wc57SzP4Jqzvdy43EAUWEJvisR2IHJtsv0l63kqawkPCjxjHkPvHco7WISciU085Ub1e72+Bv9CQF5GnERfM4bFJNAu+m76e6bbZxLdSl24y0uA3+BQK3zKIsJ7rkIkd9T+XrVc2tdNq5tdtYHgLM61m3RDw+vtw6QDD4zB0rkJtQdO482MhIpJlF1a0VfvZ7CSTI5b6jOqI9JNPXCimX5wdxY4qfj5gTs7FOTSj01Q6T7WPHIti3Jt2saAW3+j7xqdaco11OPw== X-OriginatorOrg: ni.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6afdb860-862b-43f2-7692-08dba0134772 X-MS-Exchange-CrossTenant-AuthSource: BYAPR04MB4870.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Aug 2023 17:48:06.7843 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 87ba1f9a-44cd-43a6-b008-6fdb45a5204e X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: s1nEWkPHXQTjqjcu5y4jTKb/szU2vfbZsxKromvU93fjn8FxbPkLAtturck/ifDtpyXoqX3y3rJY97EwxrnU1w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR04MB9012 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 ; Fri, 18 Aug 2023 17:48:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/186384 This change adds a new variable that defines where feeds should be created when building a packagefeed. A feed location for each package type is also added to allow multiple package type feeds to be created in parallel. The location for feeds is ${DEPLOY_DIR}/feeds/ and each package type will further drill down to ${DEPLOY_DIR_FEED}//${PN} where PN is the name of the feed. Signed-off-by: Charlie Johnston --- meta/conf/bitbake.conf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 599bbc4ba85..b06fadc620b 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -450,6 +450,10 @@ DEPLOY_DIR_RPM = "${DEPLOY_DIR}/rpm" DEPLOY_DIR_DEB = "${DEPLOY_DIR}/deb" DEPLOY_DIR_IMAGE ?= "${DEPLOY_DIR}/images/${MACHINE}" DEPLOY_DIR_TOOLS = "${DEPLOY_DIR}/tools" +DEPLOY_DIR_FEED ?= "${DEPLOY_DIR}/feeds/" +DEPLOY_DIR_FEED_IPK = "${DEPLOY_DIR_FEED}/ipk/${PN}" +DEPLOY_DIR_FEED_RPM = "${DEPLOY_DIR_FEED}/rpm/${PN}" +DEPLOY_DIR_FEED_DEB = "${DEPLOY_DIR_FEED}/deb/${PN}" PKGDATA_DIR = "${TMPDIR}/pkgdata/${MACHINE}" PKGDATA_DIR_SDK = "${TMPDIR}/pkgdata/${SDK_SYS}" From patchwork Fri Aug 18 17:44:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Johnston X-Patchwork-Id: 29148 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 66634EE498A for ; Fri, 18 Aug 2023 17:48:20 +0000 (UTC) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (NAM10-DM6-obe.outbound.protection.outlook.com [40.107.93.135]) by mx.groups.io with SMTP id smtpd.web10.864.1692380896295340605 for ; Fri, 18 Aug 2023 10:48:16 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@ni.com header.s=selector1 header.b=VJAfMpZ8; spf=pass (domain: ni.com, ip: 40.107.93.135, mailfrom: charlie.johnston@ni.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Kgf6MmSvaQvZpyU/LlX08i/0PEagPJFcKR/+83sCMzF+Qj3M836lOHBDNORAf3uw+xY6FKyRgBG6ArnjM+RMkbtWeDW/kUf1pX8MAn27Ba9I5tMDv163tyQ/uBVUFkOkof0knVwRM+1Q4vtNCnEYMCvHZrtOx7t82xPSDGaks2jVk+c7U2SdQ6bOaUCGV5exA5JJLmEoilmbtGLxZ8MSBGT997vEeBu1HMUJoxvM2JWyUyPaBnzDT7v0dtTX7iPZUzTcwJrxm9vzRVAYA20UcdSRyevNLe40f+b6hsewCvw/nm3RypmXHUgrqqbfEk6Zqp5r2wAmwv/3r00/NbJcWg== 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=rnDNXqs6Kn8JLUG01Tin1+926MXrYMEuWYAISDMYcSk=; b=Q1hMRi9RTisNltx/KNRz0F85zZzpVnuGEvKAFZ14OEChJJfoqUqp4dP3MBS1MrbRBI/uaK94o4I1N/HhPNNMCWYVFlY9x1RR7K171QqH2NW1yglhZ/Z1nEGbOt2/ZVv/RZ5PWSWGY9UuKlDXRSZukr5iPPNNCoWWNoQiN/lK13eKVo2KKis8HSrFu3UtY+D8xi5uW7vl47gYviySXPdroWLWuOcI/Hx14eoR7RpCZNbOmKCQAjZeaLQb32Lt2PdlnIXr3BmQ+Y8ykWbCY3ic+z0b/Rjg6w5rQTPQkwl6K0rXkbly+Z3pxlC1LzpZQT3+zVGNmy7g5bIReEmwAlcfmg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=ni.com; dmarc=pass action=none header.from=ni.com; dkim=pass header.d=ni.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ni.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=rnDNXqs6Kn8JLUG01Tin1+926MXrYMEuWYAISDMYcSk=; b=VJAfMpZ8ZyNY+XoSkgvDeht6aEJSMlqpb45aJqUhrsM++mn1IPopg6wGad/HElgxwgavYzitABd0M3PoleYtnwQmd7hTVP6bN3ZkukQSOAM9dF+FZ8oLCTIDAf/6m5DDXe9PeWO5r0ReDCJUHDdIMqZ9+g4KvojLlBkoSfu7HZs= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=ni.com; Received: from BYAPR04MB4870.namprd04.prod.outlook.com (2603:10b6:a03:4a::15) by SJ2PR04MB9012.namprd04.prod.outlook.com (2603:10b6:a03:563::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.29; Fri, 18 Aug 2023 17:48:10 +0000 Received: from BYAPR04MB4870.namprd04.prod.outlook.com ([fe80::9f2d:5e4c:747a:6add]) by BYAPR04MB4870.namprd04.prod.outlook.com ([fe80::9f2d:5e4c:747a:6add%5]) with mapi id 15.20.6699.020; Fri, 18 Aug 2023 17:48:10 +0000 From: Charlie Johnston To: openembedded-core@lists.openembedded.org CC: Charlie Johnston Subject: [oe-core][PATCH v3 2/8] package_manager: Add feed support to generate_index_files. Date: Fri, 18 Aug 2023 12:44:51 -0500 Message-ID: <20230818174754.988128-3-charlie.johnston@ni.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230818174754.988128-1-charlie.johnston@ni.com> References: <20230818174754.988128-1-charlie.johnston@ni.com> X-ClientProxiedBy: SA9PR11CA0004.namprd11.prod.outlook.com (2603:10b6:806:6e::9) To BYAPR04MB4870.namprd04.prod.outlook.com (2603:10b6:a03:4a::15) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BYAPR04MB4870:EE_|SJ2PR04MB9012:EE_ X-MS-Office365-Filtering-Correlation-Id: cdd587fe-2408-4779-df91-08dba013496b x-ni-monitor: EOP Exclude NI Domains ETR True X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EjwwzmRomapa7oKCF9rsQJQWwVuHopRdPYUNuF6AS/oOtTMS+7uavWqcPvkvUdQ5/LDaKDkiba0r+HLQqz/0624F7sdXeuwkTsqHdqr53MSzPJI8+5EZXpN5BjI+bfBUEKdvGoH9GYG4AZjMghSoJvG2+bRcDUb/dAcPnQwapEQHA3Yncxht/KLLBSBlKmhI8DyZ6TQGzm9EjJBhtLU4vf5iY57+IBNEE4Q9UasYy2jRkHWYUF4F31quAZoGXjsHvyCE263p/9Vvn1ebd8BC5GRyoHD9tthhb46aURRQOT626u15xKGYSjFasq5LAHOZa8zF5GqOab/zW66uwiG8dhgPeC6ER/f3CpIBe6NEZsQiG3es0gtixoMqZPiYF3BSeQ1UEfgRHTf2jJy8l7tfgv4fYvzEGzXS5TKWKzMmRrnUDZNWOjcsM+1AwbkOZc9RmJjvr1c0t7/hoHQoAoNb/5kNRGKpkI2a3PQ54f6eoHGeCPSJnJPhCn3k2tyijbC+FHRt4uqY+XrZPFacddGAf1wjmRcBsI1c6NbF6rYpaWOjldfBu/oCsFm36IFK8ZBA X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BYAPR04MB4870.namprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(366004)(136003)(396003)(39860400002)(346002)(376002)(186009)(451199024)(1800799009)(2906002)(83380400001)(26005)(6506007)(86362001)(478600001)(6666004)(6486002)(2616005)(1076003)(6512007)(36756003)(44832011)(5660300002)(41300700001)(66476007)(66556008)(66946007)(316002)(6916009)(4326008)(8936002)(8676002)(38100700002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: cl4RZp9/SpE7R654/HBFldT9Dp2etT0Nw2JK4qU3zPUdfkBxVLYDELf+P5XMwUzctNct0Loa6rZT4Q3uLbL25ZxrRU+4Ex5CkMzcwh1gU93fd0T/nbA3p5ShzWdDQ5oX/ho9KYRyBFmp3Nmdsn+TScPXD008AtDMJUeo0Y5X9I4ru5tw7h95zoxEcmudirpp7eLEFk0LhJNcEJ91gYdBwZiKy5ONpZL647G2sj1aQ8zlUFv9/+JOsr2CrtLwXWqfKdCvc8rabPrUKguDJi2ZYaWXTSfPOztFgtYfLJjYFHqlFGmJfMButFJxgFlY151FAZjWQ/2XtQsdOfb5VJHHawKQujiVPIj6t0ppEMb4JbB5JzhcQqOdKjX/8Upy0tozVkzIO++61BQu0SpklaKtCzOS0qJfLIbsC3BYBr/vcABrYayBw15uSxu/TtoKaJwBJTsmq1E6Si/tOkEVLICg4hr9xoIHYkJqGvNkGZ8BhCoYfEhMpYZ3v4VxPUkbGY5+2pE6gVvE+8a7G5pAwpseTnq21nxFHnZznXjjKCXTqWAcTwQ25YyvVrhEJdkQbZBbQxW9nfQNbCuJx3x96ZEUCVnfWRk0VF8PaZJ9awTNtebEsWvMw1fw/m4CAztrCkNmdmZkt/NYl3v9jZphz0fW0PeqsxM4A3aDefu6hg3VttBn7LjgTqCX3jQtrhkzcTbZ7cMyZ12xaaYINrTiBLX87TKe6VeMWE7Tc9H8wjGfWzqmY4k0OqlGDbHIKxpq2s/zy4aQWR2vpE0XNq9sxawoXCuo6Wpg72kiLMeWHVkultHaVokupVakl5A/vzsHzl4HDH2EwIhKy/UGgrXjaOSz0B5UPFNwq7jwJbHYSOjuB543koSA1Eyi6WHMCFWguHrE/ThlfwSk0SqIKxfncmLQztyAV/O2W7q8o9MaV2g+qtUT0Lth9jg1Ps5alASE7Y6Z3nZbs8qk7Y7SiOthzMTcfYO1wpnIaY3aDL+oARIHWcu7w4pb3a7a+LO/dzyOG8fobWxNY4XF6Iilo4VbLK17dOMN7CRayzl9MiJJ/BIJLXIMy7z45a/d9pHU7IdF9dDUA2+MHWlrpG15tCMEa5Vz6r2aImltWDZcaoT3OzhgLt76LyQlIhgjJCZanMf8/zJpuDGqtvyJUc5lolmaSK6GtZBAFoYDh0u4qm6HTrjW9QOL/gtYwsNc4NW/AQwR5HUN9VHmrOrJcOZSQdCXtIjKDAREAhSBYINNIeXptSHu5XR63cw0rtGl1tIrRFC3UpYOU4RhAgXFB2RnIxhwj17viPWxvevT91G6Ka6EB2rgOhBFATAalNu2d3wD8TXXnpCG9y3GNHzo1qlrVDka3+qAWqbwcoTT2h2FI9hj43fBm0GabPXSl/k9GiwVkaE8QcWGhLHcI/+9v2oAxSCTUeTN4zXBlxWqdz/NhU64XXcx5H+UbfVqpFjpCKL/uk4azfew/gs6+CA3vfWRKxLf8uzMhQcqIOvd5crLVXDLy0qbGSeGQD8wnakGSN7k+Rf9imBjvMWBP2zA8Ld2wHVkGZW29Igr2KrLnCw9Ci9v4U8urq5DAN44VS13wqrTYH61HLKEHpOoF2vnI3zFrPsb6PPw4Q== X-OriginatorOrg: ni.com X-MS-Exchange-CrossTenant-Network-Message-Id: cdd587fe-2408-4779-df91-08dba013496b X-MS-Exchange-CrossTenant-AuthSource: BYAPR04MB4870.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Aug 2023 17:48:10.0955 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 87ba1f9a-44cd-43a6-b008-6fdb45a5204e X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: qjcE/85fq0P9gPmWz/f1JCE1EDuxCr9kBiD6+3E1eigVA7lbx/z5FWzuaqm4fkQ0gzxVbaSmD6tJUbiCqLnFvw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR04MB9012 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 ; Fri, 18 Aug 2023 17:48:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/186385 Currently, the generate_index_files function only handles the creation of index files in the DEPLOY_DIR_ directories. This change adds an optional isFeed input that will instead point the index generation at a package specific feed directory. If no feedname is specified, the original behavior persists and the index is created in the DEPLOY_DIR_ directory. The directory for index creation when isFeed is true will be DEPLOY_DIR_FEED_. Signed-off-by: Charlie Johnston --- meta/lib/oe/package_manager/__init__.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/meta/lib/oe/package_manager/__init__.py b/meta/lib/oe/package_manager/__init__.py index 6774cdb794d..7a5ecc98908 100644 --- a/meta/lib/oe/package_manager/__init__.py +++ b/meta/lib/oe/package_manager/__init__.py @@ -536,27 +536,29 @@ def create_packages_dir(d, subrepo_dir, deploydir, taskname, filterbydependencie raise -def generate_index_files(d): +def generate_index_files(d, isFeed = False): from oe.package_manager.rpm import RpmSubdirIndexer from oe.package_manager.ipk import OpkgIndexer from oe.package_manager.deb import DpkgIndexer classes = d.getVar('PACKAGE_CLASSES').replace("package_", "").split() - indexer_map = { - "rpm": (RpmSubdirIndexer, d.getVar('DEPLOY_DIR_RPM')), - "ipk": (OpkgIndexer, d.getVar('DEPLOY_DIR_IPK')), - "deb": (DpkgIndexer, d.getVar('DEPLOY_DIR_DEB')) + pkg_class_map = { + "rpm": { 'indexer': RpmSubdirIndexer, 'pkgdir': d.getVar('DEPLOY_DIR_RPM'), 'feedir': d.getVar('DEPLOY_DIR_FEED_RPM')}, + "ipk": { 'indexer': OpkgIndexer, 'pkgdir': d.getVar('DEPLOY_DIR_IPK'), 'feedir': d.getVar('DEPLOY_DIR_FEED_IPK')}, + "deb": { 'indexer': DpkgIndexer, 'pkgdir': d.getVar('DEPLOY_DIR_DEB'), 'feedir': d.getVar('DEPLOY_DIR_FEED_DEB')} } result = None for pkg_class in classes: - if not pkg_class in indexer_map: + if not pkg_class in pkg_class_map: continue - if os.path.exists(indexer_map[pkg_class][1]): - result = indexer_map[pkg_class][0](d, indexer_map[pkg_class][1]).write_index() + pkgcfg = pkg_class_map[pkg_class] + feedpath = pkgcfg['feedir'] if isFeed else pkgcfg['pkgdir'] + if os.path.exists(feedpath): + result = pkgcfg['indexer'](d, feedpath).write_index() if result is not None: bb.fatal(result) From patchwork Fri Aug 18 17:44:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Johnston X-Patchwork-Id: 29150 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 52E34EE4987 for ; Fri, 18 Aug 2023 17:48:20 +0000 (UTC) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (NAM10-DM6-obe.outbound.protection.outlook.com [40.107.93.135]) by mx.groups.io with SMTP id smtpd.web10.864.1692380896295340605 for ; Fri, 18 Aug 2023 10:48:17 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@ni.com header.s=selector1 header.b=JI5VkgEz; spf=pass (domain: ni.com, ip: 40.107.93.135, mailfrom: charlie.johnston@ni.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SVOlbxZAzdFDxJNNMcdTkFAGwQlYrzUk4JSSYQGvKFwWpp7QxA1s5kRiRq5G0e7rXB+VeBOF4vicZ53mSfsb418C7GKG1rKWkB8fwM7L4kL1ltGvIiesj1p/RvVILz3nPwBE/sAeHzaiq5gIGgvfP8KUYX8pgHYO7kYrq2z5ODsDUokyAwTPCEeMEj8jYhuexAO0IbEUV8Fz8T260zxWMN+yH4ijmTv/zjF+PvjwKKUzm9G4+/hPWkx6IubkjcXqMLscRwfNnD61kIqoPITsapVa/RzrU/d9isF0pJerSzVrKpNfFWV80R0CxP3QXummKN6HITBJhedBLuJKVRmCQA== 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=8xA6Fb/jKlrZKk6psnkQDezoT+MBLnLBH0BMZaqIQDY=; b=QwFtZrHBV9n+RsZnivlgVbB1Ou8cp51rYd3miAoJHW16tngtx3p3GFUzOZjt+KLsmA+8CNP7erDbl9q7B5iPTYSifVjxi8Ih6r/BV9j+mGpq2ORuRHG24UzstM3K/QEQ6Q6QYypDfaZwQlQrvpEfm1unzf/DIYj36pmaHzTbocXKq3MckRLH6F9pMekAqIH0VQPEaZq+UhNbVDOWnXBi2167JGkihbQmnUJwFoGXqWaBuDftMWASOO6wIahFjZiWQeQRzt50Y1ySBavCIOoTODhC5Gzw7r8X/G2Gvt8Sr33u5GLxXa+FbD+cFxut49/Or2T0Wjto3w6nwlRhb7DuMw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=ni.com; dmarc=pass action=none header.from=ni.com; dkim=pass header.d=ni.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ni.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8xA6Fb/jKlrZKk6psnkQDezoT+MBLnLBH0BMZaqIQDY=; b=JI5VkgEzs99k/hXnsTpPJhtEZsjKw6CRBoDjfpTPWPZqTPhBnSwqPohui7fNYGVsey1sYWoSLRAINz/5niJg5QpcHYVqdt9GA5GXyjM4xRVoH9465NuQgO9Osl+2Cvv2UH4IcSWo/vjVqou9iekB/NlXud7//3hfrl/i3qBx1ps= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=ni.com; Received: from BYAPR04MB4870.namprd04.prod.outlook.com (2603:10b6:a03:4a::15) by SJ2PR04MB9012.namprd04.prod.outlook.com (2603:10b6:a03:563::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.29; Fri, 18 Aug 2023 17:48:13 +0000 Received: from BYAPR04MB4870.namprd04.prod.outlook.com ([fe80::9f2d:5e4c:747a:6add]) by BYAPR04MB4870.namprd04.prod.outlook.com ([fe80::9f2d:5e4c:747a:6add%5]) with mapi id 15.20.6699.020; Fri, 18 Aug 2023 17:48:13 +0000 From: Charlie Johnston To: openembedded-core@lists.openembedded.org CC: Charlie Johnston Subject: [oe-core][PATCH v3 3/8] package_manager: Add _find_task_pkg_deps helper method. Date: Fri, 18 Aug 2023 12:44:52 -0500 Message-ID: <20230818174754.988128-4-charlie.johnston@ni.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230818174754.988128-1-charlie.johnston@ni.com> References: <20230818174754.988128-1-charlie.johnston@ni.com> X-ClientProxiedBy: SA1P222CA0104.NAMP222.PROD.OUTLOOK.COM (2603:10b6:806:3c5::14) To BYAPR04MB4870.namprd04.prod.outlook.com (2603:10b6:a03:4a::15) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BYAPR04MB4870:EE_|SJ2PR04MB9012:EE_ X-MS-Office365-Filtering-Correlation-Id: ca569df6-ce2b-4453-7174-08dba0134b4d x-ni-monitor: EOP Exclude NI Domains ETR True X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vqz43qCD94MFe/fA8Uu5bz63NPcrJnAiTkM0c8gGpKksLbehHWt8oVAr5jvmC8jZJEN3TU5p8aE2llzgo4UO8WwHelbIrqLhGEMk7QIA4YiAPFn9Tva7fpAMP/7/xTFoDwWaq4u4NMEjfST3xVg34osyDsJ+u4BjfX32kdD1Wz/6ZtX2yW9jtzOvbJfmiYppT+b2YtCQiFVKahuC5CGbMoxC1jf30MPPlSrpaK3yXHgHx+ue3y7xeBGucPKywLOIhVjUSN54WV8g7zddBqvVoeYH1X+BOsIzzrq02hPluUJykA3vwyncLaR639pr4/aD5HfBdzbUOrKDrCgYCEfWqGfvH+Mi89IYeI4VtxeTx5fd4aY3amIZJ6Rs46lCJH2oVJNPshaJfEcvzVhgRHpE3Pb9ykv2SgTp7zalE70tE0qex9LQoRMPt+jaugHjKmYgOVxPV313wAMvip4ohGBbM7q11/oK/zx9msdOstLRdkQDYhVbOkZeB8qmNszEl8+aaTj8afAMiEEywB9oLIklDYuLkSw66na7/84lAqiCTCRVKO32/WQBkduLjw0e43sD X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BYAPR04MB4870.namprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(366004)(136003)(396003)(39860400002)(346002)(376002)(186009)(451199024)(1800799009)(2906002)(83380400001)(26005)(6506007)(86362001)(478600001)(6666004)(6486002)(2616005)(1076003)(6512007)(36756003)(44832011)(5660300002)(41300700001)(66476007)(66556008)(66946007)(316002)(6916009)(4326008)(8936002)(8676002)(38100700002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: MSZXZk1xfCLoEjvewWMryK9Y3IUFKNT4UmVFsjxorDy1jlLmMalKW2NzTBNidKbr0aAcKDzV3EVGLHn124fPOlLAL2LXSl5wrghGAyzy9bl1mQrqgbCJ1HY4GKzlZoIY9/jj9Q7U8N3pjrtvgaA8Nc5sSVIG37DVOhXJ8fL9zvZe4TCCePhYKFjqiHtcTbcmvtiy504HB8b37bZbsPTkxxtlxGQIYSGd/LsNajN6cROJn96VkUDXI1ix/jLK/I7NHOklqGSZtwt3fO18TmKl0tkCCJIajeq2Ky7uRia4IgA7WxDYEfuUFhY7CyBgCGImXA3fDMsgxfCLEbnkPS0R0EruFY7h95Nw9IBrtEm9Llf3vvlnZLppRa1z1MJeKSpLOrfanJJmNE8AVQhNO+bPQipr8Dcs3DtRkrTxgK7L9uy78drxdd+O5f9NHvvTR/4DnW3JaKsD1VEGypzHaSnGyQrdhvAxYpZtEiD+un8Rxag+eQF2W8c+sNcoOKeex8oG2EYabkAWIgnyAqC3d4ijBpW5xeUP5re7P75xznPBYoLcvnj2TV4RkxRlFCXlX1zzr2BEMHPRtCDpCBgSy3MG65XoYm6fcMOByTbII03M5s0Q2MdiwKhWaUiRi0JIJxPwSGuwMBnNhHOSBKs1osud6AFm2KbuHmJEBSQKewNSGNQa+ExBpOcCg372VvqnAE5Pa/HxHuDYKrM5ckVs5pKlhp2ZpWhH6lB5xmIYxz9DWH0UMlw6A49NkmHYwdVtFQZ30BKgtVUzT7TajEd2J1Z/PJnq8pJr1257xiVmIlO5BVNr1tpE+IEmZGcaooUoQ2LgzgrvwZjqhUpbVLUMGVcrsgkTWmMSRcP7rsdcuIZVx9RgaTVAfqfojATF7l7KNk3izgqUQ65RNF+UfmsPgAbDs/g4iFW8qRhhCu8IbVUasHeIguYZTpmso8N0WE5oz5k0iCbVMmSQhRUg3yJ9wLTSrpqdG7kyVLc/7LzF+qJZMCsSWdGn89R50o2kOSbqHlKKbAUVYVcIabX+FEkwRNNQyPgfvmmqlwl4ZPKsw9PijJS8pakOAOi1AmVR/2jJyvN7A0UeqTiBB074KiQYl90XT5pNZq2LcqAuf1rs49JNXmoSIiGnd+NetbPyhGzTfRDPL8Rd7WdFYN8Bn/smLrl5ESP+kAlj3/hi2fkRfosu9nxDAbEa6onuJ25JsMQHHkp4yQnLlYkj9vuhL4RIQBKQ8cvFlWLXeMen+ywE2YfSgxbC73Jl8shdjkGapmH3Lj5DZF/3oc79P30ARYhzvJLtAl3E3awmm37qk+rfDuP6pe80doU8R38RKOPu9fUO399ctN8Q31UwmNISn4TszK3zzgF89LsVcMTXhsb9GZPhOtwDB9ZOK2tHoC5nAaNhGEtujXea3rqz+H6vKySv4eOibtlSbWbLCV9KQXGus9cpVYuOTv1YqWcpcSPcRHp6r9h7hje4gqkRyPmDV6HEWuHbUVk4xxIYiPr1t5ysP6Nxl6Rk70dGoao48/heEu6mpQ3KTBK36UYktnhWQSTlDZo1S7ezgsjWRSXvaBYIxs9/xADUsVzwf1S86E24J7Aq7xexvAJFB1NyYyi6bgdFUsaQmA== X-OriginatorOrg: ni.com X-MS-Exchange-CrossTenant-Network-Message-Id: ca569df6-ce2b-4453-7174-08dba0134b4d X-MS-Exchange-CrossTenant-AuthSource: BYAPR04MB4870.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Aug 2023 17:48:13.3014 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 87ba1f9a-44cd-43a6-b008-6fdb45a5204e X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: W5YDXcRBXAALARcE1IVOJYh/LGfDNip6p5ku3Vm39VLngcDuO7QDVsmQjM7W0XjEhLTIU7ZiyDX43jZ7rBQtGw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR04MB9012 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 ; Fri, 18 Aug 2023 17:48:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/186386 To make the logic from create_feed_dir reusable, this change splits the logic used to traverse the package dependencies into a helper function. Additionally, the logic used to find the initial task was updated. Signed-off-by: Charlie Johnston --- meta/lib/oe/package_manager/__init__.py | 51 +++++++++++++------------ 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/meta/lib/oe/package_manager/__init__.py b/meta/lib/oe/package_manager/__init__.py index 7a5ecc98908..4c6b5452f80 100644 --- a/meta/lib/oe/package_manager/__init__.py +++ b/meta/lib/oe/package_manager/__init__.py @@ -476,31 +476,7 @@ def create_packages_dir(d, subrepo_dir, deploydir, taskname, filterbydependencie oe.path.symlink(target, subrepo_dir + "/" + arch, True) return - start = None - for dep in taskdepdata: - data = taskdepdata[dep] - if data[1] == mytaskname and data[0] == pn: - start = dep - break - if start is None: - bb.fatal("Couldn't find ourself in BB_TASKDEPDATA?") - pkgdeps = set() - start = [start] - seen = set(start) - # Support direct dependencies (do_rootfs -> do_package_write_X) - # or indirect dependencies within PN (do_populate_sdk_ext -> do_rootfs -> do_package_write_X) - while start: - next = [] - for dep2 in start: - for dep in taskdepdata[dep2][3]: - if taskdepdata[dep][0] != pn: - if "do_" + taskname in dep: - pkgdeps.add(dep) - elif dep not in seen: - next.append(dep) - seen.add(dep) - start = next - + pkgdeps = _find_task_pkg_deps(pn, taskdepdata, mytaskname, taskname) for dep in pkgdeps: c = taskdepdata[dep][0] manifest, d2 = oe.sstatesig.find_sstate_manifest(c, taskdepdata[dep][2], taskname, d, multilibs) @@ -536,6 +512,31 @@ def create_packages_dir(d, subrepo_dir, deploydir, taskname, filterbydependencie raise +def _find_task_pkg_deps(pn, taskdepdata, mytaskname, taskname): + start_task = next((dep for dep, data in taskdepdata.items() + if data[1] == mytaskname and data[0] == pn), None) + if start_task is None: + bb.fatal("Couldn't find %s:%s in BB_TASKDEPDATA?" % (pn, mytaskname)) + pkgdeps = set() + tasks = [start_task] + seen = set(start_task) + # Support direct dependencies (do_rootfs -> do_package_write_X) + # or indirect dependencies within PN (do_populate_sdk_ext -> do_rootfs -> do_package_write_X) + while tasks: + new_tasks = [] + for task in tasks: + deps = taskdepdata[task][3] + for dep in deps: + if taskdepdata[dep][0] != pn: + if "do_" + taskname in dep: + pkgdeps.add(dep) + elif dep not in seen: + new_tasks.append(dep) + seen.add(dep) + tasks = new_tasks + return pkgdeps + + def generate_index_files(d, isFeed = False): from oe.package_manager.rpm import RpmSubdirIndexer from oe.package_manager.ipk import OpkgIndexer From patchwork Fri Aug 18 17:44:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Johnston X-Patchwork-Id: 29151 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 666B4EE498B for ; Fri, 18 Aug 2023 17:48:20 +0000 (UTC) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (NAM10-DM6-obe.outbound.protection.outlook.com [40.107.93.105]) by mx.groups.io with SMTP id smtpd.web10.866.1692380898390671173 for ; Fri, 18 Aug 2023 10:48:18 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@ni.com header.s=selector1 header.b=gvjWdfow; spf=pass (domain: ni.com, ip: 40.107.93.105, mailfrom: charlie.johnston@ni.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IYmwBEUCIkYQJSX3wdGAM0/YpjbEiqJk5Dt41fZALhUleo5zwqZGDDSU1jTWfM3ACfLWDwlPbXkN8iEidUlJ+dxrWjyg/051otO+o12FhDAaeNOs4HGscngjVnuYMcaVqZZAvsyyOI/O6lBKD3T9sAuYZ24ueQ7rNLOGqY5JMTsnPhu0kVxnk8098rR5jjCl4PImEUNPuHi/MtXVaQWeSAnV1sJdhemweEx0Hbi5CwDmAXbKvcTSzgR+HQ9sfRFIidX2DkqSYF12OWRhhKqoH9DdkyeqTqeSrjzfUi0r3XY/NsKYtTwXU14zH8KH8qwLBA8tBoKZajoV3JRXUIQvfQ== 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=+szWXseoR+n8yM5s6V5BPFuOekf/dHluHBdoCEoH9dc=; b=cqoVDzD/i1+7gRBqr3DSiEK30uP2qS/SYnSGLvxbtOLFngbiNfTfYyoISyjCi0bS2tGxjbYDlbs/1tgSjbnGC8cWkHJwuWL1Pi12cGureMr73Ihh6zlYe8MYfuJbfAwtlyZq5B6YsqMGWAs8kFzc/IJiLm2gmDCYYG/cdEOCY5WyG2cofq2saLItrak5g/8Nq2i62N+m83X3XAAgNeHdUF4PB6uplDYkCEAgB7vgdLMGMp8sS7LmRUA0TsZ2PEQ/nVSynrah3jyOaNxvMiNFpP8s0LtRnZnP3oVPcVn+AHLlgD2n6LGnkm2GYYRMPtXDBRQA+kqOtYCGEkP53keapw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=ni.com; dmarc=pass action=none header.from=ni.com; dkim=pass header.d=ni.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ni.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+szWXseoR+n8yM5s6V5BPFuOekf/dHluHBdoCEoH9dc=; b=gvjWdfowK1hYLiC+vdvcSdr2es+CrS/LERO8H20UY1wWWEsrnVModpUZE/ly+yAXOkDwpkh52BM9/oxbUqa8YFDcLyVw4hUO7x2a47cTuwnPFpa/KaLJA80KgRTTlIj+xr5KyHAhLPU4+WWGo5xRxt8tjHHph6IOwfWq2CcscyE= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=ni.com; Received: from BYAPR04MB4870.namprd04.prod.outlook.com (2603:10b6:a03:4a::15) by SJ2PR04MB9012.namprd04.prod.outlook.com (2603:10b6:a03:563::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.29; Fri, 18 Aug 2023 17:48:16 +0000 Received: from BYAPR04MB4870.namprd04.prod.outlook.com ([fe80::9f2d:5e4c:747a:6add]) by BYAPR04MB4870.namprd04.prod.outlook.com ([fe80::9f2d:5e4c:747a:6add%5]) with mapi id 15.20.6699.020; Fri, 18 Aug 2023 17:48:16 +0000 From: Charlie Johnston To: openembedded-core@lists.openembedded.org CC: Charlie Johnston Subject: [oe-core][PATCH v3 4/8] package_manager: Add generate_feed_dirs method. Date: Fri, 18 Aug 2023 12:44:53 -0500 Message-ID: <20230818174754.988128-5-charlie.johnston@ni.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230818174754.988128-1-charlie.johnston@ni.com> References: <20230818174754.988128-1-charlie.johnston@ni.com> X-ClientProxiedBy: SA0PR11CA0100.namprd11.prod.outlook.com (2603:10b6:806:d1::15) To BYAPR04MB4870.namprd04.prod.outlook.com (2603:10b6:a03:4a::15) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BYAPR04MB4870:EE_|SJ2PR04MB9012:EE_ X-MS-Office365-Filtering-Correlation-Id: a3640274-1cbd-439a-3b92-08dba0134d49 x-ni-monitor: EOP Exclude NI Domains ETR True X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zYR86/kLKzKpb3z7f6LGtxEKDVX4UlkabR216kyR2dsFiRmohURTAqfiX05PoumHhxw8XJFJnF6AGpnOdvrLFPosfZ4Peh0BujSs2veFV8BLLyMWVGbQKxAwV7JFOxOJfCXMKKqb2Q8VOKmXIVnNrJyuCsrrLeQYIjKvcINta8PREmlwl+rR8OlSP/W9+AYV0XFZODYcPBBxRk+I9GsyrcohKCeQkyxDyEKUySQaPX5XH8CJTdwTnHcwbjLL06fbKmbBogFn3RogUQTAsBmpaL7FhkXkBE1QiP/6L87ZohyJB9pzLwBq6ZvFi41fhswbJN+NEXsJ5uaug3NiwYG+aNRdobuzlPp4Ev7LXy7aCu1RvxgmMty7WXt3v6J3Iloy9D6N+1AzoauZBx4Cy2yWk4GWrr98MzurqbOM2tD37IbPQhCEsdjBhHbDGkUOxnepxVB3c6Anp4PJpAwFg87oF3FcM2PtLmJciXzbsKXbwlvIW8zhI2FmVBz3e7Khqu4KXHP5Ssl7fyo5OK3lVtvu2A9bBv0TPWOLWNVqs6oDMvOXmwmmgEy8gWBtv2FZEciq X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BYAPR04MB4870.namprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(366004)(136003)(396003)(39860400002)(346002)(376002)(186009)(451199024)(1800799009)(2906002)(83380400001)(26005)(6506007)(86362001)(478600001)(6666004)(6486002)(2616005)(1076003)(6512007)(36756003)(44832011)(5660300002)(41300700001)(66476007)(66556008)(66946007)(316002)(6916009)(4326008)(8936002)(8676002)(38100700002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: xzHE9gsbt8QuCMskG7CX3e/sj1AtVaxJ5JHvwfwu5E1jXVsT4Gr3rXq//LAotc/rcIxpxtnaj12hANm+jHfMZ2X2eomkJfs0L8zYtr3IT6FRrwZ1VoUcPb01nW5wAIfAaIASshH30AL5bgs2a07khCPqXoEAwyo9yk9XEAUYOhqLMdJRpaPUpPdoP6ToOctcfAV65oIVs2EuGmqtiOn57sHjTw9u2S3kv341tXpdx5R4xThA2RNKOC1+EaLNb0o/X158622cG/sPhvDU6S/V7MLw3yMhSrUVVA25kOsu7n87hJEsWKtGGLuAPAQb4pFTkpbtDl2azMO9130fAXWfJp+DXGUny6UYQypwXeqQY2U8Vi6BJKG3en1Jf6NbnjZAKkm3cOGpSYyC5SfNTjua4xhvwa7Z5o3gDdbhwbz49XsiQb+vglWrsncSxvhFrS7a51WOdmsB08r8IlKiYv7Gscps6RZyFX3EGTsA4/Y8IUGQNQg1jLxE7dl5h3q6++5+sh/Zqxz+F7GF/30u7vcTm+B4LW8z5ayDJ30HusoeOfhAtJTMrqABtVwTNSQahrX14Anlvk8sTXRJhtmfXR9+q7MSlLPKcwPjvI254YS2UUGy21exW3OtR1/KFVFKnSEcUZvggAv7ByPrtjFWLpgYS5xcwaRg8ngLBqQBiJI/WTDKErTPsE1EtlsUKXqPcbfAGjvIDoK9nkx3slymLZT4hMseCQ8w7+jMr30E6wuzPBvOLlgJk5LpVLAym8LstUfr+8cRLHgECYlx4oeI1Nf4GrdwNHyfYQz1pkKIeWR8cBL6+RKNUnLjgOHJ/45aORTdvuiJ6DBDtpRhgc9iwEdpcXBUUQ4SrPvozxZV3rkicIA7OHdSfbKltsOQof8iH1hS4sU2/l2GKu/3xaYu2v6VPRMdHhqT4V5atRABoUN0OTJ4VXri5FVzb3TBFtFn5gNvhipMyVwJOk0gHydOIEOYLO839ohh79N/wPeXcB1EsJX8fbZMv2J5l0QY101XoT9oxgnWOTqSt415VlPXE2zlsx20ohvJV0ZmNH/boSpyv2fSAC9kZReQ8oFaXF4P5sh+/a2xo4rTHO6QHt7cZ+mIo7OM8mkzQPksrZZCmdShpQirDiSPZfDEBEpjzWLtOt7lBwLYQ8Le4gx5e0rCeYklCQL9muu0H3qD/R7gfXlXQdb/GRrL9P3NSaGtjHZyv+eATx9GvdZJ4xOZ/EyF5Ori5pVjhho6gkPmwY8/Ym5LQ24Xlswa/wnmGuyRLXSPo4XUVehZANQQ6m2Z5R2sRLcak5Uj4yFO435tWJU+4UIdbsnljvQV4VkiJEHKueVwYxQMfUsHsvirRpdB3fGtENUY3Z+PkbzxcaB9yAIKB8i0uaVNVH9pl5b9g++P4GrGVibn9/TBrpTW9kbTelmFR1LKH30oEMvN2+edF8CimlGGJj9l6HMq2Wm1bsxVZmQEQgW/IcTRWv1KhmyruVFE/M03MdLIhxn3AkXxsJlSrLqtHVzI3qB/MsCQ3EGiOQ/yd8OdFStYuGolo8Qua8qQJQBKX7RGkLGTN8uv5rzB5ep9BmX7WKqPD3AfLQlmRWGqmYKtu6LsSzDXPRuaH2EtMd8i2w== X-OriginatorOrg: ni.com X-MS-Exchange-CrossTenant-Network-Message-Id: a3640274-1cbd-439a-3b92-08dba0134d49 X-MS-Exchange-CrossTenant-AuthSource: BYAPR04MB4870.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Aug 2023 17:48:16.6123 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 87ba1f9a-44cd-43a6-b008-6fdb45a5204e X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: xp17VBVCESGvul0GblitSkopTkqaOwIxk0UNteQoFTmL4ZnKXU+z3ZLVAOrgnc65oyQPacjt85JrY/J/zwVTiQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR04MB9012 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 ; Fri, 18 Aug 2023 17:48:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/186387 Add a generate_feed_dirs method that will call the create_packages_dir method for each package class supported in the build environment. The value of the PACKAGE_CLASSES determines which feed types are built. For each package type, the new method will determine the proper name for the package_write_ task, the directory to pull finished packages from, and the feed directory to copy them to. To support side-by-side feeds or situations where one feed is dependent on another, the create_packages_dir method has been updated to support an input called assumeprovidedfeeds which lists feeds whose packages and dependencies can be assumed to be provided in a separate feed. Those packages and dependencies will be excluded the feed directory for the new feed. Signed-off-by: Charlie Johnston --- meta/lib/oe/package_manager/__init__.py | 27 ++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/meta/lib/oe/package_manager/__init__.py b/meta/lib/oe/package_manager/__init__.py index 4c6b5452f80..d4eed027df4 100644 --- a/meta/lib/oe/package_manager/__init__.py +++ b/meta/lib/oe/package_manager/__init__.py @@ -449,7 +449,23 @@ class PackageManager(object, metaclass=ABCMeta): return res return _append(uris, base_paths) -def create_packages_dir(d, subrepo_dir, deploydir, taskname, filterbydependencies): +def generate_feed_dirs(d, assumeprovidedfeeds): + classes = d.getVar('PACKAGE_CLASSES').replace("package_", "").split() + + pkg_class_map = { + "rpm": {"taskname": "package_write_rpm", "pkgdir": d.getVar('DEPLOY_DIR_RPM'), "feeddir": d.getVar('DEPLOY_DIR_FEED_RPM')}, + "ipk": {"taskname": "package_write_ipk", "pkgdir": d.getVar('DEPLOY_DIR_IPK'), "feeddir": d.getVar('DEPLOY_DIR_FEED_IPK')}, + "deb": {"taskname": "package_write_deb", "pkgdir": d.getVar('DEPLOY_DIR_DEB'), "feeddir": d.getVar('DEPLOY_DIR_FEED_DEB')} + } + + for pkg_class in classes: + if not pkg_class in pkg_class_map: + continue + + pkgcfg = pkg_class_map[pkg_class] + create_packages_dir(d, pkgcfg['feeddir'], pkgcfg['pkgdir'], pkgcfg['taskname'], True, assumeprovidedfeeds) + +def create_packages_dir(d, subrepo_dir, deploydir, taskname, filterbydependencies, assumeprovidedfeeds = None): """ Go through our do_package_write_X dependencies and hardlink the packages we depend upon into the repo directory. This prevents us seeing other packages that may @@ -477,6 +493,15 @@ def create_packages_dir(d, subrepo_dir, deploydir, taskname, filterbydependencie return pkgdeps = _find_task_pkg_deps(pn, taskdepdata, mytaskname, taskname) + + # Find any packages which might already be provided in a separate feed or repo + # and remove them to avoid duplicates. This assumes any dependencies of the packages + # are already met as well. + if assumeprovidedfeeds is not None: + for pkg_pn in assumeprovidedfeeds.split(): + provided_pkgdeps = _find_task_pkg_deps(pkg_pn, taskdepdata, mytaskname, taskname) + pkgdeps = pkgdeps.difference(provided_pkgdeps) + for dep in pkgdeps: c = taskdepdata[dep][0] manifest, d2 = oe.sstatesig.find_sstate_manifest(c, taskdepdata[dep][2], taskname, d, multilibs) From patchwork Fri Aug 18 17:44:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Johnston X-Patchwork-Id: 29153 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 4FE86EE498B for ; Fri, 18 Aug 2023 17:48:30 +0000 (UTC) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (NAM10-DM6-obe.outbound.protection.outlook.com [40.107.93.107]) by mx.groups.io with SMTP id smtpd.web10.870.1692380902016658356 for ; Fri, 18 Aug 2023 10:48:22 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@ni.com header.s=selector1 header.b=idAJ6/Em; spf=pass (domain: ni.com, ip: 40.107.93.107, mailfrom: charlie.johnston@ni.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dkW+1bGpv67iinTSlmkQEk7QI7I+TOefJ8s2NlrBqALWsyoJj3S2/x8MGP8xZKO39imLSFrxbFzozOUiAKNJ6TGe35wUW7jqiIF85Qd2eeJNPfo16oKuKoDuHYLffIAZjUxudUaexJRg6pRf2VF2InMqCvTyiZ4kb8lyjLM/qRnHePPUomyhzujGe5xc/9X9kw/4QtN7bJnojP5hEkIIdPb/ASN8CY7WeR7/XKVfZz6Bb15VCerz7PSHPJZCuqjRorftSrTGGbYYg+bBvceP2PB7eFsUwReLIY321+maMKKR4Ounluq+dcM+ez8KBtSCtrZMSfUIjH6sBTqEtVAA/w== 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=L3z4Ofr0JQVdNfDEpAXf+g8YEEVnPxcMYBclG6MOGo0=; b=X+8wOwIO5K6nl2m4Fu38R6MAgjF4kPryjqQ4URu1ngBcjX1tk/xkwKOzuTv3uGARM2Cp2Bjd7/cEki2Pr4qX5HEMfaphv6Grp4rwoA6UL4s/ZOnwl2yoWfNr490SGPpRsWUL8rLMdLzJI5VZTW8mb7RPcbdyyXYsEJtmdY0Z3apvkZbW5rkxfUyYQjGwpsyJaYaRJClHOmGGS6hxWlRiTcV/94PPhzo/lud726daMaz8Hpty39fTJ/lRxJHM0jiVK+CilD2NJtiJED98wHc/ecrngzUROXjkSmFv4h2I/Xgrwzvq90qfzd8wIQfrrRht7pJO+lyMs2QP2kMIvVOR/Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=ni.com; dmarc=pass action=none header.from=ni.com; dkim=pass header.d=ni.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ni.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=L3z4Ofr0JQVdNfDEpAXf+g8YEEVnPxcMYBclG6MOGo0=; b=idAJ6/EmBR4C+L8aJ5ShtdBCiyMSE3k0AKK0bGm1kt2ajnjNSEaaJ8eZHJxx5j/jym7VKXqG+y8r1l2FAOZGLhbcpilCYGruXfZHRpNFK+d4nkK6JJqEvSDNyJ2O0RfcPsT91Hh4+DXXOYMzwaQxK6xVKgwcDlEgHum0x5IRkcE= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=ni.com; Received: from BYAPR04MB4870.namprd04.prod.outlook.com (2603:10b6:a03:4a::15) by SJ2PR04MB9012.namprd04.prod.outlook.com (2603:10b6:a03:563::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.29; Fri, 18 Aug 2023 17:48:19 +0000 Received: from BYAPR04MB4870.namprd04.prod.outlook.com ([fe80::9f2d:5e4c:747a:6add]) by BYAPR04MB4870.namprd04.prod.outlook.com ([fe80::9f2d:5e4c:747a:6add%5]) with mapi id 15.20.6699.020; Fri, 18 Aug 2023 17:48:19 +0000 From: Charlie Johnston To: openembedded-core@lists.openembedded.org CC: Charlie Johnston Subject: [oe-core][PATCH v3 5/8] packagefeed.bbclass: Add new bbclass for building feeds. Date: Fri, 18 Aug 2023 12:44:54 -0500 Message-ID: <20230818174754.988128-6-charlie.johnston@ni.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230818174754.988128-1-charlie.johnston@ni.com> References: <20230818174754.988128-1-charlie.johnston@ni.com> X-ClientProxiedBy: DM6PR02CA0120.namprd02.prod.outlook.com (2603:10b6:5:1b4::22) To BYAPR04MB4870.namprd04.prod.outlook.com (2603:10b6:a03:4a::15) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BYAPR04MB4870:EE_|SJ2PR04MB9012:EE_ X-MS-Office365-Filtering-Correlation-Id: e18f5939-81b6-4e46-31a2-08dba0134eef x-ni-monitor: EOP Exclude NI Domains ETR True X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GJ9IBneEmVQski/MGPShCWl9Ie1YiJvXmsAHGr8GeoS4X/RJav8h9fbIv5tXtuW/MiBnOZz2dQEpxZ1jRXUa/fQWXWFavKwQJ3iOjdQhSIHJNEIuFX4+tbabrzO8J0Wjo+p9uB/ysQCJjmSmI6LEdBQ69yyoxJNCghB2sfcvXaNdEZVqrw7DMPFIng90fmatBlgS6xBl0a5xVwnVsFwt69OmYBfPYv5+Md3ibkGoIejJPlk5KpJyG3FpLHlujyUV2/j9FGLyzZtMb7Ma+EmbkbOQR5booL+eXCuXDfroj0zOAv79tcAguPiBaMDMmRZG5Y2Ms+VjCKlKFR5Nvdj9K3mtEYbH/ejy75oKlcKzrVy6Sb9BYGV6YhO1GsvkRgUcbfaLV4reNYwjkYdeutNrbD0ov4jrCmfnC4wzs+YqLHVdypgX4rCmfuV96IlVDswRVhDB9/7R0Nd+L9gszU7vZA6sY1argR9cjYwpoNfbIAwuflZySFHVKZJG+v5Nho9U6PB2T7fdjLfpmrJTzQML1eCQ2joFnba7OCTULvVkx2oXdkRZkqfb5jLARyTc74gb X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BYAPR04MB4870.namprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(366004)(136003)(396003)(39860400002)(346002)(376002)(186009)(451199024)(1800799009)(2906002)(26005)(6506007)(86362001)(478600001)(6666004)(6486002)(2616005)(1076003)(6512007)(36756003)(44832011)(5660300002)(41300700001)(66476007)(66556008)(66946007)(316002)(6916009)(4326008)(8936002)(8676002)(38100700002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: bx+YmLiUebN4f3X4KHx+QLpHLdHMu36CTsI6eJ3RYFtw1/Hf7Uc6ijNddmEu9uKMBoSQl3yFl9+STqmbjmJLlVKUV4MniK9+RGNKWsAEvvzGUYJgnPmlG2mNLNx3R0NDIMUIL3seuDFYb/azLyn1TZ8cj1mdCeNQS6EkvxxWk7AE2NWOhCO3U35OmqfCiB5QoC77j6pRG9IMK7jeNR7VnbFtG0YEQliayhB+2hdrkutlUPOgH5SybSSrsnC0zITliKwZ4bGbW+A/UWdMMWSUvvXANRHgLZ8UIvqDFDuNGRf60daPabP7l1Xb3Bd2kbo/spT6f34UvTDZyKfKVSAT2zXX9Z5c2HQ3AVOdOtvPwoRtH7IZUxagquE8i7506veYUYaxNEkN2JVB5pojPye8sUYmZN1uQ1FV/TayyiCfAnIOFrDPngg2ZivzeUqlOxQWnVjlqFPMxpi1wuumtZ/JVuT4WH7u71av2atIUcxi8unyZKc2uhbHm3W6+s2fA+5GUgZmImd910Cn7FvwLXguTnGkINqTXSxdF82s8GFQXTYknX7gLUeounB/IU80au8HCQWgjqit85L4h3iJ26I96CjuRaiwpMWEdSYve5PXKVBt/K0iNF/HQzy53BZlpbfin7NktN8cFdrMSnkk1DkHVtuBdgHA8g2FC8JyzmOwmtNCRsr+822BS5POyRL76gVzqgXv566hTbBT6wzGXmZGBXr/+9xRI8xFZ9HpxhGancqm+Esuk0WuC9SdA6179CxjSXSKxm+AyAyUqL3bL3D9kADn45kiUlmNWe0uYS93c5xCzma0pxKcotdJ9bAPKtydsbMiA0rGOww1uUH+bta+ZMlB6ynIloxP3Rv8RKm0U0vLoiAFmknX+IrI+rcVDmTKHdAbK7jqpHvZEp9HKvgC9F+qXt0ht/tGBJBK/CpD78xV/rDykYWJTMLlLU882tbCQUd0B/dmuknUOVnQJSYpefR6V4dLnr8dUYAMZB41ulkGxVGOAw5CpCwL3WN3eHg4r/R/+E+DqmzTsS60v+MaeMuXtUybIQXYTQoTHyi7XP1hM8o9IoRVoa17IEewH+jXhx8l4J3Www5FjSAw5Jx0cBcqzUDMZPqgblhLLl1/QLjR3ADWnbfLPcwX2/PrPH0rjO6ysdltD/G5aXlNBWs6u8hUiCGe5knKhkbq6rLFxlL9OIKkEJHqk3gvwUu2Qu2/sfpW3mOOR7h4BzOPRli65KeN+hXfgmjuVxoH3Qy3rnNL8cqs5JOZRTP7wWboESjJh7MFzZN8jb5Z97y9au/5Evj6spSHzqAf+nvsk68O0V9LUlJxbRAUraalt/ruoLEcGcfJ5v2sNjPcao90pBbP0elRldWxBfY9W4x2be7QJ8jY+Z/2PiWYmRlVusjzA3LJ/CUWkqsPFRtl7rm5/nEaL1L0L7C859ZQF7HhTvqN7zHdSbm7NfiakEoziLmOfWY3qV5eoA3R7LBFkDsZ/KjJS9Ygrc/YHjQOuq0Y0uqRYiDQFAIS1kmQQ4uMfAbP5hJfuCSJpJFaHz/ETyHGcrOT4TpYJOI/ET3mjAi4sUsS38e6VZvlTwqW2wqrDVrwHaNRK7OmXy5jer6Re9DINvMhCw== X-OriginatorOrg: ni.com X-MS-Exchange-CrossTenant-Network-Message-Id: e18f5939-81b6-4e46-31a2-08dba0134eef X-MS-Exchange-CrossTenant-AuthSource: BYAPR04MB4870.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Aug 2023 17:48:19.3765 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 87ba1f9a-44cd-43a6-b008-6fdb45a5204e X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: FjTA/BxdfIxXgwa177z/RO0LbqCQeo15fxmVLWnhHbN+VYPd6wcBYCIJ2D32gaBaKk4oHcmH2Ei7ZOcT4Upm5Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR04MB9012 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 ; Fri, 18 Aug 2023 17:48:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/186388 Add a new bbclass that allows building a feed using the new oe.package_manager class. Additionally, there are packagefeed_ bbclasses to define package type specific configurations. The do_packagefeed task currently does no use SSTATE data and is set to always run via [nostamp] = "1". The variable FEED_DEPENDS is used to specify feeds that the packagefeed depends on and will be available side-by-side. This prevents duplicate packages in the two feeds. Signed-off-by: Charlie Johnston --- meta/classes-recipe/packagefeed.bbclass | 50 +++++++++++++++++++++ meta/classes-recipe/packagefeed_deb.bbclass | 8 ++++ meta/classes-recipe/packagefeed_ipk.bbclass | 8 ++++ meta/classes-recipe/packagefeed_rpm.bbclass | 8 ++++ 4 files changed, 74 insertions(+) create mode 100644 meta/classes-recipe/packagefeed.bbclass create mode 100644 meta/classes-recipe/packagefeed_deb.bbclass create mode 100644 meta/classes-recipe/packagefeed_ipk.bbclass create mode 100644 meta/classes-recipe/packagefeed_rpm.bbclass diff --git a/meta/classes-recipe/packagefeed.bbclass b/meta/classes-recipe/packagefeed.bbclass new file mode 100644 index 00000000000..de075294645 --- /dev/null +++ b/meta/classes-recipe/packagefeed.bbclass @@ -0,0 +1,50 @@ +# +# Copyright OpenEmbedded Contributors +# +# SPDX-License-Identifier: MIT +# + +# Class for creating package feeds with indexes for a group of packages and their +# dependencies. +# +# When deploying a package feed or repo for an image such that deployed images can +# use them, it's not always desireable to include all packages in the default +# DEPLOY_DIR_ directory in the feed. This class allows specifying one or +# more packages (or packagegroups) to define what should be included in a feed and +# creates a feed in DEPLOY_DIR_FEED with only those packages and dependencies. +# This allows for creating one or more feeds at once and removes the need to +# remove unwanted packages manually before an index is created. +# +# Example: +# inherit packagefeed +# +# RDEPENDS:${PN} += "\ +# packagegroup-core-buildessential \ +# " +# +# Optional variables: +# FEED_DEPENDS: +# Specifies one or more feeds that the feed depends on and excludes packages in +# those feeds from the feed being built. Used if a feed depends on packages in +# the feeds listed and it's safe to assume those feeds will always be present. + +PKGFEED_INHERITS = "${@' '.join(['packagefeed_' + x for x in d.getVar('PACKAGE_CLASSES').replace("package_", "").split()])}" +inherit ${PKGFEED_INHERITS} nopackages + +LICENSE ?= "MIT" + +# Feeds listed in FEED_DEPENDS and their dependencies will be excluded from the feed. +# This allows for side-by-side feeds without duplicate packages. +FEED_DEPENDS ??= "" + +fakeroot python do_packagefeed() { + from oe.package_manager import generate_feed_dirs, generate_index_files + + generate_feed_dirs(d, d.getVar("FEED_DEPENDS")) + generate_index_files(d, isFeed=True) +} +addtask packagefeed before do_build +do_packagefeed[recrdeptask] += "do_package_qa" +do_packagefeed[nostamp] = "1" +do_packagefeed[rdepends] += "${@' '.join([x + ':do_packagefeed' for x in d.getVar('FEED_DEPENDS').split()])}" +do_packagefeed[cleandirs] += "${DEPLOY_DIR_FEED_DEB}/${PN} ${DEPLOY_DIR_FEED_IPK}/${PN} ${DEPLOY_DIR_FEED_RPM}/${PN}" diff --git a/meta/classes-recipe/packagefeed_deb.bbclass b/meta/classes-recipe/packagefeed_deb.bbclass new file mode 100644 index 00000000000..2decc70a4f7 --- /dev/null +++ b/meta/classes-recipe/packagefeed_deb.bbclass @@ -0,0 +1,8 @@ +# +# Copyright OpenEmbedded Contributors +# +# SPDX-License-Identifier: MIT +# + +do_packagefeed[depends] += "apt-native:do_populate_sysroot" +do_packagefeed[recrdeptask] += "do_package_write_deb" diff --git a/meta/classes-recipe/packagefeed_ipk.bbclass b/meta/classes-recipe/packagefeed_ipk.bbclass new file mode 100644 index 00000000000..89d296200b9 --- /dev/null +++ b/meta/classes-recipe/packagefeed_ipk.bbclass @@ -0,0 +1,8 @@ +# +# Copyright OpenEmbedded Contributors +# +# SPDX-License-Identifier: MIT +# + +do_packagefeed[depends] += "opkg-native:do_populate_sysroot opkg-utils-native:do_populate_sysroot" +do_packagefeed[recrdeptask] += "do_package_write_ipk" diff --git a/meta/classes-recipe/packagefeed_rpm.bbclass b/meta/classes-recipe/packagefeed_rpm.bbclass new file mode 100644 index 00000000000..8ce37cc8551 --- /dev/null +++ b/meta/classes-recipe/packagefeed_rpm.bbclass @@ -0,0 +1,8 @@ +# +# Copyright OpenEmbedded Contributors +# +# SPDX-License-Identifier: MIT +# + +do_packagefeed[depends] += "createrepo-c-native:do_populate_sysroot" +do_packagefeed[recrdeptask] += "do_package_write_rpm" From patchwork Fri Aug 18 17:44:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Johnston X-Patchwork-Id: 29152 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 5074FEE498C for ; Fri, 18 Aug 2023 17:48:30 +0000 (UTC) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (NAM10-MW2-obe.outbound.protection.outlook.com [40.107.94.102]) by mx.groups.io with SMTP id smtpd.web10.871.1692380904571287049 for ; Fri, 18 Aug 2023 10:48:24 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@ni.com header.s=selector1 header.b=FMejlIjc; spf=pass (domain: ni.com, ip: 40.107.94.102, mailfrom: charlie.johnston@ni.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PTO8BsAP+ksGgY6fAWHghgtxzUIbjER0G2cYeYSyNVTVzutUh1WfdRkLC8oJikHCIFVCYgwhj4LwUawtgI8WdFJhxahNiVoe3CorQTrQCkDt9nn8AqKdOgwtrj0Tjx9FsBomjYXAVRUXKdQpm1dmMsRoOKvfMKuTu11HvYtx32hOkG708eG7yNufnNB4VicRcP2ZQzakCvCmVADbLnPkcCznfQiXZ53gCgjyFeg7NIUS7iyWH2lozwX0FNRqiLLgOCsBnaIrLIF3Z1PWKzD9H7i6+yf9ns5xFB0ArNEeiiEvyHVLbgERZvxngyBwpSiEV29OZKKw996wUb19HjCaaA== 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=+sQfhYHCrA54H85qkbdrv1Jiwl/y2pE71O8NkRvRgpk=; b=SkCY+8c2Acs2Ns1WBeII9l/VCFRLl9Cs5G5/SWkozdfaW9FropEAZdmPt/ewgKGQ8D8/4loqK0pfui+4Rd95EZesB+JKBcQwsPTOFcPLMUnh/9558Tv0qREObM1f53OB15sv9wKU4sViYA7bvpVNIv8VlhL8pkJCk7/OwUBtqwOekkCMtQAOxpIw4wbavhGSFepne5025ZBQhhmDitJIZQNrozdoKIjbU61nMsx2p2WlU2lb5w0972bsy6NIPZq/dAk7/X6aGo0BjdOdeCuvwiF6/9KgObYey8rlzlvm5FI++KK18uj8Cpq1DrrnKgmZlszKzRa+tXJwtWUwfy6ylQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=ni.com; dmarc=pass action=none header.from=ni.com; dkim=pass header.d=ni.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ni.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+sQfhYHCrA54H85qkbdrv1Jiwl/y2pE71O8NkRvRgpk=; b=FMejlIjc0re9wPZ0AZs1B0mbZWsqw4GYKDNsa6nRoHWVp7QdTG58Cj94v+K6T9CzgIfhzhqbbYa1BrBIJP+QQAwz3yHNMO544sDLroPOO3/R2If5XswX4SFIgVel/Hvvc6+a9KLkosXFt2g8P3yiKBQQvMetKrGN75jvvlXVlrA= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=ni.com; Received: from BYAPR04MB4870.namprd04.prod.outlook.com (2603:10b6:a03:4a::15) by SJ2PR04MB9012.namprd04.prod.outlook.com (2603:10b6:a03:563::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.29; Fri, 18 Aug 2023 17:48:22 +0000 Received: from BYAPR04MB4870.namprd04.prod.outlook.com ([fe80::9f2d:5e4c:747a:6add]) by BYAPR04MB4870.namprd04.prod.outlook.com ([fe80::9f2d:5e4c:747a:6add%5]) with mapi id 15.20.6699.020; Fri, 18 Aug 2023 17:48:22 +0000 From: Charlie Johnston To: openembedded-core@lists.openembedded.org CC: Charlie Johnston Subject: [oe-core][PATCH v3 6/8] packagefeed.bbclass: Add cleanfunc for cleaning feeds. Date: Fri, 18 Aug 2023 12:44:55 -0500 Message-ID: <20230818174754.988128-7-charlie.johnston@ni.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230818174754.988128-1-charlie.johnston@ni.com> References: <20230818174754.988128-1-charlie.johnston@ni.com> X-ClientProxiedBy: SN6PR01CA0007.prod.exchangelabs.com (2603:10b6:805:b6::20) To BYAPR04MB4870.namprd04.prod.outlook.com (2603:10b6:a03:4a::15) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BYAPR04MB4870:EE_|SJ2PR04MB9012:EE_ X-MS-Office365-Filtering-Correlation-Id: 6367a1c1-fc44-4598-9e87-08dba013508b x-ni-monitor: EOP Exclude NI Domains ETR True X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: F78nyZtnPNF3wLj8q9shYr22aFieXtXRXkoYeNa/6avnQt/st7qLu8+q3SLhWEXJ3njo6E/bR6+TY1+DHAn4BKy20UGusNA6rHAY2L1+6kwVrPxhUzecXIYB2MiQP6KKZpt1+kyLPPGBzDoHd0HS0EjjWWqwqX2Qfij/8nIvB/x+Z2lbE0Uc5zXJMlT8+LYRzdWszxZnzAmkIhRhwEwqYaLC89hdHtb3KMZUau2H1ye8F6IrBSwf3oNNVbDbpgW3ET3QJchW0ozTMwpvQcFbMkLZt2yolnEhtA15wuMzrQVEUZoa66Zq+vypgYXQ5YLCIcF5+GoDwTWn7AVVgi4R8DajT1k9MSImQmfUcMilya1jBEfmmXB+4qSGNqVSog3EKGN1otMpmyhXxoVBtlSTwt3PbKV7lS+icaIxk1tZ6bxWBSGXerpqDR/5nARuk9tznJ8m1nPRdxds/HTFFA3YB3mtMixeD94YqFGiITOifKlympxgX7jd/j8Io0NexQb7q4vRK0ebjAe0HrPaSTCps9ysOj1YtrXEjLelaTB5/98wTqtzLmJJtZNsNa1FYePc X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BYAPR04MB4870.namprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(366004)(136003)(396003)(39860400002)(346002)(376002)(186009)(451199024)(1800799009)(2906002)(83380400001)(26005)(6506007)(86362001)(478600001)(6666004)(6486002)(2616005)(1076003)(6512007)(36756003)(44832011)(5660300002)(41300700001)(66476007)(66556008)(66946007)(316002)(6916009)(4326008)(8936002)(8676002)(38100700002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: nnKrGCTAIwKOs0fMlf4utC1vMK7BGRPyCXytRYgtOy5Ia57d7ZkFR+73gmDhVIeodDk82UthALBGt0bok9sr9VPzL8cmYY7SOnYSmehDJLKntwAKT3+UkOZw3HWIK9IxUV8CtCX5zul3flXmi4RCuvHSueGnZYfR6OglpwTuYZVf9AMlM4B2CK0ZIUiPYiH+7xzdx136pEKkQLDbWxE0H09vflCqwEReR3yultlthb03RNBqCLPTRxYbK2D2Ld3IFM6LJE7Lu7ePMBay0D8a9F1ayXAMvb8Y7O/qlJXLJSK/MVnt9qm2aGBAq9OdCyFV6srxg2wopM3XjHCTkAosnu/Q5J/jKy1S08x6jMJPuCSwhIJ6dfYiXBOb4W4YDFtuxrflrTopNuw/j+PdzMBMCFcCtDwNQvlw5xjll4X7GQzGmZW7PLhuU0o9XhN/Oz/biKvu9FoagtdMZi5lz2G5v16vV6QLEBHmraLoSxr/1GOCZYmxD28TG/UKSFceeil3iG4c9yvkx9XF0kn5cAClTDpEw4tGE6S+PZYf5f66fTgXIPglUL76XZjDoa2rMNZ1souQ9+trBpnNEHpNfGJf3WQQS+wVXyQ4qqc5izXfUeiJHOW2aH7/M+LvZMsfuLH6hpsCu+cm30ZEgUe4+J3uhsLPGY8ggHnA+tZnPzGf4cydkCzV9it6rYc/uKDxVgMDHyDWAMnPEkJYdWFdO4ef36XLGSGAuku8PLzvVg1Exb20eEmiHnC9EwyvpfncZcbR594a4S1czl+/irlPwSHWG3qScmjKjsAYmeMuWo8kmUkeSB/gwVeQMSDM9mP9MMNLbgvifpoekp3Az8XgmSg2CUmyk2UuWbDOsrWMKialr04hzpwiNLWpJSjKoxE8qvkwmnUbYWwZG9tQQxHqZF2epWYTnAtCt/X97YtIeU6Q32xxRrPaN4T/l59ewXfkZXlFVPHUt28Ud0sS4mOYhkaaAbsJlC6DiOHx+AyayKXQa9wZ0sL8xx5Ok2xbefPhm9f5gbbs3gmVd9b85nbkeIK9FFh/QYkZagdmEQUiu9fEDs60i9Txhbf8NuthM7KxG0//a6EC4KbitIDSr2gsucwDNLVPPax6NNBDkU5yw/i01rSYcqDOV3PGdxoYae5tI/595Vv1kEbM3LKCwW8aH2cZJPputHOyyg8t1e6EyWCz2P6Vc1q4L8LG0a0rfDpw9u8GPOBbU4H9k2HSwdwPHkmL0ISmGOL8+egQGdJObcQIDGqqGQHeFumUUL+PwPD9Rq17YbPBhQvZXOBjVsvbAnWMaUUX9hH7gXhS2R4quECjv74OGgZ6zZdBtv5jAbWY6Cy3YjtXHU5hdv/x1Rw7TMRYKU5ZC2LJfeUIH0ZFOIx8PY/UV8YcCKdIPZ/J/SWi0Uf8nHe173Id64ffmtwq2CR7U6G1hKCMnEi7V61EkHkD77imfLnA+28Gd2dHrzQwVhDVzfklclqBubbgrQAZuLvuooxsoFBYbDexpjUnwywKOzS+1P6/yujTr1v0Iu2zhmeO0Wr7YM1qGAFOi0OZo7l1iJtfw1ImgCQ6MvhgRnM/TDrK18OvFBaODc0Qs41yomrG7RSVcLK2JXPnvszL3D5QOw== X-OriginatorOrg: ni.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6367a1c1-fc44-4598-9e87-08dba013508b X-MS-Exchange-CrossTenant-AuthSource: BYAPR04MB4870.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Aug 2023 17:48:22.0645 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 87ba1f9a-44cd-43a6-b008-6fdb45a5204e X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 3AdtWygxW1DQZHFgEoZjQxqgNnJe2LZz0kyB5pZuIm4Q6qkOJDslNQbJ2QfqU4IB2vUO9P2ykMZX7pOus9IGpg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR04MB9012 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 ; Fri, 18 Aug 2023 17:48:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/186389 Since the packagefeed build logic does not use sstate, the deploy directories will not be cleaned by a do_clean or similar commands. This change adds a function to wipe all feed deploy directories for the given feed when a clean command is run. That is, regardless of the value of PACKAGE_CLASSES, all DEPLOY_DIR_FEED_ directories will be cleaned. Signed-off-by: Charlie Johnston --- meta/classes-recipe/packagefeed.bbclass | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/meta/classes-recipe/packagefeed.bbclass b/meta/classes-recipe/packagefeed.bbclass index de075294645..0bd37790eb2 100644 --- a/meta/classes-recipe/packagefeed.bbclass +++ b/meta/classes-recipe/packagefeed.bbclass @@ -47,4 +47,16 @@ addtask packagefeed before do_build do_packagefeed[recrdeptask] += "do_package_qa" do_packagefeed[nostamp] = "1" do_packagefeed[rdepends] += "${@' '.join([x + ':do_packagefeed' for x in d.getVar('FEED_DEPENDS').split()])}" -do_packagefeed[cleandirs] += "${DEPLOY_DIR_FEED_DEB}/${PN} ${DEPLOY_DIR_FEED_IPK}/${PN} ${DEPLOY_DIR_FEED_RPM}/${PN}" + +CLEANFUNCS += "packagefeed_clean" + +python packagefeed_clean() { + bb.note("Cleaning feed directories for %s" % d.getVar('PN')) + + deploy_dirs = [d.getVar("DEPLOY_DIR_FEED_DEB"), + d.getVar("DEPLOY_DIR_FEED_IPK"), + d.getVar("DEPLOY_DIR_FEED_RPM")] + + for dir in deploy_dirs: + oe.path.remove(dir) +} From patchwork Fri Aug 18 17:44:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Johnston X-Patchwork-Id: 29155 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 4C059EE498E for ; Fri, 18 Aug 2023 17:48:40 +0000 (UTC) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (NAM04-MW2-obe.outbound.protection.outlook.com [40.107.101.137]) by mx.groups.io with SMTP id smtpd.web11.930.1692380911643476540 for ; Fri, 18 Aug 2023 10:48:32 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@ni.com header.s=selector1 header.b=BhgFRTHe; spf=pass (domain: ni.com, ip: 40.107.101.137, mailfrom: charlie.johnston@ni.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eQmi0RLyOChg6cDF/5QmY7PTxoupPlXpofaQ85ohaIuK4mjXGhDG9MNnzjqhrJ+7oXWdcZzA11fz/8HWkOJL74xV8UdLkPMfcqv0G3MddW0oDO13bjec+xSKwpwNxbUdSF0X7Q+H8hwC4p6R8D6BTKRiGOJsptNcR6PWo/IpcMDJjUIpr15VUEWxbXSprmNxb8r7u3eXhcCAN297w13fq8i2MdJCd2fYLvMrTzg8QTE9sR6Lf1vdODKkhaZAaQdhvj9HtUZnkDzeCy0ZWOGwxBm5926kSjAMR2wn3MiSdGi9jqYLZ0DI2UXBSos3JSA8XYUTBecwB6cSWKevV8CdRA== 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=dEBCUcekyudKWpV/SkR2dmXDFO9v46d8CG6o4o5odmE=; b=USr8Ly3WycAzna7qOWr67I75mxQAsFxH/O/Hykl35/UFYu7xppIbLv0HuqvQWRGHNETaWJRG8QlUTtfcHoF5VoCykL6mqCKxZa1sRaFRQMOz/+sxfjWLbODNAkHlE3umjQutMV6UJrY3vRc/tzTb9EG9eLg+RWtjnA8ezeFaJtvaoeAan0I3Ar+HfHzaK5Z3lpxsPqM75aK+cWhJrHjl5tzv3XSsc0g25NuN899tfg+jYsQefJeao409At6ojBCGyVx0avUHPd8sUw9jI7Bo8HMH8xzP9N4Wm8Xp4uiNj5fgwt62t4ma21nfqbVHXpj9SLzWVh8Zj20ZaUsxB9KBLw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=ni.com; dmarc=pass action=none header.from=ni.com; dkim=pass header.d=ni.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ni.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=dEBCUcekyudKWpV/SkR2dmXDFO9v46d8CG6o4o5odmE=; b=BhgFRTHe1QFM3kt3/v+VIzFf35rqapSYYsfLM3er9FT1FYcO7xJP2MWwxy1tq6zUVEW3bfkGgBuwEYpAN6rDgrq05M0X8uyY5sp36WhfzjpP84oUVYJNLDg1Up/MKblhiXTOq1/awreFahXLtJJ9oeOoRTkoeMWRlu2zYgQA9BY= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=ni.com; Received: from BYAPR04MB4870.namprd04.prod.outlook.com (2603:10b6:a03:4a::15) by CYYPR04MB8867.namprd04.prod.outlook.com (2603:10b6:930:bf::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.30; Fri, 18 Aug 2023 17:48:25 +0000 Received: from BYAPR04MB4870.namprd04.prod.outlook.com ([fe80::9f2d:5e4c:747a:6add]) by BYAPR04MB4870.namprd04.prod.outlook.com ([fe80::9f2d:5e4c:747a:6add%5]) with mapi id 15.20.6699.020; Fri, 18 Aug 2023 17:48:24 +0000 From: Charlie Johnston To: openembedded-core@lists.openembedded.org CC: Charlie Johnston Subject: [oe-core][PATCH v3 7/8] testimage.bbclass: Update rpm dnf tests to use do_packagefeed. Date: Fri, 18 Aug 2023 12:44:56 -0500 Message-ID: <20230818174754.988128-8-charlie.johnston@ni.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230818174754.988128-1-charlie.johnston@ni.com> References: <20230818174754.988128-1-charlie.johnston@ni.com> X-ClientProxiedBy: SN4PR0501CA0042.namprd05.prod.outlook.com (2603:10b6:803:41::19) To BYAPR04MB4870.namprd04.prod.outlook.com (2603:10b6:a03:4a::15) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BYAPR04MB4870:EE_|CYYPR04MB8867:EE_ X-MS-Office365-Filtering-Correlation-Id: 681e7dee-06a5-4697-a922-08dba0135225 x-ni-monitor: EOP Exclude NI Domains ETR True X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AhtXsO+do0AWAzArHmLi/1sClhzCk29VeXr0s7JiNwvIdojha0I7KQgz9wkVYJkCIZ6aI7Unx8r5J4hJCawbNEZF2GC4r1O0esNk2j7PkHmSfLEJSIgpdOFptAjcHjs1yZdPoCy7woKy/Fvt7slKAjIckXp8Z79h31vzPNSa0zXB++4f9E8K73qDeJonr9klANzq71kbJbCd4KLI4Hy6ndBwHJLdR0t3AzPWhZOjvTzfuk6uiTYrsYarhUOkowwJTuA4Ziak2Kje1JOuNWEosaC3k/ck0XvdZOxSwBxhv9EOSqhss9LWePwMBqG+pxEke5HLmK9EZhQ0tZaEt2QoKzxR5gmw6Lr+B63nHRcR70yEGotFqPyv/p6vnSQCkMerDv3sOj6u2zPz24ohwXu061MwETRSOImqEGW99vVALXS50Wm7snHW/5/ZFBRuV2JBUm5zD6e41EWbUoh30Aw9uOImXkkYs6mo7HoPxk9eNscSoqYECbHoC5s7PmyFYqtawakNRuIU13pS7YF63JTs2fnw+GCGkgCcWtChbzXpNA4zLuNXvySf91GJr2aWNx+w X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BYAPR04MB4870.namprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(346002)(39860400002)(366004)(376002)(136003)(396003)(186009)(451199024)(1800799009)(2616005)(83380400001)(6916009)(316002)(66556008)(66476007)(66946007)(2906002)(26005)(36756003)(44832011)(1076003)(6506007)(6512007)(6486002)(15650500001)(5660300002)(478600001)(4326008)(6666004)(38100700002)(86362001)(8936002)(8676002)(41300700001);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: YrhwswTSPdeXkZ0a9wmjVK5IBxJg61hVBTq1/FuyscDkvSgX01HznNIRwQP/J8lAOH9v4Jp4AZK6kVn5ZmZxYyTvQXmQVIbqwmfdN3IhFnv46PVTLvhZJ5dm9lc223g/oqHjaZLlQCMfrnD8SUUfZpT3aJQQIS54zZfuWpcEHgTRcq8CvnifECbKri9cP3QH/vv4rb7HNCm8WjMGQuGKfaSsKb2KyFicFN9Np3L3udFNZWPKXNX3b9O/VFUdjjIPdNJMNofPUi69+ZDtmgigiRYUREgS6an0qLSx2v0zLFUggViYQtqV6rFbAHff7CTQumtbd+2Ef3EXwfyYc5M794dx9xr7rXQWH4+uCksTutqK+LSZQoy71g0FUNe9S7CCdsRBknuLxCBC0qkj3U4Dqgq5iU79pfU7Hc2rU2X2oM7yZfSKcll0EPmM8COBBHi3qVQUqwKEUCxOBIjMPTL8hI5RXlZuA1uX/nkqOwrdPju4uMXsQyEHkIQHNIdNdtkH/l0hcuGc7GebRdWFs6bdjV4OII7oqnTq7mtpjGegjYVgmOTUUP/MMS6wykQWpvzX7THiGLBGYwE9u6fSL4uI0HmQlBMCpUR7TPHPh5BhaA8hzv3OadjRf/RvhNywIY0nqFYlZqJZ1pd0QqP608XrbUN5qaj9acUtbhXgZYqnGBN0NgR+gpl6WJDcyB/WhLyo7YS3MPw7d5R5wvLBQPqWLzrHspHqWvQ/G9jdcbfBfoSChZboOZiIjIBbgqsYobeuKxo77itT5ERbNXCI8fWSmiQw5RT+2V2f7PmK2gXEy31jhap1tu3Rb9iymYxqbsaW6qm9ejM0dt3bsqVETcOdZCxNXFxOo18khOpZ0hL75y7Uz0k6u3X94TdDIbtabZrL6BX4cp44iQz5kS6G5Qf18jqQT+WaG6wYNC6a/iw4l8WckQLdLMg26BScxR/ctSA4fzLu8NGptBmd0B9Iw8FC4j76y6gmu/9+sXTL+D4Q9AC3SDbq7zHIqqF6fCTRo+q0xq3s34/mUDxZ/Lwd7j2Xp87CgjVh4f377amc2h8lPrHKc6KHmO9Ujnzs/lhviCZ+AUPJ8yQoOF18OxEHarW67Risx9Dclpv9N15HGoUbIBX+8GEeyE9czMzFhCEc/L/7fnnMAaF2c3+YmjSGk8/6u6ai7CCYLIAoSdzBQZToim4mqPlrvvdq7XZcwOLa+HBZqBHbrTsWH+U4D1HNPscF/Jx2Yj8CkajX7daIDmYuIONctWrlSxoPcAs+HrimoegmJHONhbHgicFbMreG2YX16y9H9N2kcxST0JxZwf6R7jOqN2dSFPdTkKjj9lX3u6N9yFg1QUzPKmnScksZ9ahEGopmoai/sERiJRxW3YkZ/xCpZnxJaRacFnvpuKe0DXGKkNh3e243cBkOiMPokdZVsJXTdsUXpbMIWhBnweN/3ZCiECKh/GYVkVvgpso+E0oPTmurmnjn9Kq53k+t/+gis238apRQzC1CbgZ9arHW2rxd6WcK7Ydv9HAA2c6mdlmLSPRIx2sAe+oLr8qOvpKRRShdBsDJinfgychCKton7oeJ87DVW2ey+iSTW8AHnwgZhAFR1mR7BxiiF1PeXUfn8Q== X-OriginatorOrg: ni.com X-MS-Exchange-CrossTenant-Network-Message-Id: 681e7dee-06a5-4697-a922-08dba0135225 X-MS-Exchange-CrossTenant-AuthSource: BYAPR04MB4870.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Aug 2023 17:48:24.7333 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 87ba1f9a-44cd-43a6-b008-6fdb45a5204e X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: LEljrIYSJGtUA888n1lLtUaYPcn+MW5utINhoX19kZuFVsRMjRwqKFqI1Uvq1LPYv+NTbCJkRVdqRFSxcD/VuQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYYPR04MB8867 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 ; Fri, 18 Aug 2023 17:48:40 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/186391 To test the new packagefeed.bbclass, the testimage case for testing on rpm images has been updated to use a newly added packagefeed (packagefeed-core-rpmtest) instead of manually moving the feeds from DEPLOY_DIR_RPM, removing unwanted packages, and building the indexes manually. The new logic creates the feed in DEPLOY_DIR_FEED_RPM via building the packagefeed and links to it from the location expected for the tests to run. The resulting feed is technically bigger than before but is still smaller than creating a feed with all packages present in DEPLOY_DIR_RPM without the manual removal step. These changes were tested against testimage runs of the following images: - core-image-minimal - core-image-full-cmdline - core-image-sato - core-image-sato-sdk Signed-off-by: Charlie Johnston --- meta/classes-recipe/testimage.bbclass | 57 +++---------------- .../packagefeeds/packagefeed-core-rpmtest.bb | 12 ++++ 2 files changed, 20 insertions(+), 49 deletions(-) create mode 100644 meta/recipes-core/packagefeeds/packagefeed-core-rpmtest.bb diff --git a/meta/classes-recipe/testimage.bbclass b/meta/classes-recipe/testimage.bbclass index e3068348ff0..d862e6d98ee 100644 --- a/meta/classes-recipe/testimage.bbclass +++ b/meta/classes-recipe/testimage.bbclass @@ -101,6 +101,7 @@ TESTIMAGEDEPENDS += "${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm', 'dnf-native:do TESTIMAGEDEPENDS += "${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm', 'createrepo-c-native:do_populate_sysroot', '', d)}" TESTIMAGEDEPENDS += "${@bb.utils.contains('IMAGE_PKGTYPE', 'ipk', 'opkg-utils-native:do_populate_sysroot package-index:do_package_index', '', d)}" TESTIMAGEDEPENDS += "${@bb.utils.contains('IMAGE_PKGTYPE', 'deb', 'apt-native:do_populate_sysroot package-index:do_package_index', '', d)}" +TESTIMAGEDEPENDS += "${@oe.utils.ifelse(d.getVar('IMAGE_PKGTYPE') == 'rpm' and ('dnf' in d.getVar('TEST_SUITES') or 'auto' in d.getVar('TEST_SUITES')), 'packagefeed-core-rpmtest:do_packagefeed', '')}" TESTIMAGELOCK = "${TMPDIR}/testimage.lock" TESTIMAGELOCK:qemuall = "" @@ -251,7 +252,7 @@ def testimage_main(d): if (d.getVar('IMAGE_PKGTYPE') == 'rpm' and ('dnf' in d.getVar('TEST_SUITES') or 'auto' in d.getVar('TEST_SUITES'))): - create_rpm_index(d) + copy_rpm_repos(d) logger = make_logger_bitbake_compatible(logging.getLogger("BitBake")) pn = d.getVar("PN") @@ -459,55 +460,13 @@ def get_runtime_paths(d): paths.append(path) return paths -def create_index(arg): - import subprocess +def copy_rpm_repos(d): + rpm_dir = os.path.join(d.getVar('DEPLOY_DIR_FEED'), 'rpm', 'packagefeed-core-rpmtest') + idx_path = os.path.join(d.getVar('WORKDIR'), 'oe-testimage-repo') - index_cmd = arg - try: - bb.note("Executing '%s' ..." % index_cmd) - result = subprocess.check_output(index_cmd, - stderr=subprocess.STDOUT, - shell=True) - result = result.decode('utf-8') - except subprocess.CalledProcessError as e: - return("Index creation command '%s' failed with return code " - '%d:\n%s' % (e.cmd, e.returncode, e.output.decode("utf-8"))) - if result: - bb.note(result) - return None - -def create_rpm_index(d): - import glob - # Index RPMs - rpm_createrepo = bb.utils.which(os.getenv('PATH'), "createrepo_c") - index_cmds = [] - archs = (d.getVar('ALL_MULTILIB_PACKAGE_ARCHS') or '').replace('-', '_') - - for arch in archs.split(): - rpm_dir = os.path.join(d.getVar('DEPLOY_DIR_RPM'), arch) - idx_path = os.path.join(d.getVar('WORKDIR'), 'oe-testimage-repo', arch) - - if not os.path.isdir(rpm_dir): - continue - - lockfilename = os.path.join(d.getVar('DEPLOY_DIR_RPM'), 'rpm.lock') - lf = bb.utils.lockfile(lockfilename, False) - oe.path.copyhardlinktree(rpm_dir, idx_path) - # Full indexes overload a 256MB image so reduce the number of rpms - # in the feed by filtering to specific packages needed by the tests. - package_list = glob.glob(idx_path + "*/*.rpm") - - for pkg in package_list: - if not os.path.basename(pkg).startswith(("dnf-test-", "busybox", "update-alternatives", "libc6", "musl")): - bb.utils.remove(pkg) - - bb.utils.unlockfile(lf) - cmd = '%s --update -q %s' % (rpm_createrepo, idx_path) - - # Create repodata - result = create_index(cmd) - if result: - bb.fatal('%s' % ('\n'.join(result))) + oe.path.copyhardlinktree(rpm_dir, idx_path) + # Test cases assume only arch directories and not a top-level repodata next to them. + oe.path.remove("%s/repodata" % idx_path) def package_extraction(d, test_suites): from oeqa.utils.package_manager import find_packages_to_extract diff --git a/meta/recipes-core/packagefeeds/packagefeed-core-rpmtest.bb b/meta/recipes-core/packagefeeds/packagefeed-core-rpmtest.bb new file mode 100644 index 00000000000..cec5458a8bf --- /dev/null +++ b/meta/recipes-core/packagefeeds/packagefeed-core-rpmtest.bb @@ -0,0 +1,12 @@ +SUMMARY = "Package feed containing the packages needed for dnf testing of rpm based testimages." + +inherit packagefeed + +RDEPENDS:${PN} += " \ + busybox \ + update-alternatives \ + glibc \ + dnf \ +" + +SKIP_RECIPE[packagefeed-core-rpmtest] ?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'is intended only for tests where PACKAGE_CLASSES includes package_rpm.', d)}" From patchwork Fri Aug 18 17:44:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Johnston X-Patchwork-Id: 29154 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 4BF31EE498D for ; Fri, 18 Aug 2023 17:48:40 +0000 (UTC) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (NAM04-MW2-obe.outbound.protection.outlook.com [40.107.101.137]) by mx.groups.io with SMTP id smtpd.web11.930.1692380911643476540 for ; Fri, 18 Aug 2023 10:48:31 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@ni.com header.s=selector1 header.b=kQy+I621; spf=pass (domain: ni.com, ip: 40.107.101.137, mailfrom: charlie.johnston@ni.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BG1e6qCRA5bH4bgmJbepoLhF0zGgUVA0Ffuihv30MOfS95c2IHbblKyncpwRI8ca+CnpADnf7eID2kHOOM5aX2N4jrvJCqkE2caG6Nv9lowZh2Ae/S8OfgeN8qvpfhIekifpdhHvVXDUc3vfojGyarvT/aZYO5OIgbSoIATIm3JuN+sRwxzkZIyZTZzy3qolaSd1Byh7q6SaTvKTpwSKBK+B7ZCse3rp7GVlH7Ilg9qvba7oxyW22tnC0tzd5kMXTAL0HsdM7le/lNIrNMLxJGO0GbuWzGPVzWG47t939BP6Xir7/1N+BmgFZ/FK/d8GTtKnaS1RzO8IFzRY5eYB9A== 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=7wekKM55XuJU3iPgPSLeIGmn+KBY4hFqoRpo/ysu/7Q=; b=VAuswuVFTgVi6ZEksj3uoIp3socIdw7wsh+yXbcDZNYthzPOk+zHWXYXjCtBBplInm/UbUqUCfgp9vmrxdiIdprPBzkKzxBR9dgK/AhHe7Rd+GgVj0vbRV2YNwzjVn9VbX32qm6WguIk99Fx6eiJCVU/E1tV0gwZaN6LCv8cQ8b1VKXhCYNOJqWH/hOKk9RpPDq3rXu2WYJxVq269/O+3ORkB6DLNAlFCmNGDqehAa/LNv5FETkpT0C/rcHU3qYO4ie8XtPvki+1CY0SXnHsVTm/zwu58exOWhmutw6nOz5HYmYoj7WgcD+G2oSuVrdTcVjYFMaEEnQAjSEslFdpeA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=ni.com; dmarc=pass action=none header.from=ni.com; dkim=pass header.d=ni.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ni.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7wekKM55XuJU3iPgPSLeIGmn+KBY4hFqoRpo/ysu/7Q=; b=kQy+I621M6kx6bkMS+sJ30Sxh940JpdwsZ9Ulm191dDGCGso+TSqItiwAnysgurhXj2RP5aW/4fKjpDmishJINoVY3aIjUhrsUuEyO1sGiY1C9PoTL20BbTc6uArYBBT9xoofxJaUEdJbOqoVSZYSBojYc0n+fBx7J8y7BHA+Ro= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=ni.com; Received: from BYAPR04MB4870.namprd04.prod.outlook.com (2603:10b6:a03:4a::15) by CYYPR04MB8867.namprd04.prod.outlook.com (2603:10b6:930:bf::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.30; Fri, 18 Aug 2023 17:48:28 +0000 Received: from BYAPR04MB4870.namprd04.prod.outlook.com ([fe80::9f2d:5e4c:747a:6add]) by BYAPR04MB4870.namprd04.prod.outlook.com ([fe80::9f2d:5e4c:747a:6add%5]) with mapi id 15.20.6699.020; Fri, 18 Aug 2023 17:48:28 +0000 From: Charlie Johnston To: openembedded-core@lists.openembedded.org CC: Charlie Johnston Subject: [oe-core][PATCH v3 8/8] insane.bbclass: Drop qa check for maintainers of packagefeeds. Date: Fri, 18 Aug 2023 12:44:57 -0500 Message-ID: <20230818174754.988128-9-charlie.johnston@ni.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230818174754.988128-1-charlie.johnston@ni.com> References: <20230818174754.988128-1-charlie.johnston@ni.com> X-ClientProxiedBy: SA9PR13CA0111.namprd13.prod.outlook.com (2603:10b6:806:24::26) To BYAPR04MB4870.namprd04.prod.outlook.com (2603:10b6:a03:4a::15) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BYAPR04MB4870:EE_|CYYPR04MB8867:EE_ X-MS-Office365-Filtering-Correlation-Id: 9ec5ad69-c7e4-4971-2419-08dba0135413 x-ni-monitor: EOP Exclude NI Domains ETR True X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: D1lWCf4iC+TJzL57PQ2V4eJ8J+2tOyL4S9VS+5ncW/VJIB537GJ93pMUFlBj5m0MP//Z0TD3UeVUTqn/TUJ4tOXAE0rILYn1BgOITMzA42NG0KpWyJPFwjdKLpBgyyUlryO020ZHQRGvA29FFMnI5bAviT3CiMGmHL2OUzTZSXjiq27PDsyj6Wqz6zLjBnK9nEGvGlMnxKUrPAK+eVdi/SxAqsYHy0T/lSHm5gpp3y/bKguAgXfX57yoeyGEvAF4Yd0EMeDxfs4m+uqHT0hb27JsxGmz+ETqePvgPcT9Uz2YYBKqoLyyPVNffHZSEYFUhqjqhzyKVLbUaYqev0b9gpoqsY+FsW7KcYEKVUwo+eagFNnWihhXxNqG+v5JJJb9VSuK/kOifjndyGzBZfZN8l9LLPNB9mu7qrczsiYaO7Y5SWpng4dbcI/nv1ZBGyefDn3N4I3eNAgOGe42PDmUYuPuSfY5f33DAeYWzwb70CCU1a16w4ISNLRa7vfA9U26XhOHKA+tf0AarlDOSOPs+4393WIjulegaH53P3n6QiIDiCBqNTRBv51Cs2qCUBox X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BYAPR04MB4870.namprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(346002)(39860400002)(366004)(376002)(136003)(396003)(186009)(451199024)(1800799009)(2616005)(83380400001)(6916009)(316002)(66556008)(66476007)(66946007)(2906002)(26005)(36756003)(44832011)(1076003)(6506007)(6512007)(6486002)(5660300002)(478600001)(4326008)(6666004)(38100700002)(86362001)(8936002)(8676002)(41300700001);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0Vay2qnrwaeEx4UVfhwqfyoywrlmqdJguMvQysZZrFFeJRtDknph3ODFNYZ5FrysFHEmZiBz5kbUTQRrk9zhMYsOiHwbG5dt6QCC39w6qn+au/d5cQVKHNEAuLdtkzNhIt7mHwUIOjwVFJvVR+S6gLHwji+6HTJP4/kQwLMYg84fy20zAGspTKj7lIxlo8TK6Sa5EpjHA3Ln26btYKsc+C1HHHrqCsE+/UeZ+ufZThAWJF9/9ty5+29D/pxDkOEx7ex/CEDr8ZVskh+LQU1AxnRGdIyyQWociL/hOPgbcmY/rcZRUrkdKfbpIyLGmeK9BtM6WwC1z3RjLIbmEDWQpN3g+z1yEVbRbZ6x+U0Knd2T1GVKKVBRYC5Po6xoCjx7IX6XwpHH1JoxVa0Pz9O/yNonrTprUAhbhyGeMqPUynmdvEErlUps9gPDmTzPeADVL4JWaC9zdONIu10Qo7arEeuxLGm8Q+b801uLE1Yj2mhsXNtWY/e2FYX6q/nsStZd9odxgmLsMkNAyTENoEVwVZ0xWRXhl+Kq1exAGvOtk/qq/SP/hcLRsebikibvTKA5bbmfH3Si8WsDK+iq3I9zOrgC4E6sJhuzXwYYW3oxPmInOGsxbbu9tJDzyAe/w2mB0o5vIs3pfoeLqouPcxpmiGdIjY5jH1u8mB9zWDUQLAuP26Uaupyt3VgI0Xjv/4ThijFkR3HFME9NBdxiu9MmsfIpEXJo8IaVZ1dD4P3J6poYJeaUQEwUx4iY54dF9fOCjkrfkwLWMiavCjxCoUIDhMUT2SiwRBR10b0UuNORu9j1XEMxOmaGqvQluTNxZZXZmbKZM3FwGDjU+0ixHE319EAn7xG01Cx6/cMWHzVoMLTSdqXPFtL0cg2uuCtTX2TrpqSeuD6A12kUN8ca+dS1LZycaUR6qruzC3A2A+SfJ23GQEsd8u2o+2CasPW5CbeYp89HYwQEcNIuzOA2N2f0tZ9TitrAs6uffhtcq7gra9cR2GEI/9GpVZnqidTD6oMoiYCVKV52vLSoWxRmeo6qltZ0dO153B59tlwceC0dOS85U7jnhVmgYa5ovQZIoV1mIZqjIvpvB2UWPtGsx5NC8UHXgsDkoIKluskyM5Dim7tev7ast/nWnQh6xZMOBx0Q+BnpcTPuTEmdkvY3n0bbubYgxmUnoyFdHnEfwEr2emyp+OJg8LB8RXAAkvDh/I6YcU0dXe5nQLMsV375yV96IJNKgtw50/tsgNGlYAM89bpz3uUmV7zrl9JA84xYt4DbfYL8+X1N8Y2yRGtQ8QmMKwnMscyYrMNEXtwIax+12NiqVu5TjG+WJIcSwW+rDCCRfquPbG/9kHwvYGPPBMRQMRe0OA42SHxl6fODHlQUViq+ODPkGR8Z3XHk84viF5dUv5D81hOb7sfkXFI3FBD4j4+AMHyNN42ky53SN+P8miyBS9wIJkdrYkGgDwUyZqm+8L4O1jQAQlt2p1PJpcSQd+seXUOhdE9ojN+9yVAKs2H0gDJk41IYsvgN9ZU5i6UOVanN4MAM9y1WcxmxgW9eSQihTCPZ6VAHlPsO5kBcyQ8qw3lcfNuG0IVeH3Hxn6nePXmH6SLJV52m7npnjGfnoA== X-OriginatorOrg: ni.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9ec5ad69-c7e4-4971-2419-08dba0135413 X-MS-Exchange-CrossTenant-AuthSource: BYAPR04MB4870.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Aug 2023 17:48:28.4868 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 87ba1f9a-44cd-43a6-b008-6fdb45a5204e X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: RGCpduonXanxjnxzFOvnXo+BgBlkWxmLj+JhO7k79FjVysUNoDIgqIvX3mXNsLZM3Kni1NgH3DxE6PwByolwdw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYYPR04MB8867 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 ; Fri, 18 Aug 2023 17:48:40 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/186390 The do_recipe_qa task checks if recipes have a maintainer except for certain types of recipes such as packagegroups or -native recipes. The new packagefeed recipe class is similar to a packagegroup and should be treated the same. This change adds packagefeed recipes to the recipe types that don't require a maintainer. Signed-off-by: Charlie Johnston --- meta/classes-global/insane.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes-global/insane.bbclass b/meta/classes-global/insane.bbclass index 960dfc8924a..9ff4870afde 100644 --- a/meta/classes-global/insane.bbclass +++ b/meta/classes-global/insane.bbclass @@ -1488,7 +1488,7 @@ python do_recipe_qa() { def test_missing_maintainer(d): fn = d.getVar("FILE") pn = d.getVar("PN") - if pn.endswith("-native") or pn.startswith("nativesdk-") or "packagegroup-" in pn or "core-image-ptest-" in pn: + if pn.endswith("-native") or pn.startswith("nativesdk-") or "packagegroup-" in pn or "packagefeed-" in pn or "core-image-ptest-" in pn: return if not d.getVar('RECIPE_MAINTAINER'): oe.qa.handle_error("missing-maintainer", "Recipe {} in {} does not have an assigned maintainer. Please add an entry into meta/conf/distro/include/maintainers.inc.".format(pn, fn), d)