mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH v2] util-linux: Version bump. 2.40 -> 2.40.2
@ 2024-07-12 11:26 Christian Melki
  2024-08-05  6:49 ` [ptxdist] [APPLIED] " Michael Olbrich
  0 siblings, 1 reply; 2+ messages in thread
From: Christian Melki @ 2024-07-12 11:26 UTC (permalink / raw)
  To: ptxdist

2.40.1 had a bunch of changes (esp meson build).
Rather big changeset for a patchlevel bump.
2.40.1 also had some build issues, so I skipped straight
to 2.40.2, where the issues have been fixed.

https://github.com/util-linux/util-linux/blob/v2.40.1/Documentation/releases/v2.40.1-ReleaseNotes
https://github.com/util-linux/util-linux/blob/v2.40.2/Documentation/releases/v2.40.2-ReleaseNotes

* Fix license updates, new mention of ISC and MIT. Add them to the list.

* Fix matching for the added meson build options and clear up others.

Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
 rules/util-linux.make | 34 ++++++++++++++++++++++++++++++----
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/rules/util-linux.make b/rules/util-linux.make
index aa667777f..62cd995a0 100644
--- a/rules/util-linux.make
+++ b/rules/util-linux.make
@@ -15,19 +15,21 @@ PACKAGES-$(PTXCONF_UTIL_LINUX) += util-linux
 #
 # Paths and names
 #
-UTIL_LINUX_VERSION	:= 2.40
-UTIL_LINUX_MD5		:= bc4272a7821bb12c68c441d23b8eaa89
+UTIL_LINUX_VERSION	:= 2.40.2
+UTIL_LINUX_MD5		:= 1044d809128f04048a794d1786491eb4
 UTIL_LINUX		:= util-linux-$(UTIL_LINUX_VERSION)
 UTIL_LINUX_SUFFIX	:= tar.gz
 UTIL_LINUX_URL		:= https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/snapshot/$(UTIL_LINUX).$(UTIL_LINUX_SUFFIX)
 UTIL_LINUX_SOURCE	:= $(SRCDIR)/$(UTIL_LINUX).$(UTIL_LINUX_SUFFIX)
 UTIL_LINUX_DIR		:= $(BUILDDIR)/$(UTIL_LINUX)
-UTIL_LINUX_LICENSE	:= GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.0-or-later AND BSD-3-Clause AND BSD-4-Clause AND public_domain
+UTIL_LINUX_LICENSE	:= GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.0-or-later AND BSD-3-Clause AND BSD-4-Clause AND MIT AND ISC AND public_domain
 UTIL_LINUX_LICENSE_FILES := \
 	file://Documentation/licenses/COPYING.GPL-2.0-or-later;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
 	file://Documentation/licenses/COPYING.BSD-3-Clause;md5=58dcd8452651fc8b07d1f65ce07ca8af \
 	file://Documentation/licenses/COPYING.BSD-4-Clause-UC;md5=263860f8968d8bafa5392cab74285262 \
-	file://Documentation/licenses/COPYING.LGPL-2.1-or-later;md5=4fbd65380cdd255951079008b364516c
+	file://Documentation/licenses/COPYING.LGPL-2.1-or-later;md5=4fbd65380cdd255951079008b364516c \
+	file://Documentation/licenses/COPYING.MIT;md5=00854eec1e0d7e0cc668674e7e87b9eb \
+	file://Documentation/licenses/COPYING.ISC;md5=8ae98663bac55afe5d989919d296f28a
 
 # ----------------------------------------------------------------------------
 # Prepare
@@ -52,22 +54,35 @@ UTIL_LINUX_CONF_OPT	:= \
 	-Dbuild-agetty=$(call ptx/endis, PTXCONF_UTIL_LINUX_AGETTY)d \
 	-Dbuild-bash-completion=disabled \
 	-Dbuild-bfs=disabled \
+	-Dbuild-blkdiscard=disabled \
+	-Dbuild-blkpr=disabled \
+	-Dbuild-blkzone=disabled \
+	-Dbuild-blockdev=disabled \
 	-Dbuild-cal=disabled \
+	-Dbuild-chcpu=disabled \
 	-Dbuild-chfn-chsh=disabled \
 	-Dbuild-chmem=$(call ptx/endis, PTXCONF_UTIL_LINUX_CHMEM)d \
 	-Dbuild-cramfs=disabled \
+	-Dbuild-dmesg=$(call ptx/endis, PTXCONF_UTIL_LINUX_DMESG)d \
 	-Dbuild-eject=disabled \
+	-Dbuild-enosys=disabled \
+	-Dbuild-fadvise=disabled \
 	-Dbuild-fallocate=disabled \
 	-Dbuild-fdformat=disabled \
 	-Dbuild-fdisks=$(call ptx/endis, PTXCONF_UTIL_LINUX_FDISKS)d \
+	-Dbuild-findmnt=disabled \
 	-Dbuild-fsck=$(call ptx/endis, PTXCONF_UTIL_LINUX_FSCK)d \
+	-Dbuild-fsfreeze=$(call ptx/endis, PTXCONF_UTIL_LINUX_FSFREEZE)d \
+	-Dbuild-fstrim=$(call ptx/endis, PTXCONF_UTIL_LINUX_FSTRIM)d \
 	-Dbuild-hardlink=disabled \
 	-Dbuild-hwclock=$(call ptx/endis, PTXCONF_UTIL_LINUX_HWCLOCK)d \
+	-Dbuild-ipcmk=disabled \
 	-Dbuild-ipcrm=$(call ptx/endis, PTXCONF_UTIL_LINUX_IPCRM)d \
 	-Dbuild-ipcs=$(call ptx/endis, PTXCONF_UTIL_LINUX_IPCS)d \
 	-Dbuild-irqtop=$(call ptx/endis, PTXCONF_UTIL_LINUX_IRQTOP)d \
 	-Dbuild-kill=disabled \
 	-Dbuild-last=disabled \
+	-Dbuild-ldattach=$(call ptx/endis, PTXCONF_UTIL_LINUX_LDATTACH)d \
 	-Dbuild-libblkid=$(call ptx/endis, PTXCONF_UTIL_LINUX_LIBBLKID)d \
 	-Dbuild-libfdisk=$(call ptx/endis, PTXCONF_UTIL_LINUX_LIBFDISK)d \
 	-Dbuild-liblastlog2=disabled \
@@ -78,9 +93,14 @@ UTIL_LINUX_CONF_OPT	:= \
 	-Dbuild-logger=disabled \
 	-Dbuild-login=$(call ptx/endis, PTXCONF_UTIL_LINUX_LOGIN)d \
 	-Dbuild-losetup=$(call ptx/endis, PTXCONF_UTIL_LINUX_LOSETUP)d \
+	-Dbuild-lsblk=$(call ptx/endis, PTXCONF_UTIL_LINUX_LSBLK)d \
+	-Dbuild-lsclocks=disabled \
+	-Dbuild-lsfd=$(call ptx/endis, PTXCONF_UTIL_LINUX_LSFD)d \
 	-Dbuild-lsirq=$(call ptx/endis, PTXCONF_UTIL_LINUX_LSIRQ)d \
+	-Dbuild-lslocks=disabled \
 	-Dbuild-lslogins=disabled \
 	-Dbuild-lsmem=$(call ptx/endis, PTXCONF_UTIL_LINUX_LSMEM)d \
+	-Dbuild-lsns=$(call ptx/endis, PTXCONF_UTIL_LINUX_LSNS)d \
 	-Dbuild-mesg=disabled \
 	-Dbuild-minix=disabled \
 	-Dbuild-more=disabled \
@@ -100,12 +120,18 @@ UTIL_LINUX_CONF_OPT	:= \
 	-Dbuild-raw=disabled \
 	-Dbuild-rename=disabled \
 	-Dbuild-rfkill=$(call ptx/endis, PTXCONF_UTIL_LINUX_RFKILL)d \
+	-Dbuild-rtcwake=disabled \
 	-Dbuild-runuser=disabled \
 	-Dbuild-schedutils=$(call ptx/endis, PTXCONF_UTIL_LINUX_SCHEDUTILS)d \
+	-Dbuild-script=disabled \
+	-Dbuild-scriptlive=disabled \
+	-Dbuild-setarch=disabled \
 	-Dbuild-setpriv=disabled \
 	-Dbuild-setterm=$(call ptx/endis, PTXCONF_UTIL_LINUX_SETTERM)d \
 	-Dbuild-su=disabled \
 	-Dbuild-sulogin=$(call ptx/endis, PTXCONF_UTIL_LINUX_SULOGIN)d \
+	-Dbuild-swapoff=$(call ptx/endis, PTXCONF_UTIL_LINUX_SWAPON)d \
+	-Dbuild-swapon=$(call ptx/endis, PTXCONF_UTIL_LINUX_SWAPON)d \
 	-Dbuild-switch_root=$(call ptx/endis, PTXCONF_UTIL_LINUX_SWITCH_ROOT)d \
 	-Dbuild-tunelp=disabled \
 	-Dbuild-ul=disabled \
-- 
2.34.1




^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-08-05  6:49 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-07-12 11:26 [ptxdist] [PATCH v2] util-linux: Version bump. 2.40 -> 2.40.2 Christian Melki
2024-08-05  6:49 ` [ptxdist] [APPLIED] " Michael Olbrich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox