From: Christian Melki <christian.melki@t2data.com>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH v2] util-linux: Version bump. 2.39.2 -> 2.39.3
Date: Wed, 6 Dec 2023 20:50:45 +0100 [thread overview]
Message-ID: <20231206195045.2108305-1-christian.melki@t2data.com> (raw)
Minor changes.
https://github.com/util-linux/util-linux/compare/v2.39.2...v2.39.3
* Add resizepart and setsid utils. Fix setsid collision
with busybox setsid.
* Move patchset, applies cleanly.
Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
...-properly-handle-gettext-non-existence.patch | 0
.../series | 0
rules/util-linux.in | 17 +++++++++++++++++
rules/util-linux.make | 6 ++++--
4 files changed, 21 insertions(+), 2 deletions(-)
rename patches/{util-linux-2.39.2 => util-linux-2.39.3}/0001-meson-properly-handle-gettext-non-existence.patch (100%)
rename patches/{util-linux-2.39.2 => util-linux-2.39.3}/series (100%)
diff --git a/patches/util-linux-2.39.2/0001-meson-properly-handle-gettext-non-existence.patch b/patches/util-linux-2.39.3/0001-meson-properly-handle-gettext-non-existence.patch
similarity index 100%
rename from patches/util-linux-2.39.2/0001-meson-properly-handle-gettext-non-existence.patch
rename to patches/util-linux-2.39.3/0001-meson-properly-handle-gettext-non-existence.patch
diff --git a/patches/util-linux-2.39.2/series b/patches/util-linux-2.39.3/series
similarity index 100%
rename from patches/util-linux-2.39.2/series
rename to patches/util-linux-2.39.3/series
diff --git a/rules/util-linux.in b/rules/util-linux.in
index 3cdcad57d..8bf035f39 100644
--- a/rules/util-linux.in
+++ b/rules/util-linux.in
@@ -76,6 +76,13 @@ config UTIL_LINUX_DELPART
help
The delpart utility.
+config UTIL_LINUX_RESIZEPART
+ bool
+ select UTIL_LINUX_PARTX_TOOLS
+ prompt "resizepart"
+ help
+ The resizepart utility.
+
config UTIL_LINUX_FDISK
bool
prompt "fdisk"
@@ -522,6 +529,16 @@ config UTIL_LINUX_SWAPON
comment "BusyBox' swapon is selected!"
depends on BUSYBOX_SWAPON
+config UTIL_LINUX_SETSID
+ bool
+ depends on !BUSYBOX_SETSID
+ prompt "setsid"
+ help
+ Set sessionid.
+
+comment "BusyBox' setsid is selected!"
+ depends on BUSYBOX_SETSID
+
config UTIL_LINUX_SWITCH_ROOT
bool
depends on !BUSYBOX_SWITCH_ROOT
diff --git a/rules/util-linux.make b/rules/util-linux.make
index b185c1ee5..2a2215570 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.39.2
-UTIL_LINUX_MD5 := 2feb3e7c306f336a3d22a182dfffc942
+UTIL_LINUX_VERSION := 2.39.3
+UTIL_LINUX_MD5 := f3591e6970c017bb4bcd24ae762a98f5
UTIL_LINUX := util-linux-$(UTIL_LINUX_VERSION)
UTIL_LINUX_SUFFIX := tar.xz
UTIL_LINUX_BASENAME := v$(if $(filter 2,$(basename $(UTIL_LINUX_VERSION))),$(UTIL_LINUX_VERSION),$(basename $(UTIL_LINUX_VERSION)))
@@ -170,6 +170,7 @@ UTIL_LINUX_LIB-$(PTXCONF_UTIL_LINUX_LIBFDISK) += fdisk
UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_ADDPART) += sbin/addpart
UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_CFDISK) += sbin/cfdisk
UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_DELPART) += sbin/delpart
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_RESIZEPART) += sbin/resizepart
UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_FDISK) += sbin/fdisk
UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_FSCK) += sbin/fsck
UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_MKFS) += sbin/mkfs
@@ -217,6 +218,7 @@ UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_READPROFILE) += sbin/readprofile
UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_RFKILL) += sbin/rfkill
UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_SWAPON) += sbin/swapoff sbin/swapon
UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_PIPESZ) += bin/pipesz
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_SETSID) += bin/setsid
UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_SWITCH_ROOT) += sbin/switch_root
UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_UMOUNT) += bin/umount
UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_WDCTL) += bin/wdctl
--
2.34.1
next reply other threads:[~2023-12-06 19:51 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-06 19:50 Christian Melki [this message]
2023-12-13 7:47 ` [ptxdist] [APPLIED] " Michael Olbrich
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=20231206195045.2108305-1-christian.melki@t2data.com \
--to=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