diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-03-28 13:01:55 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-03-30 22:22:19 +0000 |
commit | 3c7e103af4d8072181b581b930d763cbc67e3058 (patch) | |
tree | 37a7c5e108e4110bb11662cba35208f9bb08e3f9 | |
parent | 43334573310e4086c35c664d7b4a3e54cd8db593 (diff) | |
download | poky-3c7e103af4d8072181b581b930d763cbc67e3058.tar.gz |
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>
-rw-r--r-- | meta/recipes-core/util-linux/util-linux.inc | 5 | ||||
-rw-r--r-- | meta/recipes-core/util-linux/util-linux/mit-license.patch | 45 |
2 files changed, 48 insertions, 2 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 4e9d22f269..d96f00fbab 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc | |||
@@ -6,14 +6,14 @@ disk partitioning, kernel message management, filesystem creation, and system lo | |||
6 | 6 | ||
7 | SECTION = "base" | 7 | SECTION = "base" |
8 | 8 | ||
9 | 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" | 9 | 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" |
10 | LICENSE:${PN}-fdisk = "GPL-1.0-or-later" | 10 | LICENSE:${PN}-fdisk = "GPL-1.0-or-later" |
11 | LICENSE:${PN}-libblkid = "LGPL-2.1-or-later" | 11 | LICENSE:${PN}-libblkid = "LGPL-2.1-or-later" |
12 | LICENSE:${PN}-libfdisk = "LGPL-2.1-or-later" | 12 | LICENSE:${PN}-libfdisk = "LGPL-2.1-or-later" |
13 | LICENSE:${PN}-libmount = "LGPL-2.1-or-later" | 13 | LICENSE:${PN}-libmount = "LGPL-2.1-or-later" |
14 | LICENSE:${PN}-libsmartcols = "LGPL-2.1-or-later" | 14 | LICENSE:${PN}-libsmartcols = "LGPL-2.1-or-later" |
15 | 15 | ||
16 | LIC_FILES_CHKSUM = "file://README.licensing;md5=6b0e0a2320e66e62eef9b8149a6faec4 \ | 16 | LIC_FILES_CHKSUM = "file://README.licensing;md5=cc80239f106687ab39ef0271ff5cf4ba \ |
17 | file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | 17 | file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
18 | file://Documentation/licenses/COPYING.GPL-2.0-or-later;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | 18 | file://Documentation/licenses/COPYING.GPL-2.0-or-later;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
19 | file://Documentation/licenses/COPYING.LGPL-2.1-or-later;md5=4fbd65380cdd255951079008b364516c \ | 19 | file://Documentation/licenses/COPYING.LGPL-2.1-or-later;md5=4fbd65380cdd255951079008b364516c \ |
@@ -29,6 +29,7 @@ LIC_FILES_CHKSUM = "file://README.licensing;md5=6b0e0a2320e66e62eef9b8149a6faec4 | |||
29 | FILESEXTRAPATHS:prepend := "${THISDIR}/util-linux:" | 29 | FILESEXTRAPATHS:prepend := "${THISDIR}/util-linux:" |
30 | MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" | 30 | MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" |
31 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.xz \ | 31 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.xz \ |
32 | file://mit-license.patch \ | ||
32 | file://configure-sbindir.patch \ | 33 | file://configure-sbindir.patch \ |
33 | file://runuser.pamd \ | 34 | file://runuser.pamd \ |
34 | file://runuser-l.pamd \ | 35 | file://runuser-l.pamd \ |
diff --git a/meta/recipes-core/util-linux/util-linux/mit-license.patch b/meta/recipes-core/util-linux/util-linux/mit-license.patch new file mode 100644 index 0000000000..afbec98f18 --- /dev/null +++ b/meta/recipes-core/util-linux/util-linux/mit-license.patch | |||
@@ -0,0 +1,45 @@ | |||
1 | From 5b8fab1584017d9d9be008c23b90128bba41a7b5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
3 | Date: Thu, 28 Mar 2024 12:16:57 +0000 | ||
4 | Subject: [PATCH] README.licensing/flock: Add MIT license mention | ||
5 | |||
6 | Looking at the license text, flock.c is under the MIT license (see | ||
7 | https://spdx.org/licenses/MIT). | ||
8 | |||
9 | Add an SPDX license identifier header and add to the list of licenses the | ||
10 | source so everything is correctly listed/identified. | ||
11 | |||
12 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
13 | |||
14 | Upstream-Status: Submitted [https://github.com/util-linux/util-linux/pull/2870] | ||
15 | |||
16 | --- | ||
17 | README.licensing | 2 ++ | ||
18 | sys-utils/flock.c | 4 +++- | ||
19 | 2 files changed, 5 insertions(+), 1 deletion(-) | ||
20 | |||
21 | diff --git a/README.licensing b/README.licensing | ||
22 | index 4454f8392a..535ad34813 100644 | ||
23 | --- a/README.licensing | ||
24 | +++ b/README.licensing | ||
25 | @@ -12,6 +12,8 @@ There is code under: | ||
26 | |||
27 | * LGPL-2.1-or-later - GNU Lesser General Public License 2.1 or any later version | ||
28 | |||
29 | + * MIT - MIT License | ||
30 | + | ||
31 | * BSD-2-Clause - Simplified BSD License | ||
32 | |||
33 | * BSD-3-Clause - BSD 3-Clause "New" or "Revised" License | ||
34 | diff --git a/sys-utils/flock.c b/sys-utils/flock.c | ||
35 | index fed29d7270..7d878ff810 100644 | ||
36 | --- a/sys-utils/flock.c | ||
37 | +++ b/sys-utils/flock.c | ||
38 | @@ -1,4 +1,6 @@ | ||
39 | -/* Copyright 2003-2005 H. Peter Anvin - All Rights Reserved | ||
40 | +/* SPDX-License-Identifier: MIT | ||
41 | + * | ||
42 | + * Copyright 2003-2005 H. Peter Anvin - All Rights Reserved | ||
43 | * | ||
44 | * Permission is hereby granted, free of charge, to any person | ||
45 | * obtaining a copy of this software and associated documentation | ||