Skip to contentSkip to conversation

package/util-linux: update license info

PATCH In review Thomas Devoogdt 2 participants 2 messages Nov 7 – Nov 11

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/util-linux: update license info

Audit all source files and README.licensing in util-linux 2.41.5 and align UTIL_LINUX_LICENSE, UTIL_LINUX_LIBS_LICENSE, and their corresponding *_LICENSE_FILES:

- Add GPL-2.0 (sys-utils/lscpu-dmi.c, sys-utils/nsenter.c); drop the outdated comment claiming no files are GPL-2.0-only.
- Add GPL-1.0+ (disk-utils/fdisk.c).
- Use BSD-4-Clause-UC to match README.licensing and COPYING.BSD-4-Clause-UC.
- Add libsmartcols to LGPL-2.1+ in both util-linux and util-linux-libs.
- Add lastlog2, liblastlog2, and pam_lastlog2 to BSD-2-Clause, and include BSD-2-Clause (xxhash) in util-linux-libs.
- Add EUPL-1.2 (schedutils/coresched.c).
- Add crc64 (lib/crc64.c) to MIT, and include MIT (crc64) in util-linux-libs.
- Add Public Domain (lib/*, mcookie, setpgid, setsid, line).
- Drop Documentation/licenses/COPYING.GPL-3.0-or-later since GPL-3.0+ is only used in tests, build scripts, and the disabled hwclock GPLv3 date parser.

---
 .../util-linux-libs/util-linux-libs.mk         | 14 +++++++++-----
 package/util-linux/util-linux.hash             |  1 -
 package/util-linux/util-linux.mk               | 18 ++++++++++--------
 3 files changed, 19 insertions(+), 14 deletions(-)
package/util-linux/util-linux-libs/util-linux-libs.mk +9 -5
index d434a8f461c..53b9fb05ffb 100644
@@ -13,13 +13,17 @@ UTIL_LINUX_LIBS_DL_SUBDIR = $(UTIL_LINUX_DL_SUBDIR)
 UTIL_LINUX_LIBS_CPE_ID_VENDOR = $(UTIL_LINUX_CPE_ID_VENDOR)
 UTIL_LINUX_LIBS_CPE_ID_PRODUCT = $(UTIL_LINUX_CPE_ID_PRODUCT)
 
-# README.licensing claims that some files are GPL-2.0 only, but this is not
-# true. Some files are GPL-3.0+ but only in tests and optionally in hwclock
-# (but we disable that option). rfkill uses an ISC-style license.
-UTIL_LINUX_LIBS_LICENSE = LGPL-2.1+ (libblkid, libfdisk, libmount), BSD-3-Clause (libuuid)
+UTIL_LINUX_LIBS_LICENSE = \
+	LGPL-2.1+ (libblkid, libfdisk, libmount, libsmartcols), \
+	BSD-3-Clause (libuuid), \
+	BSD-2-Clause (xxhash), \
+	MIT (crc64), \
+	Public Domain
 UTIL_LINUX_LIBS_LICENSE_FILES = README.licensing \
+	Documentation/licenses/COPYING.BSD-2-Clause \
 	Documentation/licenses/COPYING.BSD-3-Clause \
-	Documentation/licenses/COPYING.LGPL-2.1-or-later
+	Documentation/licenses/COPYING.LGPL-2.1-or-later \
+	Documentation/licenses/COPYING.MIT
 
 # 0002-autotools-optionally-add-libpthread-to-uuid.pc.patch
 UTIL_LINUX_LIBS_AUTORECONF = YES
package/util-linux/util-linux.hash +0 -1
index b6393d6ec01..4f1378fdbd6 100644
@@ -8,7 +8,6 @@ sha256  ba7640f00d93e72e92b94b9d71f25ec53bac2f1682f5c4adcccb0018359f60f8  Docume
 sha256  6fc9e709ccbfe0d77fbffa2427a983282be2eb88e47b1cdb49f21a83b4d1e665  Documentation/licenses/COPYING.EUPL-1.2
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  Documentation/licenses/COPYING.GPL-2.0-only
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  Documentation/licenses/COPYING.GPL-2.0-or-later
-sha256  3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986  Documentation/licenses/COPYING.GPL-3.0-or-later
 sha256  e53348ce276358e9997014071c5294b36a18c4b34f32f00ee57b9acce0aafd63  Documentation/licenses/COPYING.ISC
 sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  Documentation/licenses/COPYING.LGPL-2.1-or-later
 sha256  8555341619542abb48c102afd954e42d4478e5be16ad3d5af7b0ff71009e7348  Documentation/licenses/COPYING.MIT
package/util-linux/util-linux.mk +10 -8
index 9ddf48a343b..d973b33d401 100644
@@ -12,17 +12,20 @@ UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).5
 UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz
 UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR)
 
-# README.licensing claims that some files are GPL-2.0 only, but this is not
-# true. Some files are GPL-3.0+ but only in tests and optionally in hwclock
-# (but we disable that option). rfkill uses an ISC-style license.
+# Some files are GPL-3.0+ or LGPL-3.0+ but only in tests, python bindings,
+# and optionally in hwclock (but we disable those options).
 UTIL_LINUX_LICENSE = \
 	GPL-2.0+, \
-	BSD-4-Clause, \
-	LGPL-2.1+ (libblkid, libfdisk, libmount), \
+	GPL-2.0 (lscpu-dmi, nsenter), \
+	GPL-1.0+ (fdisk), \
+	BSD-4-Clause-UC, \
+	LGPL-2.1+ (libblkid, libfdisk, libmount, libsmartcols), \
 	BSD-3-Clause (libuuid), \
-	BSD-2-Clause (xxhash), \
+	BSD-2-Clause (lastlog2, liblastlog2, pam_lastlog2, xxhash), \
+	EUPL-1.2 (coresched), \
 	ISC (rfkill), \
-	MIT (hardlink, flock)
+	MIT (crc64, flock, hardlink), \
+	Public Domain
 UTIL_LINUX_LICENSE_FILES = README.licensing \
 	Documentation/licenses/COPYING.BSD-2-Clause \
 	Documentation/licenses/COPYING.BSD-3-Clause \
@@ -30,7 +33,6 @@ UTIL_LINUX_LICENSE_FILES = README.licensing \
 	Documentation/licenses/COPYING.EUPL-1.2 \
 	Documentation/licenses/COPYING.GPL-2.0-only \
 	Documentation/licenses/COPYING.GPL-2.0-or-later \
-	Documentation/licenses/COPYING.GPL-3.0-or-later \
 	Documentation/licenses/COPYING.ISC \
 	Documentation/licenses/COPYING.LGPL-2.1-or-later \
 	Documentation/licenses/COPYING.MIT
Signature · 6 lines
2.43.0

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw

Am 07.11.26 um 13:13 schrieb Thomas Devoogdt:

Quoted 4 lines

Audit all source files and README.licensing in util-linux 2.41.5 and align UTIL_LINUX_LICENSE, UTIL_LINUX_LIBS_LICENSE, and their corresponding *_LICENSE_FILES:

Quoted 15 lines

- Add GPL-2.0 (sys-utils/lscpu-dmi.c, sys-utils/nsenter.c); drop the outdated comment claiming no files are GPL-2.0-only.
- Add GPL-1.0+ (disk-utils/fdisk.c).
- Use BSD-4-Clause-UC to match README.licensing and COPYING.BSD-4-Clause-UC.
- Add libsmartcols to LGPL-2.1+ in both util-linux and util-linux-libs.
- Add lastlog2, liblastlog2, and pam_lastlog2 to BSD-2-Clause, and include BSD-2-Clause (xxhash) in util-linux-libs.
- Add EUPL-1.2 (schedutils/coresched.c).
- Add crc64 (lib/crc64.c) to MIT, and include MIT (crc64) in util-linux-libs.
- Add Public Domain (lib/*, mcookie, setpgid, setsid, line).
- Drop Documentation/licenses/COPYING.GPL-3.0-or-later since GPL-3.0+ is only used in tests, build scripts, and the disabled hwclock GPLv3 date parser.

I disagree with omitting these, all licenses for (parts of) the source package should be mentioned. GPL-3.0-or-later should be in _LICENSES instead, ideally with a note to help people who are checking for license compliance.

Best regards,
Fiona

Quoted 79 lines
---
  .../util-linux-libs/util-linux-libs.mk         | 14 +++++++++-----
  package/util-linux/util-linux.hash             |  1 -
  package/util-linux/util-linux.mk               | 18 ++++++++++--------
  3 files changed, 19 insertions(+), 14 deletions(-)
package/util-linux/util-linux-libs/util-linux-libs.mk +9 -5
index d434a8f461c..53b9fb05ffb 100644
@@ -13,13 +13,17 @@ UTIL_LINUX_LIBS_DL_SUBDIR = $(UTIL_LINUX_DL_SUBDIR)
  UTIL_LINUX_LIBS_CPE_ID_VENDOR = $(UTIL_LINUX_CPE_ID_VENDOR)
  UTIL_LINUX_LIBS_CPE_ID_PRODUCT = $(UTIL_LINUX_CPE_ID_PRODUCT)
 
-# README.licensing claims that some files are GPL-2.0 only, but this is not
-# true. Some files are GPL-3.0+ but only in tests and optionally in hwclock
-# (but we disable that option). rfkill uses an ISC-style license.
-UTIL_LINUX_LIBS_LICENSE = LGPL-2.1+ (libblkid, libfdisk, libmount), BSD-3-Clause (libuuid)
+UTIL_LINUX_LIBS_LICENSE = \
+	LGPL-2.1+ (libblkid, libfdisk, libmount, libsmartcols), \
+	BSD-3-Clause (libuuid), \
+	BSD-2-Clause (xxhash), \
+	MIT (crc64), \
+	Public Domain
  UTIL_LINUX_LIBS_LICENSE_FILES = README.licensing \
+	Documentation/licenses/COPYING.BSD-2-Clause \
  	Documentation/licenses/COPYING.BSD-3-Clause \
-	Documentation/licenses/COPYING.LGPL-2.1-or-later
+	Documentation/licenses/COPYING.LGPL-2.1-or-later \
+	Documentation/licenses/COPYING.MIT
 
  # 0002-autotools-optionally-add-libpthread-to-uuid.pc.patch
  UTIL_LINUX_LIBS_AUTORECONF = YES
package/util-linux/util-linux.hash +0 -1
index b6393d6ec01..4f1378fdbd6 100644
@@ -8,7 +8,6 @@ sha256  ba7640f00d93e72e92b94b9d71f25ec53bac2f1682f5c4adcccb0018359f60f8  Docume
  sha256  6fc9e709ccbfe0d77fbffa2427a983282be2eb88e47b1cdb49f21a83b4d1e665  Documentation/licenses/COPYING.EUPL-1.2
  sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  Documentation/licenses/COPYING.GPL-2.0-only
  sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  Documentation/licenses/COPYING.GPL-2.0-or-later
-sha256  3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986  Documentation/licenses/COPYING.GPL-3.0-or-later
  sha256  e53348ce276358e9997014071c5294b36a18c4b34f32f00ee57b9acce0aafd63  Documentation/licenses/COPYING.ISC
  sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  Documentation/licenses/COPYING.LGPL-2.1-or-later
  sha256  8555341619542abb48c102afd954e42d4478e5be16ad3d5af7b0ff71009e7348  Documentation/licenses/COPYING.MIT
package/util-linux/util-linux.mk +10 -7
index 9ddf48a343b..d973b33d401 100644
@@ -12,17 +12,20 @@ UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).5
  UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz
  UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR)
 
-# README.licensing claims that some files are GPL-2.0 only, but this is not
-# true. Some files are GPL-3.0+ but only in tests and optionally in hwclock
-# (but we disable that option). rfkill uses an ISC-style license.
+# Some files are GPL-3.0+ or LGPL-3.0+ but only in tests, python bindings,
+# and optionally in hwclock (but we disable those options).
  UTIL_LINUX_LICENSE = \
  	GPL-2.0+, \
-	BSD-4-Clause, \
-	LGPL-2.1+ (libblkid, libfdisk, libmount), \
+	GPL-2.0 (lscpu-dmi, nsenter), \
+	GPL-1.0+ (fdisk), \
+	BSD-4-Clause-UC, \
+	LGPL-2.1+ (libblkid, libfdisk, libmount, libsmartcols), \
  	BSD-3-Clause (libuuid), \
-	BSD-2-Clause (xxhash), \
+	BSD-2-Clause (lastlog2, liblastlog2, pam_lastlog2, xxhash), \
+	EUPL-1.2 (coresched), \
  	ISC (rfkill), \
-	MIT (hardlink, flock)
+	MIT (crc64, flock, hardlink), \
+	Public Domain
  UTIL_LINUX_LICENSE_FILES = README.licensing \
  	Documentation/licenses/COPYING.BSD-2-Clause \
  	Documentation/licenses/COPYING.BSD-3-Clause \

package/util-linux/util-linux.mk UTIL_LINUX_LICENSE_FILES = README.licensing \ · line 38

Quoted 7 lines
package/util-linux/util-linux.mk +0 -1
@@ -30,7 +33,6 @@ UTIL_LINUX_LICENSE_FILES = README.licensing \
  	Documentation/licenses/COPYING.EUPL-1.2 \
  	Documentation/licenses/COPYING.GPL-2.0-only \
  	Documentation/licenses/COPYING.GPL-2.0-or-later \
-	Documentation/licenses/COPYING.GPL-3.0-or-later \
  	Documentation/licenses/COPYING.ISC \
  	Documentation/licenses/COPYING.LGPL-2.1-or-later \
  	Documentation/licenses/COPYING.MIT

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot