Skip to contentSkip to conversation

package/util-linux: bump to version 2.35

PATCH New unixmania at gmail.com 2 participants 3 messages Jan 29, 2020 – Mar 7, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/util-linux: bump to version 2.35

From: Carlos Santos <[email protected]>

This version brings bug fixes, enhancements and a new script utility, scriptlive. For detailed information see the release notes:

http://www.kernel.org/pub/linux/utils/util-linux/v2.35/v2.35-ReleaseNotes

Pull some fixed applied after the release.

Disable the use of code under GPLv3 included in hwclock since v2.30. The subject was discussed upstream[1] and it was decided that hwclock will be made GPLv2-only again in v2.36, so do it in advance in Buildroot.

Meanwhile, be warned that all OS images selecting hwclock built with Buildroot since commit 74235a6854 (util-linux: bump to version 2.30) contain code under GPLv3, which imposes some technical difficulties to include in embedded systems. For more information see GPLv3, Section 6, "Conveying Non-Source Forms", and the definitions of User Product and Installation Information[2].

1. https://lore.kernel.org/util-linux/20200127202152.4jh2w4chch37wgee at ws.net.home/T/#t
2. https://www.gnu.org/licenses/gpl-3.0.html

---
 ...w-explicit-wipefs-enable-disablement.patch |  33 ---
 ...-make-sure-we-do-not-overlap-on-move.patch |  71 +++++++
 ...emove-broken-step-alignment-for-move.patch |  62 ++++++
 ...0003-blkdiscard-use-O_EXCL-add-force.patch |  85 ++++++++
 ...d-fdisk_set_disklabel_id_from_string.patch | 194 ++++++++++++++++++
 ...k-add-disk-id-to-change-disk-UUID-ID.patch | 138 +++++++++++++
 ...-build-sys-add-disable-hwclock-gplv3.patch | 105 ++++++++++
 ...fix-x-options-use-for-non-root-users.patch | 137 +++++++++++++
 package/util-linux/Config.in                  |   6 +-
 package/util-linux/util-linux.hash            |   6 +-
 package/util-linux/util-linux.mk              |  15 +-
 11 files changed, 808 insertions(+), 44 deletions(-)
 delete mode 100644 package/util-linux/0001-Allow-explicit-wipefs-enable-disablement.patch
 create mode 100644 package/util-linux/0001-sfdisk-make-sure-we-do-not-overlap-on-move.patch
 create mode 100644 package/util-linux/0002-sfdisk-remove-broken-step-alignment-for-move.patch
 create mode 100644 package/util-linux/0003-blkdiscard-use-O_EXCL-add-force.patch
 create mode 100644 package/util-linux/0004-libfdisk-add-fdisk_set_disklabel_id_from_string.patch
 create mode 100644 package/util-linux/0005-sfdisk-add-disk-id-to-change-disk-UUID-ID.patch
 create mode 100644 package/util-linux/0006-build-sys-add-disable-hwclock-gplv3.patch
 create mode 100644 package/util-linux/0007-libmount-fix-x-options-use-for-non-root-users.patch
package/util-linux/0001-Allow-explicit-wipefs-enable-disablement.patch deleted +0 -33
deleted file mode 100644
index 85021e2978..0000000000
@@ -1,33 +0,0 @@
-From a76cd5f6abace269b60ef6f1b95526a2d09fd331 Mon Sep 17 00:00:00 2001
-From: Sam Voss <[email protected]>
-Date: Mon, 14 Oct 2019 21:19:16 -0500
-Subject: [PATCH] wipefs: Allow explicitly enable/disablement
-
-Currently if `--disable-all-packages` is set, there is no configure
-option for re-enabling `wipefs`.
-
-As the current default for `wipefs` is "enabled", add `--disable-` flag
-to maintain backward compatibility.
-
-Signed-off-by: Sam Voss <[email protected]>
----
- configure.ac | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index fc8a9507f..f70f8d1ee 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1286,7 +1286,11 @@ UL_BUILD_INIT([findfs], [check])
- UL_REQUIRES_BUILD([findfs], [libblkid])
- AM_CONDITIONAL([BUILD_FINDFS], [test "x$build_findfs" = xyes])
- 
--UL_BUILD_INIT([wipefs], [check])
-+AC_ARG_ENABLE([wipefs],
-+  AS_HELP_STRING([--disable-wipefs], [do not build wipefs]),
-+  [], [UL_DEFAULT_ENABLE([wipefs], [check])]
-+)
-+UL_BUILD_INIT([wipefs])
- UL_REQUIRES_BUILD([wipefs], [libblkid])
- UL_REQUIRES_BUILD([wipefs], [libsmartcols])
- AM_CONDITIONAL([BUILD_WIPEFS], [test "x$build_wipefs" = xyes])
package/util-linux/0001-sfdisk-make-sure-we-do-not-overlap-on-move.patch new file +71 -0

71 lines not on this page · raw message

package/util-linux/0002-sfdisk-remove-broken-step-alignment-for-move.patch new file +62 -0

62 lines not on this page · raw message

package/util-linux/0003-blkdiscard-use-O_EXCL-add-force.patch new file +85 -0

85 lines not on this page · raw message

package/util-linux/0004-libfdisk-add-fdisk_set_disklabel_id_from_string.patch new file +194 -0

194 lines not on this page · raw message

package/util-linux/0005-sfdisk-add-disk-id-to-change-disk-UUID-ID.patch new file +138 -0

138 lines not on this page · raw message

package/util-linux/0006-build-sys-add-disable-hwclock-gplv3.patch new file +105 -0

105 lines not on this page · raw message

package/util-linux/0007-libmount-fix-x-options-use-for-non-root-users.patch new file +137 -0

137 lines not on this page · raw message

package/util-linux/Config.in +3 -3
index 3609da79ad..996f0cd7fa 100644
@@ -57,9 +57,9 @@ config BR2_PACKAGE_UTIL_LINUX_BINARIES
 	  flock, fsfreeze, fstrim, getopt, hexdump, ipcmk, isosize,
 	  ldattach, look, lsblk, lscpu, lsipc, lslocks, lsns, mcookie,
 	  mkfs, mkswap, namei, prlimit, readprofile, renice, rev,
-	  rtcwake, script, scriptreplay, setarch, setsid, sfdisk,
-	  swaplabel, swapoff, swapon, uuidgen, uuidparse, whereis,
-	  wipefs
+	  rtcwake, script, scriptlive, scriptreplay, setarch, setsid,
+	  sfdisk, swaplabel, swapoff, swapon, uuidgen, uuidparse,
+	  whereis, wipefs
 
 	  The setarch utility also installs architecture-specific
 	  symlinks like linux32, linux64, uname26, i386 and x86_64.
package/util-linux/util-linux.hash +3 -3
index 7a83a03c1d..a5a9099125 100644
@@ -1,7 +1,7 @@
-# From https://www.kernel.org/pub/linux/utils/util-linux/v2.34/sha256sums.asc
-sha256 743f9d0c7252b6db246b659c1e1ce0bd45d8d4508b4dfa427bbb4a3e9b9f62b5  util-linux-2.34.tar.xz
+# From https://www.kernel.org/pub/linux/utils/util-linux/v2.35/sha256sums.asc
+sha256 b3081b560268c1ec3367e035234e91616fa7923a0afc2b1c80a2a6d8b9dfe2c9  util-linux-2.35.tar.xz
 # License files, locally calculated
-sha256 4335620e8f478ee4dc4d26540448d39469091ef1d8e3fbbbb8bf753206ceac74  README.licensing
+sha256 869660b5269f4f40a8a679da7f403ea3a6e71d46087aab5e14871b09bcb55955  README.licensing
 sha256 9b718a9460fed5952466421235bc79eb49d4e9eacc920d7a9dd6285ab8fd6c6d  Documentation/licenses/COPYING.BSD-3-Clause
 sha256 ba7640f00d93e72e92b94b9d71f25ec53bac2f1682f5c4adcccb0018359f60f8  Documentation/licenses/COPYING.BSD-4-Clause-UC
 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  Documentation/licenses/COPYING.GPL-2.0-or-later
package/util-linux/util-linux.mk +10 -5
index 7bd7a89e18..b867a670a4 100644
@@ -4,13 +4,17 @@
 #
 ################################################################################
 
-UTIL_LINUX_VERSION_MAJOR = 2.34
+UTIL_LINUX_VERSION_MAJOR = 2.35
 UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR)
 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. rfkill uses an ISC-style license.
+# 0006-build-sys-add-disable-hwclock-gplv3.patch
+UTIL_LINUX_AUTORECONF = YES
+
+# 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_LICENSE = GPL-2.0+, BSD-4-Clause, LGPL-2.1+ (libblkid, libfdisk, libmount), BSD-3-Clause (libuuid), ISC (rfkill)
 UTIL_LINUX_LICENSE_FILES = README.licensing \
 	Documentation/licenses/COPYING.BSD-3-Clause \
@@ -18,12 +22,13 @@ UTIL_LINUX_LICENSE_FILES = README.licensing \
 	Documentation/licenses/COPYING.GPL-2.0-or-later \
 	Documentation/licenses/COPYING.ISC \
 	Documentation/licenses/COPYING.LGPL-2.1-or-later
+
 UTIL_LINUX_INSTALL_STAGING = YES
 UTIL_LINUX_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES)
 UTIL_LINUX_CONF_OPTS += \
 	--disable-rpath \
 	--disable-makeinstall-chown
-UTIL_LINUX_AUTORECONF = YES
+
 UTIL_LINUX_LIBS = $(TARGET_NLS_LIBS)
 
 # system depends on util-linux so we enable systemd support
@@ -109,7 +114,7 @@ UTIL_LINUX_CONF_OPTS += \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_FDFORMAT),--enable-fdformat,--disable-fdformat) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_FSCK),--enable-fsck,--disable-fsck) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_HARDLINK),--enable-hardlink,--disable-hardlink) \
-	$(if $(BR2_PACKAGE_UTIL_LINUX_HWCLOCK),--enable-hwclock,--disable-hwclock) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_HWCLOCK),--enable-hwclock --disable-hwclock-gplv3,--disable-hwclock) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_IPCRM),--enable-ipcrm,--disable-ipcrm) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_IPCS),--enable-ipcs,--disable-ipcs) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_KILL),--enable-kill,--disable-kill) \
Signature · 1 line
2.18.2
#1 lore raw

PATCH 1/1 package/util-linux: bump to version 2.35

Quoted 14 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"unixmania" == unixmania <[email protected]> writes:

From: Carlos Santos <[email protected]>
This version brings bug fixes, enhancements and a new script utility, scriptlive. For detailed information see the release notes:

http://www.kernel.org/pub/linux/utils/util-linux/v2.35/v2.35-ReleaseNotes

Pull some fixed applied after the release.

Disable the use of code under GPLv3 included in hwclock since v2.30. The subject was discussed upstream[1] and it was decided that hwclock will be made GPLv2-only again in v2.36, so do it in advance in Buildroot.

Quoted 6 lines

Meanwhile, be warned that all OS images selecting hwclock built with Buildroot since commit 74235a6854 (util-linux: bump to version 2.30) contain code under GPLv3, which imposes some technical difficulties to include in embedded systems. For more information see GPLv3, Section 6, "Conveying Non-Source Forms", and the definitions of User Product and Installation Information[2].

Argh :/

Committed, thanks. I will also apply it to 2019.02.x / 2019.11.x once I sync them.

Signature · 1 line
Bye, Peter Korsgaard
#2 lore raw

PATCH 1/1 package/util-linux: bump to version 2.35

Quoted 22 lines
Quoted 15 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines

"Peter" == Peter Korsgaard <[email protected]> writes:

"unixmania" == unixmania <[email protected]> writes:

From: Carlos Santos <[email protected]>
This version brings bug fixes, enhancements and a new script utility, scriptlive. For detailed information see the release notes:

http://www.kernel.org/pub/linux/utils/util-linux/v2.35/v2.35-ReleaseNotes

Pull some fixed applied after the release.

Disable the use of code under GPLv3 included in hwclock since v2.30. The subject was discussed upstream[1] and it was decided that hwclock will be made GPLv2-only again in v2.36, so do it in advance in Buildroot.

Quoted 6 lines

Meanwhile, be warned that all OS images selecting hwclock built with Buildroot since commit 74235a6854 (util-linux: bump to version 2.30) contain code under GPLv3, which imposes some technical difficulties to include in embedded systems. For more information see GPLv3, Section 6, "Conveying Non-Source Forms", and the definitions of User Product and Installation Information[2].

Quoted 4 lines

Argh :/

Committed, thanks. I will also apply it to 2019.02.x / 2019.11.x once I sync them.

I finally got around to do so now.

Committed to 2019.02.x and 2019.11.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard