From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Christian Melki <christian.melki@t2data.com>
Subject: Re: [ptxdist] [APPLIED] util-linux: Version bump. 2.40.4 -> 2.41
Date: Mon, 7 Apr 2025 18:02:42 +0200 [thread overview]
Message-ID: <20250407160242.195669-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20250324192434.2168895-1-christian.melki@t2data.com>
Thanks, applied as 8cd665713da90fc11ec0d015aff42f80a3398cab.
Michael
[sent from post-receive hook]
On Mon, 07 Apr 2025 18:02:42 +0200, Christian Melki <christian.melki@t2data.com> wrote:
> Improvements and fixes all over the board.
> https://github.com/util-linux/util-linux/blob/v2.41/Documentation/releases/v2.41-ReleaseNotes
>
> * Add patch to fix build error, reported and fetched from upstream.
>
> * Update a bunch of options. Pin down a bunch of previously selectable
> but not controlled options.
>
> * Add hexdump, waitpid.
>
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20250324192434.2168895-1-christian.melki@t2data.com>
> [mol: waitpid is in bin/ not sbin/]
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/patches/util-linux-2.41/0001-meson-fix-manadocs-for-libsmartcols-and-libblkid.patch b/patches/util-linux-2.41/0001-meson-fix-manadocs-for-libsmartcols-and-libblkid.patch
> new file mode 100644
> index 000000000000..84469b57a98e
> --- /dev/null
> +++ b/patches/util-linux-2.41/0001-meson-fix-manadocs-for-libsmartcols-and-libblkid.patch
> @@ -0,0 +1,27 @@
> +From: Karel Zak <kzak@redhat.com>
> +Date: Mon, 24 Mar 2025 15:18:24 +0100
> +Subject: [PATCH] meson: fix manadocs for libsmartcols and libblkid
> +
> +Fixes: https://github.com/util-linux/util-linux/issues/3475
> +Signed-off-by: Karel Zak <kzak@redhat.com>
> +---
> + meson.build | 6 +++++-
> + 1 file changed, 5 insertions(+), 1 deletion(-)
> +
> +diff --git a/meson.build b/meson.build
> +index 1537f5e61d90..6aeac2137941 100644
> +--- a/meson.build
> ++++ b/meson.build
> +@@ -4028,7 +4028,11 @@ run_target(
> +
> + manadocs += lib_tcolors_manadocs
> + if build_libblkid
> +- manadocs += lib_blkid_manadocs + lib_smartcols_manadocs
> ++ manadocs += lib_blkid_manadocs
> ++endif
> ++
> ++if build_libsmartcols
> ++ manadocs += lib_smartcols_manadocs
> + endif
> +
> + if build_libuuid
> diff --git a/patches/util-linux-2.41/series b/patches/util-linux-2.41/series
> new file mode 100644
> index 000000000000..3f449626f966
> --- /dev/null
> +++ b/patches/util-linux-2.41/series
> @@ -0,0 +1,4 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +0001-meson-fix-manadocs-for-libsmartcols-and-libblkid.patch
> +# 656d9220406ce026441dc658bd6535a7 - git-ptx-patches magic
> diff --git a/rules/util-linux.in b/rules/util-linux.in
> index 58bd21100a9e..3effecd72a9b 100644
> --- a/rules/util-linux.in
> +++ b/rules/util-linux.in
> @@ -249,6 +249,12 @@ config UTIL_LINUX_UUIDGEN
> help
> uuidgen is a command-line utility to create a new UUID value.
>
> +config UTIL_LINUX_WAITPID
> + bool
> + prompt "waitpid"
> + help
> + waitpid - Utility to wait for arbitrary non-child processes.
> +
> config UTIL_LINUX_WIPEFS
> bool
> select UTIL_LINUX_LIBBLKID
> @@ -613,6 +619,16 @@ config UTIL_LINUX_COLUMN
> help
> Columnate lists.
>
> +config UTIL_LINUX_HEXDUMP
> + bool
> + depends on !BUSYBOX_HEXDUMP
> + prompt "hexdump"
> + help
> + Utility to print hexdumps.
> +
> +comment "BusyBox' hexdump is selected!"
> + depends on BUSYBOX_HEXDUMP
> +
> config UTIL_LINUX_LINE
> bool
> prompt "line"
> diff --git a/rules/util-linux.make b/rules/util-linux.make
> index c98200a52258..c1152257dd6f 100644
> --- a/rules/util-linux.make
> +++ b/rules/util-linux.make
> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_UTIL_LINUX) += util-linux
> #
> # Paths and names
> #
> -UTIL_LINUX_VERSION := 2.40.4
> -UTIL_LINUX_MD5 := b7927f7e4b6c29e026ca2bfe0010ea0d
> +UTIL_LINUX_VERSION := 2.41
> +UTIL_LINUX_MD5 := 1596f41840811a880b87fa0d360407be
> 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)
> @@ -54,6 +54,7 @@ UTIL_LINUX_CONF_OPT := \
> -Dbuild-agetty=$(call ptx/endis, PTXCONF_UTIL_LINUX_AGETTY)d \
> -Dbuild-bash-completion=disabled \
> -Dbuild-bfs=disabled \
> + -Dbuild-bits=disabled \
> -Dbuild-blkdiscard=$(call ptx/endis, PTXCONF_UTIL_LINUX_BLKDISCARD)d \
> -Dbuild-blkpr=disabled \
> -Dbuild-blkzone=disabled \
> @@ -62,24 +63,35 @@ UTIL_LINUX_CONF_OPT := \
> -Dbuild-chcpu=disabled \
> -Dbuild-chfn-chsh=disabled \
> -Dbuild-chmem=$(call ptx/endis, PTXCONF_UTIL_LINUX_CHMEM)d \
> + -Dbuild-choom=disabled \
> + -Dbuild-col=disabled \
> + -Dbuild-colcrt=disabled \
> + -Dbuild-colrm=disabled \
> -Dbuild-cramfs=disabled \
> + -Dbuild-ctrlaltdel=disabled \
> -Dbuild-dmesg=$(call ptx/endis, PTXCONF_UTIL_LINUX_DMESG)d \
> -Dbuild-eject=disabled \
> -Dbuild-enosys=disabled \
> + -Dbuild-exch=disabled \
> -Dbuild-fadvise=disabled \
> -Dbuild-fallocate=disabled \
> -Dbuild-fdformat=disabled \
> -Dbuild-fdisks=$(call ptx/endis, PTXCONF_UTIL_LINUX_FDISKS)d \
> + -Dbuild-findfs=$(call ptx/endis, PTXCONF_UTIL_LINUX_FINDFS)d \
> -Dbuild-findmnt=disabled \
> + -Dbuild-flock=$(call ptx/endis, PTXCONF_UTIL_LINUX_FLOCK)d \
> -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-getopt=$(call ptx/endis, PTXCONF_UTIL_LINUX_GETOPT)d \
> -Dbuild-hardlink=disabled \
> + -Dbuild-hexdump=$(call ptx/endis, PTXCONF_UTIL_LINUX_HEXDUMP)d \
> -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-isosize=disabled \
> -Dbuild-kill=disabled \
> -Dbuild-last=disabled \
> -Dbuild-ldattach=$(call ptx/endis, PTXCONF_UTIL_LINUX_LDATTACH)d \
> @@ -92,6 +104,7 @@ UTIL_LINUX_CONF_OPT := \
> -Dbuild-line=$(call ptx/endis, PTXCONF_UTIL_LINUX_LINE)d \
> -Dbuild-logger=disabled \
> -Dbuild-login=$(call ptx/endis, PTXCONF_UTIL_LINUX_LOGIN)d \
> + -Dbuild-look=disabled \
> -Dbuild-losetup=$(call ptx/endis, PTXCONF_UTIL_LINUX_LOSETUP)d \
> -Dbuild-lsblk=$(call ptx/endis, PTXCONF_UTIL_LINUX_LSBLK)d \
> -Dbuild-lsclocks=disabled \
> @@ -101,11 +114,14 @@ UTIL_LINUX_CONF_OPT := \
> -Dbuild-lslogins=disabled \
> -Dbuild-lsmem=$(call ptx/endis, PTXCONF_UTIL_LINUX_LSMEM)d \
> -Dbuild-lsns=$(call ptx/endis, PTXCONF_UTIL_LINUX_LSNS)d \
> + -Dbuild-mcookie=$(call ptx/endis, PTXCONF_UTIL_LINUX_MCOOKIE)d \
> -Dbuild-mesg=disabled \
> -Dbuild-minix=disabled \
> + -Dbuild-mkfs=$(call ptx/endis, PTXCONF_UTIL_LINUX_MKFS)d \
> -Dbuild-more=disabled \
> -Dbuild-mount=$(call ptx/endis, PTXCONF_UTIL_LINUX_MOUNT)d \
> -Dbuild-mountpoint=$(call ptx/endis, PTXCONF_UTIL_LINUX_MOUNTPOINT)d \
> + -Dbuild-namei=disabled \
> -Dbuild-newgrp=disabled \
> -Dbuild-nologin=disabled \
> -Dbuild-nsenter=$(call ptx/endis, PTXCONF_UTIL_LINUX_NSENTER)d \
> @@ -119,12 +135,13 @@ UTIL_LINUX_CONF_OPT := \
> -Dbuild-python=disabled \
> -Dbuild-raw=disabled \
> -Dbuild-rename=disabled \
> + -Dbuild-rev=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-scriptutils=disabled \
> -Dbuild-setarch=disabled \
> -Dbuild-setpriv=disabled \
> -Dbuild-setterm=$(call ptx/endis, PTXCONF_UTIL_LINUX_SETTERM)d \
> @@ -139,8 +156,10 @@ UTIL_LINUX_CONF_OPT := \
> -Dbuild-utmpdump=disabled \
> -Dbuild-uuidd=$(call ptx/endis, PTXCONF_UTIL_LINUX_UUIDD)d \
> -Dbuild-vipw=disabled \
> + -Dbuild-waitpid=$(call ptx/endis, PTXCONF_UTIL_LINUX_WAITPID)d \
> -Dbuild-wall=disabled \
> -Dbuild-wdctl=$(call ptx/endis, PTXCONF_UTIL_LINUX_WDCTL)d \
> + -Dbuild-whereis=disabled \
> -Dbuild-wipefs=$(call ptx/endis, PTXCONF_UTIL_LINUX_WIPEFS)d \
> -Dbuild-write=disabled \
> -Dbuild-zramctl=$(call ptx/endis, PTXCONF_UTIL_LINUX_ZRAMCTL)d \
> @@ -156,6 +175,7 @@ UTIL_LINUX_CONF_OPT := \
> -Dlibuser=disabled \
> -Dlibutempter=disabled \
> -Dlibutil=$(call ptx/disen, PTXCONF_GLIBC_2_34)d \
> + -Dlogin-lastlogin=false \
> -Dmagic=disabled \
> -Dncurses=$(call ptx/endis, UTIL_LINUX_USES_NCURSES)d \
> -Dncursesw=$(call ptx/endis, PTXCONF_UTIL_LINUX_USES_NCURSESW)d \
> @@ -171,6 +191,7 @@ UTIL_LINUX_CONF_OPT := \
> -Dsystemd=disabled \
> -Dsysvinit=disabled \
> -Dtinfo=disabled \
> + -Dtty-setgid=false \
> -Duse-tls=true \
> -Duse-tty-group=false \
> -Dvendordir= \
> @@ -217,6 +238,7 @@ UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_LSBLK) += bin/lsblk
> UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_MCOOKIE) += bin/mcookie
> UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_UUIDD) += sbin/uuidd
> UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_UUIDGEN) += bin/uuidgen
> +UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_WAITPID) += bin/waitpid
> UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_WIPEFS) += sbin/wipefs
> # schedutils
> UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_CHRT) += bin/chrt
> @@ -258,6 +280,7 @@ UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_AGETTY) += sbin/agetty
> UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_SETTERM) += bin/setterm
> # text-utils
> UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_COLUMN) += bin/column
> +UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_HEXDUMP) += bin/hexdump
> UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_LINE) += bin/line
>
> $(STATEDIR)/util-linux.targetinstall:
prev parent reply other threads:[~2025-04-07 16:03 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-24 19:24 [ptxdist] [PATCH 1/2] " Christian Melki
2025-03-24 19:24 ` [ptxdist] [PATCH 2/2] host-util-linux: Follow target util-linux 2.40.4 -> 2.41 bump Christian Melki
2025-04-07 16:02 ` [ptxdist] [APPLIED] " Michael Olbrich
2025-04-07 16:02 ` Michael Olbrich [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250407160242.195669-1-m.olbrich@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=christian.melki@t2data.com \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox