From patchwork Thu Jun 5 21:31:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Kjellerstedt X-Patchwork-Id: 64399 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 BBBDEC5B555 for ; Thu, 5 Jun 2025 21:31:44 +0000 (UTC) Received: from DUZPR83CU001.outbound.protection.outlook.com (DUZPR83CU001.outbound.protection.outlook.com [52.101.66.17]) by mx.groups.io with SMTP id smtpd.web10.19756.1749159094425485630 for ; Thu, 05 Jun 2025 14:31:34 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@axis.com header.s=selector1 header.b=oJvR0jZX; spf=pass (domain: axis.com, ip: 52.101.66.17, mailfrom: peter.kjellerstedt@axis.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=tDp9RqgH8kKxpdeGy5VCF4sqoiaukoUgProYPXxJw5eQPO3zujjQ5jtKsKv9kslNJo9v9bDbqc7rEPfV4InrYoWt+vA5TQxegcYXFA7/bkmR0pMjazqlE4Ds4UN2gIKp07URjBPU44DYr+AXisapF5YFeFnmzIRS+UHQfjQJJXROhhy80ZWR+M+IYOOw9l1GhUd3dqeovLtF4LnDgDQlh+Se9SsVzURTZcjHRHlasCHRCO3uv3D2WpkZRT6+yOzJA5ZURHuZyS0cjp4aHxV9cMRJlMk/T8rtYVJXDN4DSpn7a4za6Lhmt7eFVoogeSQWORl7E3exnqBjMA/RnT3fgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=BJO6brHjOUP0LzfhPd1bBrAMX8WnbWF/PpdfkrY4O7g=; b=l951WDwrponrhRzFlFw0lB7NEhcWKMykjb0zfQEiaC5gg71TW0SM6ganoxiT9/3ELDBNHHVBN+3Po/6vF5IxbIaV8ndKJYVDXNUbXRXGPtoOVZnq72j5Hj7HhmpsSclvDg6KRwfv0kNv7cwBMuGVBW/m2+15M2tNWh2mRoyMjfnMM1umJ8K6O96EXANT/GbDxlWHU2tv/WqmHe3aNUBFrTFgh0xjygw7+4GVRmNfznCDWbjWQoASSWb1K7qNLRBsLQP9h7mCngqvD0PATnviSWGwVluzVTSwMB17HaUJakUDwxt/B8V+1art+0H2IgtMDqB/zsHUf4sGkAoxiI+MKA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 195.60.68.100) smtp.rcpttodomain=lists.openembedded.org smtp.mailfrom=axis.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=axis.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BJO6brHjOUP0LzfhPd1bBrAMX8WnbWF/PpdfkrY4O7g=; b=oJvR0jZXBKO1V8XbdQe+vJhV/Fi7Q+QeNH3rCGg1W3pDxt9U7MBD+OF51APeo4OcR76BMst5tmEn7Po6LSgupZNlVZLe0OUqXCNb14GnDqyitnm1xJRvX1GTDP4c5YVqaWrSGz4q3xW5NArq/gNdHQW115Q4XbPPatIutbF1uS0= Received: from AM0PR02CA0095.eurprd02.prod.outlook.com (2603:10a6:208:154::36) by GV1PR02MB8684.eurprd02.prod.outlook.com (2603:10a6:150:90::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8813.20; Thu, 5 Jun 2025 21:31:28 +0000 Received: from AM3PEPF0000A795.eurprd04.prod.outlook.com (2603:10a6:208:154:cafe::85) by AM0PR02CA0095.outlook.office365.com (2603:10a6:208:154::36) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8792.32 via Frontend Transport; Thu, 5 Jun 2025 21:31:28 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 195.60.68.100) smtp.mailfrom=axis.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=axis.com; Received-SPF: Pass (protection.outlook.com: domain of axis.com designates 195.60.68.100 as permitted sender) receiver=protection.outlook.com; client-ip=195.60.68.100; helo=mail.axis.com; pr=C Received: from mail.axis.com (195.60.68.100) by AM3PEPF0000A795.mail.protection.outlook.com (10.167.16.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8792.29 via Frontend Transport; Thu, 5 Jun 2025 21:31:26 +0000 Received: from SE-MAILARCH01W.axis.com (10.20.40.15) by se-mail01w.axis.com (10.20.40.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.44; Thu, 5 Jun 2025 23:31:26 +0200 Received: from se-mail02w.axis.com (10.20.40.8) by SE-MAILARCH01W.axis.com (10.20.40.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.44; Thu, 5 Jun 2025 23:31:26 +0200 Received: from se-intmail02x.se.axis.com (10.4.0.28) by se-mail02w.axis.com (10.20.40.8) with Microsoft SMTP Server id 15.1.2507.44 via Frontend Transport; Thu, 5 Jun 2025 23:31:26 +0200 Received: from pc56063-2339.se.axis.com (pc56063-2339.se.axis.com [10.92.3.2]) by se-intmail02x.se.axis.com (Postfix) with ESMTP id 210071497 for ; Thu, 5 Jun 2025 23:31:26 +0200 (CEST) Received: by pc56063-2339.se.axis.com (Postfix, from userid 14323) id 17CD81291EB; Thu, 5 Jun 2025 23:31:26 +0200 (CEST) From: Peter Kjellerstedt To: Subject: [PATCHv3 1/3] util-linux-libuuid: Set LIC_FILES_CHKSUM Date: Thu, 5 Jun 2025 23:31:19 +0200 Message-ID: <20250605213121.2685855-1-pkj@axis.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM3PEPF0000A795:EE_|GV1PR02MB8684:EE_ X-MS-Office365-Filtering-Correlation-Id: f5a01df4-46b7-40e0-7e27-08dda47853eb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700013|376014|82310400026; X-Microsoft-Antispam-Message-Info: VGAe6354+gEPAMfvLfsoTMj3HVb5N4WM5WuS3Wmg1wb3jfyPxzlx2UDGw4z+c2lsAEezO70vNGh8jgt+2842Qa6+kHIN2Sa0hpcezp6w7jUC84GJockk9PAJhFvFpK9bhjmO+IcCXt06Sc/z/VNNjgqH7ActEJWdweUjArE+RwPK16um0blqbMDoQrsZuPzMYEAIMbXbEIKzn5DyIStdikDJpwhIol8RYomz5IpkOoo2/5g0Zet9X/2GuVvdF4UdgsEBZBL30p/I1NKgsj081liETtXgvAEsK4aGPfFIP+oPJiSmYjoYfeL0Y1AZwZiqNXyI95BDYeTSecUObRGHsD97I3ubneouxhbCwrmTYIj3ierNj1DE6KfSb6nsl28IWyx7LUdZhA31lxsHn8/kUyE6xTeWKZ7ZLUEtrniqfVllxbOzNb00bZzBdmKGpHQQZnaWPPJ+c9GEmR7K9xejZ4lrLnSLPWytjMPVZP2Ng4wWi1/l4VfMupLgpl5CBlICX0BU08vQTkWOXRdy/R98oA57uXuFR1awDFIf5I9ynWI757yymsu2fjglhPok7M++Ez2egd4jVhFU8sWy4qWFmYAXEM9igqVEPEPVq4vp+2CB7nIpGeOc8GHsRvTPumtohGSO1COaTLIY+Ucoia2/N9t+R2JcgnsEt0Hq688TsSqUnJzVHBBCYYqSXz2jnmtY9Mu5qK777Q6ilOPg9UH0Fs9KxUDfY7xPO5OOpnIVOydemwupOUGz9lJNPpSxxbz1g0zuH28OtVZeSwazpMXtS2mnl4WoBlj1JY1LRznQ6t73sLCBsgLcqTpi1o5N3nJBWdJ2oZGBIroGJ32sewRPFc9oeYolhvlinhdNvGV5hOq4ObxYga+l+LHw7L8fXsQ9cEcuJrb7my+UHzeoDVLgsFd2RwBMxKYO18TQdRPNQW8KZZfaA4SBuEBrkRURoZaTweyFd9X5ILDAcPYgrKNO/160092AKNwKl3Im3ZfJWRbmZx+vR15c1t4MhW1Y+LkTNZhLIEEhbaBWcbyREHA+y9WNsIX2iN7prGYzB7QgVwSRiam3FigwiICNFcS0jCFoTu+TcFvwlKZOOslVYVyJkwfGhm5uaWvZiK/ZPtrWSxBUn9ASPefpjOQRxBsrRFLxHTEfOf82SsqGnL17EdWVTMErwHSnopdVyrBNHTOy4t/AlnhcqF0mpp9rwPctElUbbbEkcYqq9kt48kRR6oEfcvhMzYgTIyxVI8YKbFzLjW48ujJI9ARUpnTwKf1Bsuhlcv0DRhnhQipZhbL5wIeAUkkNEA0vFCqjO5qwW3tfbGozJUQ0ToZaxl1Iuuq9caaICYL8DYeU7yscgr6X+5OW5CX8i062VZbAsgHCzVgA385eLnY6cmIKjRHsKvqEEZ2Fx830kBlI3wuzbQT0wtoHUbjPAnVrUGupZoChwP5uewA8oSQEVfeJDDR5RGNCgWe/lGOI/t3/UBWE7QNZ7KPNMIzWTHdxOvxn3TgxzFtavYaxVn15SjL2rY4CIoO0cvkY X-Forefront-Antispam-Report: CIP:195.60.68.100;CTRY:SE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.axis.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(36860700013)(376014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: axis.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2025 21:31:26.7069 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f5a01df4-46b7-40e0-7e27-08dda47853eb X-MS-Exchange-CrossTenant-Id: 78703d3c-b907-432f-b066-88f7af9ca3af X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=78703d3c-b907-432f-b066-88f7af9ca3af;Ip=[195.60.68.100];Helo=[mail.axis.com] X-MS-Exchange-CrossTenant-AuthSource: AM3PEPF0000A795.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1PR02MB8684 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 ; Thu, 05 Jun 2025 21:31:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/218085 The license information is not the same as for util-linux, so set it in the recipe rather than expecting util-linux.inc to set it. License-Update: See above Signed-off-by: Peter Kjellerstedt --- PATCHv3: New in v3. meta/recipes-core/util-linux/util-linux-libuuid_2.41.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux-libuuid_2.41.bb b/meta/recipes-core/util-linux/util-linux-libuuid_2.41.bb index ec04c1d3843..ad0bfa1d129 100644 --- a/meta/recipes-core/util-linux/util-linux-libuuid_2.41.bb +++ b/meta/recipes-core/util-linux/util-linux-libuuid_2.41.bb @@ -3,6 +3,10 @@ require util-linux.inc +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://libuuid/COPYING;md5=6d2cafc999feb2c2de84d4d24b23290c \ + file://Documentation/licenses/COPYING.BSD-3-Clause;md5=58dcd8452651fc8b07d1f65ce07ca8af" + inherit autotools gettext pkgconfig S = "${WORKDIR}/util-linux-${PV}" @@ -10,8 +14,6 @@ S = "${WORKDIR}/util-linux-${PV}" EXTRA_AUTORECONF += "--exclude=gtkdocize" EXTRA_OECONF += "--disable-all-programs --enable-libuuid" -LICENSE = "BSD-3-Clause" - do_install:append() { rm -rf ${D}${datadir} ${D}${bindir} ${D}${base_bindir} ${D}${sbindir} ${D}${base_sbindir} ${D}${exec_prefix}/sbin } From patchwork Thu Jun 5 21:31:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Kjellerstedt X-Patchwork-Id: 64400 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 BA4FEC5AE59 for ; Thu, 5 Jun 2025 21:31:44 +0000 (UTC) Received: from AS8PR04CU009.outbound.protection.outlook.com (AS8PR04CU009.outbound.protection.outlook.com [52.101.70.24]) by mx.groups.io with SMTP id smtpd.web10.19757.1749159094444330409 for ; Thu, 05 Jun 2025 14:31:34 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@axis.com header.s=selector1 header.b=jCYE2iqY; spf=pass (domain: axis.com, ip: 52.101.70.24, mailfrom: peter.kjellerstedt@axis.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=E3doqDese83tqg+yvrpBvOrPSFOjCCjVTHAUE3XjKEIO7QmcBFhmbUmVDvfRRjgjDC9xGSjD03vDZBJU6NYgIPia0cCuHi96Sb0APg+IzvqAaYEdRE2VaJ0kMz48YkZOj55xBMfq7aLmfH7xaKQugGVlFhXQVU91Ku1DMsguQLlpSDoAuyGpgOOhwjVKpltoQS77ZHD49fhewXAd4R2omcVz4toiqadXalHZTm4kDOcBuDCnlzdalyVRpBqhVXN4C3GnbZr03fo+0UOTgUQodnjLAk776XxVHzFNANqKo/Z7TXR4CUlYsl99Gqmwm2efTxN1UO0ZnAi+NcI86YFY3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=9AEbGrVy7jSXAWrhZjPH+bkTyzufWYWmeBqj4ozl9OI=; b=Y5yeE4cVhHPSXsc9S4xHT75k/j0gIMcP7uUQ3cajnRnVXnqF88m6Fczd2hNgrDzMrJbkpAQJrfXBnIQBQwKDU9/TzST3CYk9GACtgbtHq4Qb/25sLbz3QedVhqxvx2iHnFLSUjhua2aOGp88eUv6wiDBzbMy0NcSIUdiA6BDp0d/o9DCHo2uirtbocpGBAMPIqt8Scjxmt4nhUB81kMlU9KgfJDZ22xe9Hc9zT9H5rOsvTQOqfvqSzaTsltEj/tSz6hPt0fUg4drnsmhRld5WewEp4GRl/emqv7RJekIzIVZ/SoUmE5smXTyXVyvm8XaBUV418BunNPrP2VfpxJ+ag== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 195.60.68.100) smtp.rcpttodomain=lists.openembedded.org smtp.mailfrom=axis.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=axis.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9AEbGrVy7jSXAWrhZjPH+bkTyzufWYWmeBqj4ozl9OI=; b=jCYE2iqYmt3Yf8Xw+I12hZjXpO+5cseOySKjONjpmv8dDqmhhcRKx9FEgC7Q6nlflwqAfAgOTGmLkM/M+e0E3ob7B8kopFSdfhPP2sWhruu4QPNKogA4OmK7y1MEnaWjc9eLBlZcFw4PjGP2QB8LauSO71/AmUBhIj7bXQME97U= Received: from AM0PR02CA0080.eurprd02.prod.outlook.com (2603:10a6:208:154::21) by VI1PR02MB5760.eurprd02.prod.outlook.com (2603:10a6:803:131::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8813.21; Thu, 5 Jun 2025 21:31:29 +0000 Received: from AM3PEPF0000A795.eurprd04.prod.outlook.com (2603:10a6:208:154:cafe::35) by AM0PR02CA0080.outlook.office365.com (2603:10a6:208:154::21) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8792.19 via Frontend Transport; Thu, 5 Jun 2025 21:31:29 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 195.60.68.100) smtp.mailfrom=axis.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=axis.com; Received-SPF: Pass (protection.outlook.com: domain of axis.com designates 195.60.68.100 as permitted sender) receiver=protection.outlook.com; client-ip=195.60.68.100; helo=mail.axis.com; pr=C Received: from mail.axis.com (195.60.68.100) by AM3PEPF0000A795.mail.protection.outlook.com (10.167.16.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8792.29 via Frontend Transport; Thu, 5 Jun 2025 21:31:28 +0000 Received: from SE-MAIL21W.axis.com (10.20.40.16) by se-mail01w.axis.com (10.20.40.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.44; Thu, 5 Jun 2025 23:31:26 +0200 Received: from se-mail02w.axis.com (10.20.40.8) by SE-MAIL21W.axis.com (10.20.40.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.44; Thu, 5 Jun 2025 23:31:26 +0200 Received: from se-intmail01x.se.axis.com (10.4.0.28) by se-mail02w.axis.com (10.20.40.8) with Microsoft SMTP Server id 15.1.2507.44 via Frontend Transport; Thu, 5 Jun 2025 23:31:26 +0200 Received: from pc56063-2339.se.axis.com (pc56063-2339.se.axis.com [10.92.3.2]) by se-intmail01x.se.axis.com (Postfix) with ESMTP id 24586141D for ; Thu, 5 Jun 2025 23:31:26 +0200 (CEST) Received: by pc56063-2339.se.axis.com (Postfix, from userid 14323) id 1A52C1200CC; Thu, 5 Jun 2025 23:31:26 +0200 (CEST) From: Peter Kjellerstedt To: Subject: [PATCHv3 2/3] util-linux: Move the license information to the recipe Date: Thu, 5 Jun 2025 23:31:20 +0200 Message-ID: <20250605213121.2685855-2-pkj@axis.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250605213121.2685855-1-pkj@axis.com> References: <20250605213121.2685855-1-pkj@axis.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM3PEPF0000A795:EE_|VI1PR02MB5760:EE_ X-MS-Office365-Filtering-Correlation-Id: 74188834-5e05-47cd-4f44-08dda4785545 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700013|376014|82310400026; X-Microsoft-Antispam-Message-Info: u2/Yg4lxmlwK7GyBr48PhA6EKSlS4dO9N6fzsFH5ESkNounCDlZFWpiW+APdj+d8xbQDSaMwpAqKgc3guNXLQPdXQnBJiwbe8jQqbVl+/SIJSyf3Dv/u83629k0Ni5mq3a2P6QmFsSZ7lKnyfGpTcFzbkX0oTIuZcZXbBFma9TKSHbh/pMZJnPRiDMgHnHcBbvxhNFh/C0IAce0Xkt2swf6Tiq1jxA7G0xni9Nbeg0ipMSNvX9cUmk+YVIZZ9urtnj4/LedgblIlvqCP4ErK9ZdlvNs6PhF5CugdKZE9316Rkar5a6RnvQj2WIRuX33iv1JwsFpTcJC0TEjf6K+Nnukg/vDteIMdCCJC7J7vxJtgxm3tjDyA7m0ozPds0KvEjKVjo8cxJINwJ+YSy5sK/Qk/LmnC2P2PagqFCyP1ZQYqftB0za6DVGkWziqePeplBtyvl90KRd14/dF1kWqFhV/Nzu/gjXptZOiWzQpPucz2otP+VZ695yWX9s3z3arSVnBlEtwVelFd4h1TgGepuR/Pa7llhRW3EsoIHqnEVOZbgasyOio+pb+jVpXjsJ3crC/uu3nrugwGbkuZog3FOPz99y1C6bAH3AEiyFKeNK3AmhI6ZRzLEGsKroRhdIULw8OXtkKMqWaUozcvP2IB5LRAcxn8TOlk+0Ds5QH4eMB+NI489xKxAUuTyCuQyaUZVIUMwxeYfIy0xsQlh7HmLKP/usxqiS7cFvNfwi/rHyvBitNgdf5LuXGotV5Ite+Bv2BizbHed/mHCOguu2v9uBnI14wVzRChWO9qTG+PZ4FFV1oxWRf5X7IXBWTzCLAI+fCES0PLSZDTW3OG2hXlmgwDt93/KdoRJhftHULPvtPAXtUogGilJEL44igv/7uM3YL4yQrdl0WwSKwFI8pQygTKMjrsfZ57YKNe3aBZe3pPX5ghpm3Il/XSU2iUVL043SNJjATyoCLTu5xU4izROWx3LwQU853zFVimJ2JpOzRAldTHmwXEmS9NS8zYYHlKJqTLaZDryu5XolrvUuFeP2uHnp9VlP9SD8rK7v5JlfifCsIDF8yfvf4OhIeA/S4hnn9vzQnY3XveqagA9S1Of6i8urX1hKn7G1KyWs0g0CchcHU/C2yQZ1vrIiMWF7ZQ3vascfyeOSUM8gKGwe6KqoKoKlgcQN7y3TqWwYhICAx5u8RKdcZJfiZpIqPNEGTKFf7yv8jEkgzS4ycqOXro6FywZuoV8sBO3WsBWbcoD5LNyft3QqS1zuScgQZlG+GPu7OsuPe8U2UCSIOHxHsaWGoCKwmS7fbYB8EgmrV1+CxOocAvk+OdsvnO6F+QJoaCIubJsf9YFvVG3Jid7Io8PhJosU1sidofVggohF0L3qxQKf4VrYjhCGb3MgUNa5YB+IdDY/W3nVjXs5Ih0TFxwq6obOBBcjFO/RrVwnKbPF1kZYeCTw2DkZFY0zQvVCXEq9Kx1ocKghZdd7mwLu2zMIT4DbgiwKiIByG/XDXf3YQ+wuxMZd1oxuL6XJw6EzQt X-Forefront-Antispam-Report: CIP:195.60.68.100;CTRY:SE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.axis.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(36860700013)(376014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: axis.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2025 21:31:28.9726 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 74188834-5e05-47cd-4f44-08dda4785545 X-MS-Exchange-CrossTenant-Id: 78703d3c-b907-432f-b066-88f7af9ca3af X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=78703d3c-b907-432f-b066-88f7af9ca3af;Ip=[195.60.68.100];Helo=[mail.axis.com] X-MS-Exchange-CrossTenant-AuthSource: AM3PEPF0000A795.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR02MB5760 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 ; Thu, 05 Jun 2025 21:31:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/218086 util-linux does not share the license information with util-linux-libuuid so it makes no sense to have it in the util-linux.inc file. This also drops libuuid/COPYING from LIC_FILES_CHKSUM as libuuid is not built by this recipe. License-Update: See above Signed-off-by: Peter Kjellerstedt --- PATCHv3: New in v3. meta/recipes-core/util-linux/util-linux.inc | 23 ------------------- .../util-linux/util-linux_2.41.bb | 22 ++++++++++++++++++ 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index b0f2a9d4977..d41d093e059 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -6,29 +6,6 @@ disk partitioning, kernel message management, filesystem creation, and system lo SECTION = "base" -LICENSE = "GPL-1.0-or-later & GPL-2.0-only & GPL-2.0-or-later & LGPL-2.1-or-later & BSD-2-Clause & BSD-3-Clause & BSD-4-Clause-UC & MIT & EUPL-1.2" -LICENSE:${PN}-fcntl-lock = "MIT" -LICENSE:${PN}-fdisk = "GPL-1.0-or-later" -LICENSE:${PN}-libblkid = "LGPL-2.1-or-later" -LICENSE:${PN}-libfdisk = "LGPL-2.1-or-later" -LICENSE:${PN}-libmount = "LGPL-2.1-or-later" -LICENSE:${PN}-libsmartcols = "LGPL-2.1-or-later" -LICENSE:${PN}-coresched = "EUPL-1.2" - -LIC_FILES_CHKSUM = "file://README.licensing;md5=55e895a80bdd4ffc65e167a76d2e7569 \ - file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://Documentation/licenses/COPYING.GPL-2.0-or-later;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://Documentation/licenses/COPYING.LGPL-2.1-or-later;md5=4fbd65380cdd255951079008b364516c \ - file://Documentation/licenses/COPYING.BSD-3-Clause;md5=58dcd8452651fc8b07d1f65ce07ca8af \ - file://Documentation/licenses/COPYING.BSD-4-Clause-UC;md5=263860f8968d8bafa5392cab74285262 \ - file://Documentation/licenses/COPYING.EUPL-1.2;md5=c075d2767167a2355b23392018a1cbbd \ - file://libuuid/COPYING;md5=6d2cafc999feb2c2de84d4d24b23290c \ - file://libmount/COPYING;md5=7c7e39fb7d70ffe5d693a643e29987c2 \ - file://libblkid/COPYING;md5=693bcbbe16d3a4a4b37bc906bc01cc04 \ - file://libfdisk/COPYING;md5=693bcbbe16d3a4a4b37bc906bc01cc04 \ - file://libsmartcols/COPYING;md5=693bcbbe16d3a4a4b37bc906bc01cc04 \ - " - FILESEXTRAPATHS:prepend := "${THISDIR}/util-linux:" MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.xz \ diff --git a/meta/recipes-core/util-linux/util-linux_2.41.bb b/meta/recipes-core/util-linux/util-linux_2.41.bb index 00036e8a68f..18b8ac03b94 100644 --- a/meta/recipes-core/util-linux/util-linux_2.41.bb +++ b/meta/recipes-core/util-linux/util-linux_2.41.bb @@ -1,5 +1,27 @@ require util-linux.inc +LICENSE = "GPL-1.0-or-later & GPL-2.0-only & GPL-2.0-or-later & LGPL-2.1-or-later & BSD-2-Clause & BSD-3-Clause & BSD-4-Clause-UC & MIT & EUPL-1.2" +LICENSE:${PN}-fcntl-lock = "MIT" +LICENSE:${PN}-fdisk = "GPL-1.0-or-later" +LICENSE:${PN}-libblkid = "LGPL-2.1-or-later" +LICENSE:${PN}-libfdisk = "LGPL-2.1-or-later" +LICENSE:${PN}-libmount = "LGPL-2.1-or-later" +LICENSE:${PN}-libsmartcols = "LGPL-2.1-or-later" +LICENSE:${PN}-coresched = "EUPL-1.2" + +LIC_FILES_CHKSUM = "file://README.licensing;md5=55e895a80bdd4ffc65e167a76d2e7569 \ + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://Documentation/licenses/COPYING.GPL-2.0-or-later;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://Documentation/licenses/COPYING.LGPL-2.1-or-later;md5=4fbd65380cdd255951079008b364516c \ + file://Documentation/licenses/COPYING.BSD-3-Clause;md5=58dcd8452651fc8b07d1f65ce07ca8af \ + file://Documentation/licenses/COPYING.BSD-4-Clause-UC;md5=263860f8968d8bafa5392cab74285262 \ + file://Documentation/licenses/COPYING.EUPL-1.2;md5=c075d2767167a2355b23392018a1cbbd \ + file://libmount/COPYING;md5=7c7e39fb7d70ffe5d693a643e29987c2 \ + file://libblkid/COPYING;md5=693bcbbe16d3a4a4b37bc906bc01cc04 \ + file://libfdisk/COPYING;md5=693bcbbe16d3a4a4b37bc906bc01cc04 \ + file://libsmartcols/COPYING;md5=693bcbbe16d3a4a4b37bc906bc01cc04 \ + " + inherit autotools gettext manpages pkgconfig systemd update-alternatives python3-dir bash-completion ptest gtk-doc DEPENDS = "libcap-ng ncurses virtual/crypt zlib util-linux-libuuid" From patchwork Thu Jun 5 21:31:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Kjellerstedt X-Patchwork-Id: 64401 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 BCE92C5B543 for ; Thu, 5 Jun 2025 21:31:44 +0000 (UTC) Received: from AS8PR04CU009.outbound.protection.outlook.com (AS8PR04CU009.outbound.protection.outlook.com [52.101.70.24]) by mx.groups.io with SMTP id smtpd.web11.19784.1749159095397323795 for ; Thu, 05 Jun 2025 14:31:35 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@axis.com header.s=selector1 header.b=CLG06A0h; spf=pass (domain: axis.com, ip: 52.101.70.24, mailfrom: peter.kjellerstedt@axis.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=LlULPX3/hZym/XEg8mk20Q+CgOdGrWEHeD4+IQdmp3szGRpN7A92uxRXOcjXf99vCa5bXjHkx+bRzxJMI4JXJQI+YOEjLHHtu1hJ8Kgv0tKdJMVO2k+8QM24f+k6nJfWHF4NxBX5zYzHT/jArRCpnS051Y0v24GWNWJ5vuFAxX+6K2xcm4L/KrxCMsjR90BGInH2d7FaBzfZaHJHyAX9+kQs2j6XZuhJkyjuEzyyytiFWrD2z5Lb4aiTbyqH6lQJRrKiSr6yceB6fepD8CMZRTso3dpPQUjHKps/KraVwm4+GkwjEbxpJogir3ttpNW/o+wIzMe9snpro0m9LVYDXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=qOy66TwJcj/wzD0+tlrZjMMlUi9YPdUOcgt6CHBL3wo=; b=vXE5B6Jc72IGTmNIsOuNZSfJOFaZphLCBit/f6FdPeJyQLq0S45gLgyRV7+z/KlrpFeu2N8OssCUxzDEX50bj7Ag1BvzfFelz5ga+4899HNfa83txHXmQ/oEh6pgrBJ+f3IoFOgD88BGDtLEcZVYr6np5aVuCgV9Sr6p0FXNOzT9zLnzK1NUsXv5nTRKAAi2QuLVGFDUJ9JSq3zhMGUnEPcqB8oI/ur5EvwKIgfruFnsGxz9Q0jCWjwo4S8jjSnImDPYbagQPmdE6vO+U0rAnd9PwZQ0xVknkDaLl3n1trtSRZkQ6mgMFipKL05IZm/5tCOinh76dCHMHf9BCfs5zg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 195.60.68.100) smtp.rcpttodomain=lists.openembedded.org smtp.mailfrom=axis.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=axis.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qOy66TwJcj/wzD0+tlrZjMMlUi9YPdUOcgt6CHBL3wo=; b=CLG06A0hsc35QOYgvIXoKiN/m2dN2MWXVStXNSA0PYYx7GRm/iCwKpHZDUK79zz+QvjV+/Fk7j0rPCkoHKzpPQwrjAz+VnGBnytz2uGS3FA3IkhZXNtom49r1ffyYCMac3N54XxvYNmWK/V2Yry+R8GIEJxyNsVCNc0brB92ypA= Received: from AM0PR02CA0100.eurprd02.prod.outlook.com (2603:10a6:208:154::41) by PAVPR02MB9136.eurprd02.prod.outlook.com (2603:10a6:102:320::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8813.20; Thu, 5 Jun 2025 21:31:29 +0000 Received: from AM3PEPF0000A795.eurprd04.prod.outlook.com (2603:10a6:208:154:cafe::35) by AM0PR02CA0100.outlook.office365.com (2603:10a6:208:154::41) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8792.19 via Frontend Transport; Thu, 5 Jun 2025 21:31:29 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 195.60.68.100) smtp.mailfrom=axis.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=axis.com; Received-SPF: Pass (protection.outlook.com: domain of axis.com designates 195.60.68.100 as permitted sender) receiver=protection.outlook.com; client-ip=195.60.68.100; helo=mail.axis.com; pr=C Received: from mail.axis.com (195.60.68.100) by AM3PEPF0000A795.mail.protection.outlook.com (10.167.16.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8792.29 via Frontend Transport; Thu, 5 Jun 2025 21:31:29 +0000 Received: from SE-MAILARCH01W.axis.com (10.20.40.15) by se-mail01w.axis.com (10.20.40.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.44; Thu, 5 Jun 2025 23:31:26 +0200 Received: from se-mail01w.axis.com (10.20.40.7) by SE-MAILARCH01W.axis.com (10.20.40.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.44; Thu, 5 Jun 2025 23:31:26 +0200 Received: from se-intmail01x.se.axis.com (10.4.0.28) by se-mail01w.axis.com (10.20.40.7) with Microsoft SMTP Server id 15.1.2507.44 via Frontend Transport; Thu, 5 Jun 2025 23:31:26 +0200 Received: from pc56063-2339.se.axis.com (pc56063-2339.se.axis.com [10.92.3.2]) by se-intmail01x.se.axis.com (Postfix) with ESMTP id 22E341390 for ; Thu, 5 Jun 2025 23:31:26 +0200 (CEST) Received: by pc56063-2339.se.axis.com (Postfix, from userid 14323) id 1AE911201CD; Thu, 5 Jun 2025 23:31:26 +0200 (CEST) From: Peter Kjellerstedt To: Subject: [PATCHv3 3/3] util-linux: Improve the package licenses Date: Thu, 5 Jun 2025 23:31:21 +0200 Message-ID: <20250605213121.2685855-3-pkj@axis.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250605213121.2685855-1-pkj@axis.com> References: <20250605213121.2685855-1-pkj@axis.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM3PEPF0000A795:EE_|PAVPR02MB9136:EE_ X-MS-Office365-Filtering-Correlation-Id: 6d392a50-55e3-4a7e-2fb6-08dda4785583 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|82310400026|1800799024|376014; X-Microsoft-Antispam-Message-Info: nsX7UGVSehcI4LfiHWUCu9W5WGvTgzJsnjanIo+oo6cfUgJIszZz21fdLbHJDUyAoILs+Zc/q7Og8pLA9EmB6SnHxx4G/uFH+PygNf8MfgwBXPuNzJnTFPReIApN8qL2Xv52RH70LmpNs/iNs/EYMMHOtJl8nkTPabuc/msCbXHZlhPrZuxiVOftN6PedOYv53HBnWn9ut2TGChqFKgA8H4f3fMJCBHL3mnHci8hMNhOIWjoPW5cCzH9/W+YoULnovBXY0CzTkRdQJh+MkpUNr5y2Ew8E9hDNka/Uvf8raPigINsxWBnGD7Hc99P6dLCEt6WbsFE2liUwcyQ8B18uUJSV6lt/VdXPMdVMIdji013awgZtXUcfTjabkWo6f577KzWztBfbNh+/nyHNXiUmIVCucIRWGdMhxJxsFBh2TRAAQrLqzk1w/INfMdWd/nX2TnJBm+6Y70XEjOKytRjwSl069+lnJ2ksL1Osx+NqnK/NjL4Gfvn+XOVqY5goivQC6KEmVRUl92CkozhCo5cowRzQDqi1/3zP/Be5MVnA9DCRtxx4VG9DMeLteN2rsQCDMTpXCXqxTrySCaqZLwBN/OErTIaMaNI25Fb/55AlpmeYiDA3D7YlXMARMOUlQVaKT8dj389DKM8jNx65rioTab4PWLoTDGd+YIpYYvoz8x/dDQfCao+jV73mRUQO7AuZ2Rg4YAzaEom0yC2bnjKtV2aJ69FcWYhUa3deCcUYIhIj3A4X9dnvTlePhPnJ2wdYtNy1TMtlS+d85Y1/dTZ/k6ZeCeqjhgu8FLJRhek8KP3SUzcNm5NybMypKD3akrs+JlX6vi8bLvId7B4GM042o6TMA3GBkSMfZmLlvjSxX1LtpXpuv+XOXsovlroG65s+5ulOLii3NmlRe/A3EK3PwcV9ieHC0zAc4SF/reVsCW8AiNWYqzkyH7hxIXFfBem6Vmk73GiMSqKt8skRET2DaCZfQNeUhO4dgE6c4DbPE/qdhsJml5fnOp+r84/DnbgDKgFx6alyJzoBiPWGkVElFVShS6eHOoPdi8SNZ6uvEP2b54s4qazhVci8mVb27aBpV/O0w++aaQ2piImap8RUmMgnWHPZK8D6PrAwZPR/po3v2G/4kjMkQmGM3S9VqnHKKGmEq3ueemKvnTh0X2dIvma8PMYrPEoqeho9bXbm2VBhpGBayJqBZKZLyxMha9jO325wdaKJ7x1Xm6Cr/U5/dVbefIxT/pD5+yN4UeK/YhYoVOuDYYT807Cazzlu3z/rDNZMZynX3snV496gqcoBHZe4KsiXeUz1fSiFmUUhgQGFF5zgdh8uKwdG6O7d0LPCBWHCgep3egMFT5/5vsZXVpUnYTSb0y+M7isDmnZ9Y82M9NYPQXBjX3ixeQNm2F4e13BaS5IgNN6v8FfNHz4asPGd9rqQZuKWelzNP0BtG6+ITHmFl2S8R0JJW6pTYQlnPp6Kq//Fd33Ys36fwR8lplA4fYY51B4UM+LbQ38BnQ+NGpTzmTUwySDOt3+EnBv X-Forefront-Antispam-Report: CIP:195.60.68.100;CTRY:SE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.axis.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(36860700013)(82310400026)(1800799024)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: axis.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2025 21:31:29.3789 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6d392a50-55e3-4a7e-2fb6-08dda4785583 X-MS-Exchange-CrossTenant-Id: 78703d3c-b907-432f-b066-88f7af9ca3af X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=78703d3c-b907-432f-b066-88f7af9ca3af;Ip=[195.60.68.100];Helo=[mail.axis.com] X-MS-Exchange-CrossTenant-AuthSource: AM3PEPF0000A795.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAVPR02MB9136 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 ; Thu, 05 Jun 2025 21:31:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/218087 The default license for util-linux is GPL-2.0-or-later. Most of the applications and the libraries are also linked with libcommon.la, which uses these licenses: LGPL-2.1-or-later & BSD-2-Clause & BSD-3-Clause & MIT Set the above licenses for all dynamic packages, unless explicitly specified. In particular, this avoids setting BSD-4-Clause-UC and EUPL-1.2 on packages where they do not belong. License-Update: See above Signed-off-by: Peter Kjellerstedt --- PATCHv2: Add more specific licenses for util-linux-bash-completion and util-linux-dev. PATCHv3: The changes are now in the util-linux recipe instead of the util-linux.inc file. .../util-linux/util-linux_2.41.bb | 46 ++++++++++++++++--- 1 file changed, 40 insertions(+), 6 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux_2.41.bb b/meta/recipes-core/util-linux/util-linux_2.41.bb index 18b8ac03b94..41fb3e59513 100644 --- a/meta/recipes-core/util-linux/util-linux_2.41.bb +++ b/meta/recipes-core/util-linux/util-linux_2.41.bb @@ -1,13 +1,44 @@ require util-linux.inc +# Most of the applications and the libraries are linked with libcommon.la, +# which uses these licenses +LIBCOMMON_LICENSES = "LGPL-2.1-or-later & BSD-2-Clause & BSD-3-Clause & MIT" + +# The default license is GPL-2.0-or-later +DEFAULT_LICENSES = "GPL-2.0-or-later & ${LIBCOMMON_LICENSES}" + LICENSE = "GPL-1.0-or-later & GPL-2.0-only & GPL-2.0-or-later & LGPL-2.1-or-later & BSD-2-Clause & BSD-3-Clause & BSD-4-Clause-UC & MIT & EUPL-1.2" +LICENSE:${PN}-bash-completion = "GPL-2.0-or-later" +LICENSE:${PN}-dev = "${LIBCOMMON_LICENSES}" +# All dynamic packages use ${DEFAULT_LICENSES} with the following exceptions +LICENSE:${PN}-cal = "BSD-4-Clause-UC & ${LIBCOMMON_LICENSES}" +LICENSE:${PN}-col = "BSD-4-Clause-UC & ${LIBCOMMON_LICENSES}" +LICENSE:${PN}-colcrt = "BSD-4-Clause-UC" +LICENSE:${PN}-colrm = "BSD-4-Clause-UC & ${LIBCOMMON_LICENSES}" +LICENSE:${PN}-column = "BSD-4-Clause-UC & ${LIBCOMMON_LICENSES}" +LICENSE:${PN}-coresched = "EUPL-1.2 & ${LIBCOMMON_LICENSES}" LICENSE:${PN}-fcntl-lock = "MIT" -LICENSE:${PN}-fdisk = "GPL-1.0-or-later" -LICENSE:${PN}-libblkid = "LGPL-2.1-or-later" -LICENSE:${PN}-libfdisk = "LGPL-2.1-or-later" -LICENSE:${PN}-libmount = "LGPL-2.1-or-later" -LICENSE:${PN}-libsmartcols = "LGPL-2.1-or-later" -LICENSE:${PN}-coresched = "EUPL-1.2" +LICENSE:${PN}-fdisk = "GPL-1.0-or-later & ${DEFAULT_LICENSES}" +LICENSE:${PN}-fsfreeze = "GPL-1.0-or-later" +LICENSE:${PN}-hexdump = "BSD-4-Clause-UC & ${LIBCOMMON_LICENSES}" +LICENSE:${PN}-kill = "BSD-4-Clause-UC & ${LIBCOMMON_LICENSES}" +LICENSE:${PN}-libblkid = "${LIBCOMMON_LICENSES}" +LICENSE:${PN}-libfdisk = "${LIBCOMMON_LICENSES}" +LICENSE:${PN}-libmount = "${LIBCOMMON_LICENSES}" +LICENSE:${PN}-libsmartcols = "${LIBCOMMON_LICENSES}" +LICENSE:${PN}-logger = "BSD-4-Clause-UC & ${LIBCOMMON_LICENSES}" +LICENSE:${PN}-look = "BSD-4-Clause-UC" +LICENSE:${PN}-lscpu = "GPL-2.0-only & ${DEFAULT_LICENSES}" +LICENSE:${PN}-mesg = "BSD-4-Clause-UC & ${LIBCOMMON_LICENSES}" +LICENSE:${PN}-nsenter = "GPL-2.0-only & ${DEFAULT_LICENSES}" +LICENSE:${PN}-renice = "BSD-4-Clause-UC" +LICENSE:${PN}-rev = "BSD-4-Clause-UC" +LICENSE:${PN}-script = "BSD-4-Clause-UC & ${LIBCOMMON_LICENSES}" +LICENSE:${PN}-ul = "BSD-4-Clause-UC" +LICENSE:${PN}-vipw = "BSD-4-Clause-UC & ${DEFAULT_LICENSES}" +LICENSE:${PN}-wall = "BSD-4-Clause-UC & ${LIBCOMMON_LICENSES}" +LICENSE:${PN}-whereis = "BSD-4-Clause-UC & ${LIBCOMMON_LICENSES}" +LICENSE:${PN}-write = "BSD-4-Clause-UC & ${LIBCOMMON_LICENSES}" LIC_FILES_CHKSUM = "file://README.licensing;md5=55e895a80bdd4ffc65e167a76d2e7569 \ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ @@ -33,6 +64,9 @@ python util_linux_binpackages () { pn = d.getVar('PN') d.appendVar('RRECOMMENDS:%s' % pn, ' %s' % pkg) + if not d.getVar('LICENSE:' + pkg): + d.setVar('LICENSE:' + pkg, '${DEFAULT_LICENSES}') + if d.getVar('ALTERNATIVE:' + pkg): return if d.getVarFlag('ALTERNATIVE_LINK_NAME', modulename):