mirror of
https://git.yoctoproject.org/poky
synced 2026-09-24 22:36:21 +02:00
util-linux: Add missing MIT license
The MIT license was missing from the license list for util-linux. Add a patch, submitted to upstream which adds the missing license mentions. (From OE-Core rev: 24078c0542626f74c93203d17ab4b2bb2f9b5630) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -6,14 +6,14 @@ disk partitioning, kernel message management, filesystem creation, and system lo
|
|||||||
|
|
||||||
SECTION = "base"
|
SECTION = "base"
|
||||||
|
|
||||||
LICENSE = "GPL-1.0-or-later & GPL-2.0-or-later & LGPL-2.1-or-later & BSD-2-Clause & BSD-3-Clause & BSD-4-Clause"
|
LICENSE = "GPL-1.0-or-later & GPL-2.0-or-later & LGPL-2.1-or-later & BSD-2-Clause & BSD-3-Clause & BSD-4-Clause & MIT"
|
||||||
LICENSE:${PN}-fdisk = "GPL-1.0-or-later"
|
LICENSE:${PN}-fdisk = "GPL-1.0-or-later"
|
||||||
LICENSE:${PN}-libblkid = "LGPL-2.1-or-later"
|
LICENSE:${PN}-libblkid = "LGPL-2.1-or-later"
|
||||||
LICENSE:${PN}-libfdisk = "LGPL-2.1-or-later"
|
LICENSE:${PN}-libfdisk = "LGPL-2.1-or-later"
|
||||||
LICENSE:${PN}-libmount = "LGPL-2.1-or-later"
|
LICENSE:${PN}-libmount = "LGPL-2.1-or-later"
|
||||||
LICENSE:${PN}-libsmartcols = "LGPL-2.1-or-later"
|
LICENSE:${PN}-libsmartcols = "LGPL-2.1-or-later"
|
||||||
|
|
||||||
LIC_FILES_CHKSUM = "file://README.licensing;md5=6b0e0a2320e66e62eef9b8149a6faec4 \
|
LIC_FILES_CHKSUM = "file://README.licensing;md5=cc80239f106687ab39ef0271ff5cf4ba \
|
||||||
file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
|
file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
|
||||||
file://Documentation/licenses/COPYING.GPL-2.0-or-later;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.LGPL-2.1-or-later;md5=4fbd65380cdd255951079008b364516c \
|
||||||
@@ -29,6 +29,7 @@ LIC_FILES_CHKSUM = "file://README.licensing;md5=6b0e0a2320e66e62eef9b8149a6faec4
|
|||||||
FILESEXTRAPATHS:prepend := "${THISDIR}/util-linux:"
|
FILESEXTRAPATHS:prepend := "${THISDIR}/util-linux:"
|
||||||
MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}"
|
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 \
|
SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.xz \
|
||||||
|
file://mit-license.patch \
|
||||||
file://configure-sbindir.patch \
|
file://configure-sbindir.patch \
|
||||||
file://runuser.pamd \
|
file://runuser.pamd \
|
||||||
file://runuser-l.pamd \
|
file://runuser-l.pamd \
|
||||||
|
|||||||
45
meta/recipes-core/util-linux/util-linux/mit-license.patch
Normal file
45
meta/recipes-core/util-linux/util-linux/mit-license.patch
Normal file
@@ -0,0 +1,45 @@
|
|||||||
|
From 5b8fab1584017d9d9be008c23b90128bba41a7b5 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Richard Purdie <richard.purdie@linuxfoundation.org>
|
||||||
|
Date: Thu, 28 Mar 2024 12:16:57 +0000
|
||||||
|
Subject: [PATCH] README.licensing/flock: Add MIT license mention
|
||||||
|
|
||||||
|
Looking at the license text, flock.c is under the MIT license (see
|
||||||
|
https://spdx.org/licenses/MIT).
|
||||||
|
|
||||||
|
Add an SPDX license identifier header and add to the list of licenses the
|
||||||
|
source so everything is correctly listed/identified.
|
||||||
|
|
||||||
|
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
||||||
|
|
||||||
|
Upstream-Status: Submitted [https://github.com/util-linux/util-linux/pull/2870]
|
||||||
|
|
||||||
|
---
|
||||||
|
README.licensing | 2 ++
|
||||||
|
sys-utils/flock.c | 4 +++-
|
||||||
|
2 files changed, 5 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/README.licensing b/README.licensing
|
||||||
|
index 4454f8392a..535ad34813 100644
|
||||||
|
--- a/README.licensing
|
||||||
|
+++ b/README.licensing
|
||||||
|
@@ -12,6 +12,8 @@ There is code under:
|
||||||
|
|
||||||
|
* LGPL-2.1-or-later - GNU Lesser General Public License 2.1 or any later version
|
||||||
|
|
||||||
|
+ * MIT - MIT License
|
||||||
|
+
|
||||||
|
* BSD-2-Clause - Simplified BSD License
|
||||||
|
|
||||||
|
* BSD-3-Clause - BSD 3-Clause "New" or "Revised" License
|
||||||
|
diff --git a/sys-utils/flock.c b/sys-utils/flock.c
|
||||||
|
index fed29d7270..7d878ff810 100644
|
||||||
|
--- a/sys-utils/flock.c
|
||||||
|
+++ b/sys-utils/flock.c
|
||||||
|
@@ -1,4 +1,6 @@
|
||||||
|
-/* Copyright 2003-2005 H. Peter Anvin - All Rights Reserved
|
||||||
|
+/* SPDX-License-Identifier: MIT
|
||||||
|
+ *
|
||||||
|
+ * Copyright 2003-2005 H. Peter Anvin - All Rights Reserved
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person
|
||||||
|
* obtaining a copy of this software and associated documentation
|
||||||
Reference in New Issue
Block a user