mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH] util-linux-ng: Rename to util-linux
@ 2022-09-25  8:10 Ladislav Michl
  2022-09-29 14:01 ` Michael Olbrich
  0 siblings, 1 reply; 2+ messages in thread
From: Ladislav Michl @ 2022-09-25  8:10 UTC (permalink / raw)
  To: ptxdist

From: Ladislav Michl <ladis@linux-mips.org>

The util-linux-ng project has been renamed back to util-linux as
per maintainer's annoucement dated 1 Dec 2010:
https://lkml.org/lkml/2010/12/1/464

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
 This one applies on top of previous two patches. Now sure
 if it is worth renaming, so consider it as an RFC :)

 rules/ecryptfs-utils.in                       |   2 +-
 rules/glib.in                                 |   4 +-
 rules/host-e2fsprogs.in                       |   2 +-
 rules/host-libblkid.in                        |   6 +-
 rules/host-libuuid.in                         |   6 +-
 rules/host-systemd.in                         |   2 +-
 rules/host-util-linux-ng.in                   |   7 -
 rules/host-util-linux.in                      |   7 +
 ...til-linux-ng.make => host-util-linux.make} |   8 +-
 rules/libblkid.in                             |   8 +-
 rules/libuuid.in                              |   8 +-
 rules/machine-id.in                           |   4 +-
 rules/nfsutils.in                             |   4 +-
 rules/owfs.in                                 |   6 +-
 rules/rauc.in                                 |   2 +-
 rules/systemd.in                              |   6 +-
 rules/util-linux-ng.make                      | 273 ------------------
 rules/{util-linux-ng.in => util-linux.in}     | 216 +++++++-------
 rules/util-linux.make                         | 273 ++++++++++++++++++
 rules/xorg-app-xinit.in                       |   4 +-
 scripts/migrate/migrate_ptx                   |   7 +
 21 files changed, 431 insertions(+), 424 deletions(-)
 delete mode 100644 rules/host-util-linux-ng.in
 create mode 100644 rules/host-util-linux.in
 rename rules/{host-util-linux-ng.make => host-util-linux.make} (88%)
 delete mode 100644 rules/util-linux-ng.make
 rename rules/{util-linux-ng.in => util-linux.in} (74%)
 create mode 100644 rules/util-linux.make

diff --git a/rules/ecryptfs-utils.in b/rules/ecryptfs-utils.in
index 60025ae27..ee7e131ad 100644
--- a/rules/ecryptfs-utils.in
+++ b/rules/ecryptfs-utils.in
@@ -15,7 +15,7 @@ menuconfig ECRYPTFS_UTILS
 	select COREUTILS_STAT		if ECRYPTFS_UTILS_TESTS
 	select COREUTILS_TR		if ECRYPTFS_UTILS_TESTS
 	select COREUTILS_TRUNCATE	if ECRYPTFS_UTILS_TESTS
-	select UTIL_LINUX_NG_MKFS	if ECRYPTFS_UTILS_TESTS
+	select UTIL_LINUX_MKFS		if ECRYPTFS_UTILS_TESTS
 	help
 	  eCryptfs is a POSIX-compliant enterprise-class stacked
 	  cryptographic filesystem for Linux.
diff --git a/rules/glib.in b/rules/glib.in
index d4215a0df..140bf0131 100644
--- a/rules/glib.in
+++ b/rules/glib.in
@@ -10,8 +10,8 @@ menuconfig GLIB
 	select LIBFFI
 	select LIBPCRE
 	select LIBPCRE_ENABLE_UTF8
-	select UTIL_LINUX_NG		if GLIB_LIBMOUNT
-	select UTIL_LINUX_NG_LIBMOUNT	if GLIB_LIBMOUNT
+	select UTIL_LINUX		if GLIB_LIBMOUNT
+	select UTIL_LINUX_LIBMOUNT	if GLIB_LIBMOUNT
 	select ZLIB
 	help
 	  GLib is a library containing many useful C routines for things
diff --git a/rules/host-e2fsprogs.in b/rules/host-e2fsprogs.in
index 122b0ba31..e203b2d7a 100644
--- a/rules/host-e2fsprogs.in
+++ b/rules/host-e2fsprogs.in
@@ -2,7 +2,7 @@
 
 config HOST_E2FSPROGS
 	tristate
-	select HOST_UTIL_LINUX_NG
+	select HOST_UTIL_LINUX
 	default y if ALLYES
 	help
 	  Useful hosttools for management of ext2 and ext3 filesystems
diff --git a/rules/host-libblkid.in b/rules/host-libblkid.in
index 3b56df248..6a56299ef 100644
--- a/rules/host-libblkid.in
+++ b/rules/host-libblkid.in
@@ -3,12 +3,12 @@
 config HOST_LIBBLKID
 	tristate
 	select VIRTUAL
-	select HOST_UTIL_LINUX_NG
+	select HOST_UTIL_LINUX
 	default y if ALLYES
 	help
 	  Helper to select the host packet containing a recent libblkid.so
 	  library and its header.
 
 	  The following packages provide libblkid:
-	  - e2fsprogs      (older version)
-	  - utils-linux-ng (more recent version)
+	  - e2fsprogs   (older version)
+	  - utils-linux (more recent version)
diff --git a/rules/host-libuuid.in b/rules/host-libuuid.in
index e1dc15120..e4509c44b 100644
--- a/rules/host-libuuid.in
+++ b/rules/host-libuuid.in
@@ -3,12 +3,12 @@
 config HOST_LIBUUID
 	tristate
 	select VIRTUAL
-	select HOST_UTIL_LINUX_NG
+	select HOST_UTIL_LINUX
 	default y if ALLYES
 	help
 	  Helper to select the host packet containing a recent libuuid.so
 	  library and its header.
 
 	  The following packages provide libuuid:
-	  - e2fsprogs      (older version)
-	  - utils-linux-ng (more recent version)
+	  - e2fsprogs   (older version)
+	  - utils-linux (more recent version)
diff --git a/rules/host-systemd.in b/rules/host-systemd.in
index 7e14ac8bf..d5c0ed0b5 100644
--- a/rules/host-systemd.in
+++ b/rules/host-systemd.in
@@ -7,5 +7,5 @@ config HOST_SYSTEMD
 	select HOST_SYSTEM_PYTHON3_JINJA2
 	select HOST_MESON
 	select HOST_GPERF
-	select HOST_UTIL_LINUX_NG
+	select HOST_UTIL_LINUX
 	select HOST_LIBCAP
diff --git a/rules/host-util-linux-ng.in b/rules/host-util-linux-ng.in
deleted file mode 100644
index 853a86878..000000000
--- a/rules/host-util-linux-ng.in
+++ /dev/null
@@ -1,7 +0,0 @@
-## SECTION=hosttools_noprompt
-
-config HOST_UTIL_LINUX_NG
-	tristate
-	default y if ALLYES
-	help
-	  Useful hosttools and libs for linux ng utils.
diff --git a/rules/host-util-linux.in b/rules/host-util-linux.in
new file mode 100644
index 000000000..52bd59722
--- /dev/null
+++ b/rules/host-util-linux.in
@@ -0,0 +1,7 @@
+## SECTION=hosttools_noprompt
+
+config HOST_UTIL_LINUX
+	tristate
+	default y if ALLYES
+	help
+	  Useful hosttools and libs for linux utils.
diff --git a/rules/host-util-linux-ng.make b/rules/host-util-linux.make
similarity index 88%
rename from rules/host-util-linux-ng.make
rename to rules/host-util-linux.make
index 3e02b22e0..c4a206868 100644
--- a/rules/host-util-linux-ng.make
+++ b/rules/host-util-linux.make
@@ -9,12 +9,12 @@
 #
 # We provide this package
 #
-HOST_PACKAGES-$(PTXCONF_HOST_UTIL_LINUX_NG) += host-util-linux-ng
+HOST_PACKAGES-$(PTXCONF_HOST_UTIL_LINUX) += host-util-linux
 
 #
 # Paths and names
 #
-HOST_UTIL_LINUX_NG_DIR	= $(HOST_BUILDDIR)/$(UTIL_LINUX_NG)
+HOST_UTIL_LINUX_DIR	= $(HOST_BUILDDIR)/$(UTIL_LINUX)
 
 # ----------------------------------------------------------------------------
 # Prepare
@@ -24,8 +24,8 @@ HOST_UTIL_LINUX_NG_DIR	= $(HOST_BUILDDIR)/$(UTIL_LINUX_NG)
 # autoconf
 #
 
-HOST_UTIL_LINUX_NG_CONF_TOOL	:= autoconf
-HOST_UTIL_LINUX_NG_CONF_OPT	:= \
+HOST_UTIL_LINUX_CONF_TOOL	:= autoconf
+HOST_UTIL_LINUX_CONF_OPT	:= \
 	$(HOST_AUTOCONF) \
 	--disable-werror \
 	--disable-asan \
diff --git a/rules/libblkid.in b/rules/libblkid.in
index d6556feb0..38ebb2764 100644
--- a/rules/libblkid.in
+++ b/rules/libblkid.in
@@ -3,12 +3,12 @@
 config LIBBLKID
 	tristate
 	select VIRTUAL
-	select UTIL_LINUX_NG
-	select UTIL_LINUX_NG_LIBBLKID
+	select UTIL_LINUX
+	select UTIL_LINUX_LIBBLKID
 	help
 	  Helper to select the target packet containing a recent libblkid.so
 	  library and its header.
 
 	  The following packages provide libblkid:
-	  - e2fsprogs      (older version)
-	  - utils-linux-ng (more recent version)
+	  - e2fsprogs   (older version)
+	  - utils-linux (more recent version)
diff --git a/rules/libuuid.in b/rules/libuuid.in
index 743d5f5df..88b175520 100644
--- a/rules/libuuid.in
+++ b/rules/libuuid.in
@@ -3,12 +3,12 @@
 config LIBUUID
 	tristate
 	select VIRTUAL
-	select UTIL_LINUX_NG
-	select UTIL_LINUX_NG_LIBUUID
+	select UTIL_LINUX
+	select UTIL_LINUX_LIBUUID
 	help
 	  Helper to select the target packet containing a recent libuuid.so
 	  library and its header.
 
 	  The following packages provide libuuid:
-	  - e2fsprogs      (older version)
-	  - utils-linux-ng (more recent version)
+	  - e2fsprogs   (older version)
+	  - utils-linux (more recent version)
diff --git a/rules/machine-id.in b/rules/machine-id.in
index 4c6aa6902..8db7cd381 100644
--- a/rules/machine-id.in
+++ b/rules/machine-id.in
@@ -4,8 +4,8 @@ menuconfig MACHINE_ID
 	tristate
 	prompt "create /etc/machine-id      "
 	select RC_ONCE			if MACHINE_ID_RC_ONCE && RUNTIME
-	select UTIL_LINUX_NG		if MACHINE_ID_RC_ONCE && !INITMETHOD_SYSTEMD
-	select UTIL_LINUX_NG_UUIDGEN	if MACHINE_ID_RC_ONCE && !INITMETHOD_SYSTEMD
+	select UTIL_LINUX		if MACHINE_ID_RC_ONCE && !INITMETHOD_SYSTEMD
+	select UTIL_LINUX_UUIDGEN	if MACHINE_ID_RC_ONCE && !INITMETHOD_SYSTEMD
 	help
 	  Enable this to make sure there is always a unique /etc/machine-id
 	  available in the system.
diff --git a/rules/nfsutils.in b/rules/nfsutils.in
index 95f123954..f37f22506 100644
--- a/rules/nfsutils.in
+++ b/rules/nfsutils.in
@@ -6,8 +6,8 @@ menuconfig NFSUTILS
 	select GCCLIBS_GCC_S
 	select LIBBLKID
 	select LIBTIRPC
-	select UTIL_LINUX_NG
-	select UTIL_LINUX_NG_LIBMOUNT
+	select UTIL_LINUX
+	select UTIL_LINUX_LIBMOUNT
 	select RPCBIND			if RUNTIME
 	select ROOTFS_PROTOCOLS		if NFSUTILS_CLIENT
 	select PYTHON3			if NFSUTILS_PYTHON && RUNTIME
diff --git a/rules/owfs.in b/rules/owfs.in
index d08bf9a11..59ea7fbca 100644
--- a/rules/owfs.in
+++ b/rules/owfs.in
@@ -16,9 +16,9 @@ menuconfig OWFS
 	select FUSE_LIB			if OWFS_OWFS
 	depends on !BUSYBOX_MOUNT || ALLYES
 	depends on !BUSYBOX_UMOUNT || ALLYES
-	select UTIL_LINUX_NG		if OWFS_OWFS
-	select UTIL_LINUX_NG_MOUNT	if OWFS_OWFS
-	select UTIL_LINUX_NG_UMOUNT	if OWFS_OWFS
+	select UTIL_LINUX		if OWFS_OWFS
+	select UTIL_LINUX_MOUNT		if OWFS_OWFS
+	select UTIL_LINUX_UMOUNT	if OWFS_OWFS
 	help
 	  OWFS is the 1-Wire file system. It is used by Dallas 1-Wire and iButton
 	  chips with standard linux commands. Create temperature loggers. Monitor
diff --git a/rules/rauc.in b/rules/rauc.in
index fa24fa61d..db3a87485 100644
--- a/rules/rauc.in
+++ b/rules/rauc.in
@@ -15,7 +15,7 @@ menuconfig RAUC
 	select LIBCURL				if RAUC_NETWORK
 	select LIBNL3				if RAUC_STREAMING
 	select JSON_GLIB			if RAUC_JSON
-	select UTIL_LINUX_NG_LIBFDISK		if RAUC_GPT
+	select UTIL_LINUX_LIBFDISK		if RAUC_GPT
 	select SQUASHFS_TOOLS			if RUNTIME
 	select SQUASHFS_TOOLS_UNSQUASHFS	if RUNTIME
 	select DT_UTILS				if RUNTIME && RAUC_BAREBOX
diff --git a/rules/systemd.in b/rules/systemd.in
index 40a80b793..ba8301443 100644
--- a/rules/systemd.in
+++ b/rules/systemd.in
@@ -17,9 +17,9 @@ menuconfig SYSTEMD
 	select LIBCAP
 	select LIBKMOD
 	select LIBKMOD_TOOLS
-	select UTIL_LINUX_NG
-	select UTIL_LINUX_NG_LIBMOUNT
-	select UTIL_LINUX_NG_LIBFDISK	if SYSTEMD_REPART
+	select UTIL_LINUX
+	select UTIL_LINUX_LIBMOUNT
+	select UTIL_LINUX_LIBFDISK	if SYSTEMD_REPART
 	select MACHINE_ID	if RUNTIME
 	select XZ		if SYSTEMD_XZ
 	select LZ4		if SYSTEMD_LZ4
diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make
deleted file mode 100644
index f5e57a56f..000000000
--- a/rules/util-linux-ng.make
+++ /dev/null
@@ -1,273 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2008 by Robert Schwebel
-#               2010 by Marc Kleine-Budde <mkl@penutronix.de>
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_UTIL_LINUX_NG) += util-linux-ng
-
-#
-# Paths and names
-#
-UTIL_LINUX_NG_VERSION	:= 2.38.1
-UTIL_LINUX_NG_MD5	:= cd11456f4ddd31f7fbfdd9488c0c0d02
-UTIL_LINUX_NG		:= util-linux-$(UTIL_LINUX_NG_VERSION)
-UTIL_LINUX_NG_SUFFIX	:= tar.xz
-UTIL_LINUX_NG_BASENAME	:= v$(if $(filter 2,$(basename $(UTIL_LINUX_NG_VERSION))),$(UTIL_LINUX_NG_VERSION),$(basename $(UTIL_LINUX_NG_VERSION)))
-UTIL_LINUX_NG_URL	:= $(call ptx/mirror, KERNEL, utils/util-linux/$(UTIL_LINUX_NG_BASENAME)/$(UTIL_LINUX_NG).$(UTIL_LINUX_NG_SUFFIX))
-UTIL_LINUX_NG_SOURCE	:= $(SRCDIR)/$(UTIL_LINUX_NG).$(UTIL_LINUX_NG_SUFFIX)
-UTIL_LINUX_NG_DIR	:= $(BUILDDIR)/$(UTIL_LINUX_NG)
-UTIL_LINUX_NG_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_NG_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
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-UTIL_LINUX_NG_CONF_ENV	:= \
-	$(CROSS_ENV) \
-	$(call ptx/ncurses, PTXCONF_UTIL_LINUX_NG_USES_NCURSES) \
-	scanf_cv_type_modifier=as \
-	ac_cv_path_BLKID=no \
-	ac_cv_path_PERL=no \
-	ac_cv_path_VOLID=no
-
-#
-# autoconf
-#
-UTIL_LINUX_NG_CONF_TOOL	:= autoconf
-UTIL_LINUX_NG_CONF_OPT	:= \
-	$(CROSS_AUTOCONF_USR) \
-	--bindir=/usr/bin \
-	--sbindir=/usr/sbin \
-	--disable-werror \
-	--disable-asan \
-	--disable-ubsan \
-	--disable-fuzzing-engine \
-	--enable-shared \
-	--disable-static \
-	--enable-symvers \
-	--disable-gtk-doc \
-	$(GLOBAL_LARGE_FILE_OPTION) \
-	--enable-assert \
-	--disable-nls \
-	--disable-rpath \
-	--disable-static-programs \
-	--enable-all-programs=undefined \
-	--disable-asciidoc \
-	--disable-poman \
-	--enable-tls \
-	--disable-widechar \
-	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LIBUUID)-libuuid \
-	--disable-libuuid-force-uuidd \
-	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LIBBLKID)-libblkid \
-	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LIBMOUNT)-libmount \
-	--disable-libmount-support-mtab \
-	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LIBSMARTCOLS)-libsmartcols \
-	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LIBFDISK)-libfdisk \
-	$(call ptx/ifdef, PTXCONF_UTIL_LINUX_NG_FDISKS,,--disable-fdisks) \
-	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_MOUNT)-mount \
-	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LOSETUP)-losetup \
-	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_ZRAMCTL)-zramctl \
-	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_FSCK)-fsck \
-	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_PARTX_TOOLS)-partx \
-	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_UUIDD)-uuidd \
-	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_UUIDGEN)-uuidgen \
-	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_BLKID)-blkid \
-	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_WIPEFS)-wipefs \
-	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_MOUNTPOINT)-mountpoint \
-	--disable-fallocate \
-	--disable-unshare \
-	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_NSENTER)-nsenter \
-	--disable-setpriv \
-	--disable-hardlink \
-	--disable-eject \
-	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_AGETTY)-agetty \
-	--disable-plymouth_support \
-	--disable-cramfs \
-	--disable-bfs \
-	--disable-minix \
-	--disable-fdformat \
-	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_HWCLOCK)-hwclock \
-	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_MKFS)-mkfs \
-	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_FSTRIM)-fstrim \
-	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_SWAPON)-swapon \
-	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LSCPU)-lscpu \
-	--disable-lslogins \
-	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_WDCTL)-wdctl \
-	--disable-cal \
-	--disable-logger \
-	--disable-whereis \
-	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_SWITCH_ROOT)-switch_root \
-	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_PIVOT_ROOT)-pivot_root \
-	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LSMEM)-lsmem \
-	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_CHMEM)-chmem \
-	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_IPCRM)-ipcrm \
-	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_IPCS)-ipcs \
-	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_IRQTOP)-irqtop \
-	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LSIRQ)-lsirq \
-	--disable-rfkill \
-	--disable-scriptutils \
-	--disable-tunelp \
-	--disable-kill \
-	--disable-last \
-	--disable-utmpdump \
-	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LINE)-line \
-	--disable-mesg \
-	--disable-raw \
-	--disable-rename \
-	--disable-vipw \
-	--disable-newgrp \
-	--disable-chfn-chsh-password \
-	--disable-chfn-chsh \
-	--disable-chsh-only-listed \
-	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LOGIN)-login \
-	--disable-login-chown-vcs \
-	--disable-login-stat-mail \
-	--disable-nologin \
-	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_SULOGIN)-sulogin \
-	--disable-su \
-	--disable-runuser \
-	--disable-ul \
-	--disable-more \
-	--disable-pg \
-	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_SETTERM)-setterm \
-	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_SCHEDUTILS)-schedutils \
-	--disable-wall \
-	--disable-write \
-	--disable-bash-completion \
-	--disable-pylibmount \
-	--disable-pg-bell \
-	--disable-use-tty-group \
-	--disable-sulogin-emergency-mount \
-	--disable-usrdir-path \
-	--disable-makeinstall-chown \
-	--disable-makeinstall-setuid \
-	--disable-colors-default \
-	--without-libiconv-prefix \
-	--without-libintl-prefix \
-	--with-util \
-	--without-selinux \
-	--without-audit \
-	--without-udev \
-	--without-ncursesw \
-	--$(call ptx/wwo, PTXCONF_UTIL_LINUX_NG_USES_NCURSES)-ncurses \
-	--without-slang \
-	--without-tinfo \
-	--without-readline \
-	--without-utempter \
-	--without-cap-ng \
-	--without-libz \
-	--without-libmagic \
-	--without-user \
-	--without-btrfs \
-	--without-systemd \
-	--with-systemdsystemunitdir=/usr/lib/systemd/system \
-	--without-smack \
-	--without-econf \
-	--without-python \
-	--without-cryptsetup
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-UTIL_LINUX_LIB-y :=
-UTIL_LINUX_BIN-y :=
-
-# libraries
-UTIL_LINUX_LIB-$(PTXCONF_UTIL_LINUX_NG_LIBBLKID)	+= blkid
-UTIL_LINUX_LIB-$(PTXCONF_UTIL_LINUX_NG_LIBUUID)		+= uuid
-UTIL_LINUX_LIB-$(PTXCONF_UTIL_LINUX_NG_LIBMOUNT)	+= mount
-UTIL_LINUX_LIB-$(PTXCONF_UTIL_LINUX_NG_LIBSMARTCOLS)	+= smartcols
-UTIL_LINUX_LIB-$(PTXCONF_UTIL_LINUX_NG_LIBFDISK)	+= fdisk
-
-# disk-utils
-UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_ADDPART)		+= sbin/addpart
-UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_CFDISK)		+= sbin/cfdisk
-UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_DELPART)		+= sbin/delpart
-UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_FDISK)		+= sbin/fdisk
-UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_FSCK)		+= sbin/fsck
-UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_MKFS)		+= sbin/mkfs
-UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_MKSWAP)		+= sbin/mkswap
-UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_PARTX)		+= sbin/partx
-UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_SFDISK)		+= sbin/sfdisk
-# login-utils
-UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_LOGIN)		+= bin/login
-UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_SULOGIN)		+= sbin/sulogin
-# misc-utils
-UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_BLKID)		+= sbin/blkid
-UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_FINDFS)		+= sbin/findfs
-UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_GETOPT)		+= bin/getopt
-UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_LSBLK)		+= bin/lsblk
-UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_MCOOKIE)		+= bin/mcookie
-UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_UUIDD)		+= sbin/uuidd
-UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_UUIDGEN)		+= bin/uuidgen
-UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_WIPEFS)		+= sbin/wipefs
-# schedutils
-UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_CHRT)		+= bin/chrt
-UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_IONICE)		+= bin/ionice
-UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_TASKSET)		+= bin/taskset
-# sys-utils
-UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_CHMEM)		+= bin/chmem
-UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_DMESG)		+= bin/dmesg
-UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_FLOCK)		+= bin/flock
-UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_FSFREEZE)	+= sbin/fsfreeze
-UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_FSTRIM)		+= sbin/fstrim
-UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_HWCLOCK)		+= sbin/hwclock
-UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_IPCRM)		+= bin/ipcrm
-UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_IPCS)		+= bin/ipcs
-UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_IRQTOP)		+= bin/irqtop
-UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_LDATTACH)	+= sbin/ldattach
-UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_LOSETUP)		+= sbin/losetup
-UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_LSCPU)		+= bin/lscpu
-UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_LSIRQ)		+= bin/lsirq
-UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_LSMEM)		+= bin/lsmem
-UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_MOUNT)		+= bin/mount
-UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_MOUNTPOINT)	+= bin/mountpoint
-UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_NSENTER)		+= bin/nsenter
-UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_PIVOT_ROOT)	+= sbin/pivot_root
-UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_READPROFILE)	+= sbin/readprofile
-UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_SWAPON)		+= sbin/swapoff sbin/swapon
-UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_SWITCH_ROOT)	+= sbin/switch_root
-UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_UMOUNT)		+= bin/umount
-UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_WDCTL)		+= bin/wdctl
-UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_ZRAMCTL)		+= sbin/zramctl
-# term-utils
-UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_AGETTY)		+= sbin/agetty
-UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_SETTERM)		+= bin/setterm
-# text-utils
-UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_COLUMN)		+= bin/column
-UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_LINE)		+= bin/line
-
-$(STATEDIR)/util-linux-ng.targetinstall:
-	@$(call targetinfo)
-
-	@$(call install_init, util-linux-ng)
-	@$(call install_fixup, util-linux-ng,PRIORITY,optional)
-	@$(call install_fixup, util-linux-ng,SECTION,base)
-	@$(call install_fixup, util-linux-ng,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
-	@$(call install_fixup, util-linux-ng,DESCRIPTION,missing)
-
-	@$(foreach lib, $(UTIL_LINUX_LIB-y), \
-		$(call install_lib, util-linux-ng, 0, 0, 0644, lib$(lib));)
-
-	@$(foreach tool, $(UTIL_LINUX_BIN-y), \
-		$(call install_copy, util-linux-ng, 0, 0, 0755, -, \
-		/usr/$(tool));)
-
-	@$(call install_finish, util-linux-ng)
-
-	@$(call touch)
-
-# vim: syntax=make
diff --git a/rules/util-linux-ng.in b/rules/util-linux.in
similarity index 74%
rename from rules/util-linux-ng.in
rename to rules/util-linux.in
index 772d913ff..429473404 100644
--- a/rules/util-linux-ng.in
+++ b/rules/util-linux.in
@@ -1,81 +1,81 @@
 ## SECTION=shell_and_console
-menuconfig UTIL_LINUX_NG
+menuconfig UTIL_LINUX
 
 	tristate
 	prompt "util-linux                    "
 	select GCCLIBS_GCC_S
-	select UTIL_LINUX_NG_LIBBLKID
-	select UTIL_LINUX_NG_LIBUUID		if UTIL_LINUX_NG_MKSWAP_UUID
-	select NCURSES				if UTIL_LINUX_NG_USES_NCURSES
-	select PAM				if UTIL_LINUX_NG_USES_PAM
+	select UTIL_LINUX_LIBBLKID
+	select UTIL_LINUX_LIBUUID		if UTIL_LINUX_MKSWAP_UUID
+	select NCURSES				if UTIL_LINUX_USES_NCURSES
+	select PAM				if UTIL_LINUX_USES_PAM
 
-if UTIL_LINUX_NG
+if UTIL_LINUX
 
-config UTIL_LINUX_NG_LIBBLKID
+config UTIL_LINUX_LIBBLKID
 	bool
 
-config UTIL_LINUX_NG_LIBUUID
+config UTIL_LINUX_LIBUUID
 	bool
 
-config UTIL_LINUX_NG_LIBMOUNT
+config UTIL_LINUX_LIBMOUNT
 	bool
 
-config UTIL_LINUX_NG_LIBSMARTCOLS
+config UTIL_LINUX_LIBSMARTCOLS
 	bool
 
-config UTIL_LINUX_NG_LIBFDISK
-	select UTIL_LINUX_NG_LIBUUID
+config UTIL_LINUX_LIBFDISK
+	select UTIL_LINUX_LIBUUID
 	bool
 
-config UTIL_LINUX_NG_FDISKS
+config UTIL_LINUX_FDISKS
 	bool
 
-config UTIL_LINUX_NG_USES_NCURSES
+config UTIL_LINUX_USES_NCURSES
 	bool
 
-config UTIL_LINUX_NG_USES_PAM
+config UTIL_LINUX_USES_PAM
 	bool
 
-config UTIL_LINUX_NG_PARTX_TOOLS
-	select UTIL_LINUX_NG_LIBBLKID
-	select UTIL_LINUX_NG_LIBSMARTCOLS
+config UTIL_LINUX_PARTX_TOOLS
+	select UTIL_LINUX_LIBBLKID
+	select UTIL_LINUX_LIBSMARTCOLS
 	bool
 
-config UTIL_LINUX_NG_SCHEDUTILS
+config UTIL_LINUX_SCHEDUTILS
 	bool
 
 comment "disk-utils"
 
-config UTIL_LINUX_NG_ADDPART
+config UTIL_LINUX_ADDPART
 	bool
-	select UTIL_LINUX_NG_PARTX_TOOLS
+	select UTIL_LINUX_PARTX_TOOLS
 	prompt "addpart"
 	help
 	  The addpart utility.
 
-config UTIL_LINUX_NG_CFDISK
+config UTIL_LINUX_CFDISK
 	bool
-	select UTIL_LINUX_NG_LIBFDISK
-	select UTIL_LINUX_NG_LIBSMARTCOLS
-	select UTIL_LINUX_NG_FDISKS
-	select UTIL_LINUX_NG_USES_NCURSES
+	select UTIL_LINUX_LIBFDISK
+	select UTIL_LINUX_LIBSMARTCOLS
+	select UTIL_LINUX_FDISKS
+	select UTIL_LINUX_USES_NCURSES
 	prompt "cfdisk"
 	help
 	  cfdisk is a curses based program for partitioning any hard disk drive.
 
-config UTIL_LINUX_NG_DELPART
+config UTIL_LINUX_DELPART
 	bool
-	select UTIL_LINUX_NG_PARTX_TOOLS
+	select UTIL_LINUX_PARTX_TOOLS
 	prompt "delpart"
 	help
 	  The delpart utility.
 
-config UTIL_LINUX_NG_FDISK
+config UTIL_LINUX_FDISK
 	bool
 	prompt "fdisk"
-	select UTIL_LINUX_NG_LIBFDISK
-	select UTIL_LINUX_NG_LIBSMARTCOLS
-	select UTIL_LINUX_NG_FDISKS
+	select UTIL_LINUX_LIBFDISK
+	select UTIL_LINUX_LIBSMARTCOLS
+	select UTIL_LINUX_FDISKS
 	depends on !BUSYBOX_FDISK || ALLYES
 	help
 	  fdisk - Partition table manipulator for Linux
@@ -83,10 +83,10 @@ config UTIL_LINUX_NG_FDISK
 comment "BusyBox' fdisk is selected!"
 	depends on BUSYBOX_FDISK
 
-config UTIL_LINUX_NG_FSCK
+config UTIL_LINUX_FSCK
 	bool
 	prompt "fsck"
-	select UTIL_LINUX_NG_LIBMOUNT
+	select UTIL_LINUX_LIBMOUNT
 	depends on !BUSYBOX_FSCK || ALLYES
 	help
 	  fsck  is  used  to  check and optionally repair one or
@@ -97,52 +97,52 @@ config UTIL_LINUX_NG_FSCK
 comment "BusyBox' fsck is selected!"
 	depends on BUSYBOX_FSCK
 
-config UTIL_LINUX_NG_MKFS
+config UTIL_LINUX_MKFS
 	bool
 	prompt "mkfs"
 	help
 	  The mkfs command is a generic wrapper for fs specific
 	  mkfs.* commands.
 
-config UTIL_LINUX_NG_MKSWAP
+config UTIL_LINUX_MKSWAP
 	bool
 	prompt "mkswap"
 	depends on !BUSYBOX_MKSWAP || ALLYES
 	help
 	  mkswap sets up a Linux swap area on a device or in a file.
 
-config UTIL_LINUX_NG_MKSWAP_UUID
+config UTIL_LINUX_MKSWAP_UUID
 	bool
 	prompt "enable uuid support for mkswap"
-	depends on UTIL_LINUX_NG_MKSWAP
+	depends on UTIL_LINUX_MKSWAP
 	help
 	  enable uuid support for mkswap
 
 comment "BusyBox' mkswap is selected!"
 	depends on BUSYBOX_MKSWAP
 
-config UTIL_LINUX_NG_PARTX
+config UTIL_LINUX_PARTX
 	bool
-	select UTIL_LINUX_NG_PARTX_TOOLS
+	select UTIL_LINUX_PARTX_TOOLS
 	prompt "partx"
 	help
 	  The partx utility.
 
-config UTIL_LINUX_NG_SFDISK
+config UTIL_LINUX_SFDISK
 	bool
 	prompt "sfdisk"
-	select UTIL_LINUX_NG_LIBFDISK
-	select UTIL_LINUX_NG_LIBSMARTCOLS
-	select UTIL_LINUX_NG_FDISKS
+	select UTIL_LINUX_LIBFDISK
+	select UTIL_LINUX_LIBSMARTCOLS
+	select UTIL_LINUX_FDISKS
 	help
 	  sfdisk - Partition table manipulator for Linux,
 	  scriptable for unattended partitioning
 
 comment "login-utils"
 
-config UTIL_LINUX_NG_LOGIN
+config UTIL_LINUX_LOGIN
 	bool
-	select UTIL_LINUX_NG_USES_PAM
+	select UTIL_LINUX_USES_PAM
 	depends on GLOBAL_PAM && ((!BUSYBOX_LOGIN && !SHADOW) || ALLYES)
 	prompt "login"
 	help
@@ -155,7 +155,7 @@ comment "BusyBox' login is selected!"
 comment "Shadow package is selected!"
 	depends on SHADOW
 
-config UTIL_LINUX_NG_SULOGIN
+config UTIL_LINUX_SULOGIN
 	bool
 	depends on !BUSYBOX_SULOGIN || ALLYES
 	prompt "sulogin"
@@ -168,9 +168,9 @@ comment "BusyBox' sulogin is selected!"
 
 comment "misc-utils"
 
-config UTIL_LINUX_NG_BLKID
+config UTIL_LINUX_BLKID
 	bool
-	select UTIL_LINUX_NG_LIBBLKID
+	select UTIL_LINUX_LIBBLKID
 	depends on !BUSYBOX_BLKID || ALLYES
 	prompt "blkid"
 	help
@@ -182,9 +182,9 @@ config UTIL_LINUX_NG_BLKID
 comment "BusyBox' blkid is selected!"
 	depends on BUSYBOX_BLKID
 
-config UTIL_LINUX_NG_FINDFS
+config UTIL_LINUX_FINDFS
 	bool
-	select UTIL_LINUX_NG_LIBBLKID
+	select UTIL_LINUX_LIBBLKID
 	depends on !BUSYBOX_FINDFS || ALLYES
 	prompt "findfs"
 	help
@@ -194,7 +194,7 @@ config UTIL_LINUX_NG_FINDFS
 comment "BusyBox' findfs is selected!"
 	depends on BUSYBOX_FINDFS
 
-config UTIL_LINUX_NG_GETOPT
+config UTIL_LINUX_GETOPT
 	bool
 	prompt "getopt"
 	depends on !BUSYBOX_GETOPT || ALLYES
@@ -206,26 +206,26 @@ config UTIL_LINUX_NG_GETOPT
 comment "BusyBox' getopt is selected!"
 	depends on BUSYBOX_GETOPT
 
-config UTIL_LINUX_NG_LSBLK
+config UTIL_LINUX_LSBLK
 	bool
-	select UTIL_LINUX_NG_LIBBLKID
-	select UTIL_LINUX_NG_LIBMOUNT
-	select UTIL_LINUX_NG_LIBSMARTCOLS
+	select UTIL_LINUX_LIBBLKID
+	select UTIL_LINUX_LIBMOUNT
+	select UTIL_LINUX_LIBSMARTCOLS
 	prompt "lsblk"
 	help
 	  The lsblk command lists information about all available or the
 	  specified block devices.
 
-config UTIL_LINUX_NG_MCOOKIE
+config UTIL_LINUX_MCOOKIE
 	bool
 	prompt "mcookie"
 	help
 	  mcookie generates a 128-bit random hexadecimal number for
 	  use with the X authority system.
 
-config UTIL_LINUX_NG_UUIDD
+config UTIL_LINUX_UUIDD
 	bool
-	select UTIL_LINUX_NG_LIBUUID
+	select UTIL_LINUX_LIBUUID
 	prompt "uuidd"
 	help
 	  The  uuidd  daemon  is  used by the UUID library to generate
@@ -233,16 +233,16 @@ config UTIL_LINUX_NG_UUIDD
 	  in a secure and guaranteed- unique fashion, even in the face of large
 	  numbers of threads running on different CPUs trying to grab UUIDs.
 
-config UTIL_LINUX_NG_UUIDGEN
+config UTIL_LINUX_UUIDGEN
 	bool
-	select UTIL_LINUX_NG_LIBUUID
+	select UTIL_LINUX_LIBUUID
 	prompt "uuidgen"
 	help
 	  uuidgen is a command-line utility to create a new UUID value.
 
-config UTIL_LINUX_NG_WIPEFS
+config UTIL_LINUX_WIPEFS
 	bool
-	select UTIL_LINUX_NG_LIBBLKID
+	select UTIL_LINUX_LIBBLKID
 	prompt "wipefs"
 	help
 	  The wipefs program can erase filesystem, raid or partition-table
@@ -250,10 +250,10 @@ config UTIL_LINUX_NG_WIPEFS
 
 comment "schedutils"
 
-config UTIL_LINUX_NG_CHRT
+config UTIL_LINUX_CHRT
 	bool
 	prompt "chrt"
-	select UTIL_LINUX_NG_SCHEDUTILS
+	select UTIL_LINUX_SCHEDUTILS
 	depends on !BUSYBOX_CHRT || ALLYES
 	help
 	  chrt manipulates the real-time attributes of a process.
@@ -261,17 +261,17 @@ config UTIL_LINUX_NG_CHRT
 comment "BusyBox' chrt is selected!"
 	depends on BUSYBOX_CHRT
 
-config UTIL_LINUX_NG_IONICE
+config UTIL_LINUX_IONICE
 	bool
 	prompt "ionice"
-	select UTIL_LINUX_NG_SCHEDUTILS
+	select UTIL_LINUX_SCHEDUTILS
 	help
 	  ionice gets/sets the program io scheduling class and priority.
 
-config UTIL_LINUX_NG_TASKSET
+config UTIL_LINUX_TASKSET
 	bool
 	prompt "taskset"
-	select UTIL_LINUX_NG_SCHEDUTILS
+	select UTIL_LINUX_SCHEDUTILS
 	depends on !BUSYBOX_TASKSET || ALLYES
 	help
 	  taskset retrieves or sets a process's CPU affinity.
@@ -281,14 +281,14 @@ comment "BusyBox' taskset is selected!"
 
 comment "sys-utils"
 
-config UTIL_LINUX_NG_CHMEM
+config UTIL_LINUX_CHMEM
 	bool
 	prompt "chmem"
 	help
 	  The chmem command sets a particular size or range of
 	  memory online or offline.
 
-config UTIL_LINUX_NG_DMESG
+config UTIL_LINUX_DMESG
 	bool
 	depends on !BUSYBOX_DMESG || ALLYES
 	prompt "dmesg"
@@ -298,7 +298,7 @@ config UTIL_LINUX_NG_DMESG
 comment "BusyBox' dmesg is selected!"
 	depends on BUSYBOX_DMESG
 
-config UTIL_LINUX_NG_FLOCK
+config UTIL_LINUX_FLOCK
 	bool
 	prompt "flock"
 	depends on !BUSYBOX_FLOCK || ALLYES
@@ -309,7 +309,7 @@ config UTIL_LINUX_NG_FLOCK
 comment "BusyBox' flock is selected!"
 	depends on BUSYBOX_FLOCK
 
-config UTIL_LINUX_NG_FSFREEZE
+config UTIL_LINUX_FSFREEZE
 	bool
 	prompt "fsfreeze"
 	depends on !BUSYBOX_FSFREEZE || ALLYES
@@ -319,7 +319,7 @@ config UTIL_LINUX_NG_FSFREEZE
 comment "BusyBox' fsfreeze is selected!"
 	depends on BUSYBOX_FSFREEZE
 
-config UTIL_LINUX_NG_FSTRIM
+config UTIL_LINUX_FSTRIM
 	bool
 	prompt "fstrim"
 	depends on !BUSYBOX_FSTRIM || ALLYES
@@ -331,7 +331,7 @@ config UTIL_LINUX_NG_FSTRIM
 comment "BusyBox' fstrim is selected!"
 	depends on BUSYBOX_FSTRIM
 
-config UTIL_LINUX_NG_HWCLOCK
+config UTIL_LINUX_HWCLOCK
 	bool
 	prompt "hwclock"
 	depends on !BUSYBOX_HWCLOCK || ALLYES
@@ -344,7 +344,7 @@ config UTIL_LINUX_NG_HWCLOCK
 comment "BusyBox' hwclock is selected!"
 	depends on BUSYBOX_HWCLOCK
 
-config UTIL_LINUX_NG_IPCRM
+config UTIL_LINUX_IPCRM
 	bool
 	prompt "ipcrm"
 	depends on !BUSYBOX_IPCRM || ALLYES
@@ -355,7 +355,7 @@ config UTIL_LINUX_NG_IPCRM
 comment "BusyBox' ipcrm is selected!"
 	depends on BUSYBOX_IPCRM
 
-config UTIL_LINUX_NG_IPCS
+config UTIL_LINUX_IPCS
 	bool
 	prompt "ipcs"
 	depends on !BUSYBOX_IPCS || ALLYES
@@ -366,24 +366,24 @@ config UTIL_LINUX_NG_IPCS
 comment "BusyBox' ipcs is selected!"
 	depends on BUSYBOX_IPCS
 
-config UTIL_LINUX_NG_IRQTOP
+config UTIL_LINUX_IRQTOP
 	bool
-	select UTIL_LINUX_NG_USES_NCURSES
+	select UTIL_LINUX_USES_NCURSES
 	prompt "irqtop"
 	help
 	  irqtop is a tool to observe irqs and softirqs in
 	  a top like fashion.
 
-config UTIL_LINUX_NG_LDATTACH
+config UTIL_LINUX_LDATTACH
 	bool
 	prompt "ldattach"
 	help
 	  attach a line discipline to a serial line
 
-config UTIL_LINUX_NG_LOSETUP
+config UTIL_LINUX_LOSETUP
 	bool
 	prompt "losetup"
-	select UTIL_LINUX_NG_LIBSMARTCOLS
+	select UTIL_LINUX_LIBSMARTCOLS
 	depends on !BUSYBOX_LOSETUP || ALLYES
 	help
 	  losetup is used to associate or detach a loop device with a regular
@@ -392,30 +392,30 @@ config UTIL_LINUX_NG_LOSETUP
 comment "BusyBox' losetup is selected!"
 	depends on BUSYBOX_LOSETUP
 
-config UTIL_LINUX_NG_LSCPU
+config UTIL_LINUX_LSCPU
 	bool
-	select UTIL_LINUX_NG_LIBSMARTCOLS
+	select UTIL_LINUX_LIBSMARTCOLS
 	prompt "lscpu"
 	help
 	  lscpu shows information about the CPU architecture
 
-config UTIL_LINUX_NG_LSIRQ
+config UTIL_LINUX_LSIRQ
 	bool
 	prompt "lsirq"
 	help
 	  lsirq is a tool to list kernel interrupt information.
 
-config UTIL_LINUX_NG_LSMEM
+config UTIL_LINUX_LSMEM
 	bool
 	prompt "lsmem"
 	help
 	  The lsmem command lists the ranges of available memory and
 	  it's online status.
 
-config UTIL_LINUX_NG_MOUNT
+config UTIL_LINUX_MOUNT
 	bool
 	prompt "mount"
-	select UTIL_LINUX_NG_LIBMOUNT
+	select UTIL_LINUX_LIBMOUNT
 	depends on !BUSYBOX_MOUNT || ALLYES
 	help
 	  The mount command serves to attach the file system
@@ -424,9 +424,9 @@ config UTIL_LINUX_NG_MOUNT
 comment "BusyBox' mount is selected!"
 	depends on BUSYBOX_MOUNT
 
-config UTIL_LINUX_NG_MOUNTPOINT
+config UTIL_LINUX_MOUNTPOINT
 	bool
-	select UTIL_LINUX_NG_LIBMOUNT
+	select UTIL_LINUX_LIBMOUNT
 	depends on !BUSYBOX_MOUNTPOINT || ALLYES
 	prompt "mountpoint"
 	help
@@ -435,13 +435,13 @@ config UTIL_LINUX_NG_MOUNTPOINT
 comment "BusyBox' mountpoint is selected!"
 	depends on BUSYBOX_MOUNTPOINT
 
-config UTIL_LINUX_NG_NSENTER
+config UTIL_LINUX_NSENTER
 	bool
 	prompt "nsenter"
 	help
 	  The nsenter utility
 
-config UTIL_LINUX_NG_PIVOT_ROOT
+config UTIL_LINUX_PIVOT_ROOT
 	bool
 	depends on !BUSYBOX_PIVOT_ROOT
 	prompt "pivot_root"
@@ -451,7 +451,7 @@ config UTIL_LINUX_NG_PIVOT_ROOT
 comment "BusyBox' pivot_root is selected!"
 	depends on BUSYBOX_PIVOT_ROOT
 
-config UTIL_LINUX_NG_READPROFILE
+config UTIL_LINUX_READPROFILE
 	bool
 	prompt "readprofile"
 	depends on !BUSYBOX_READPROFILE || ALLYES
@@ -468,12 +468,12 @@ config UTIL_LINUX_NG_READPROFILE
 comment "BusyBox' readprofile is selected!"
 	depends on BUSYBOX_READPROFILE
 
-config UTIL_LINUX_NG_SWAPON
+config UTIL_LINUX_SWAPON
 	bool
 	prompt "swapon"
-	select UTIL_LINUX_NG_LIBBLKID
-	select UTIL_LINUX_NG_LIBMOUNT
-	select UTIL_LINUX_NG_LIBSMARTCOLS
+	select UTIL_LINUX_LIBBLKID
+	select UTIL_LINUX_LIBMOUNT
+	select UTIL_LINUX_LIBSMARTCOLS
 	depends on !BUSYBOX_SWAPON || ALLYES
 	help
 	  Swapon is used to specify devices on which paging and swapping are to take place.
@@ -481,7 +481,7 @@ config UTIL_LINUX_NG_SWAPON
 comment "BusyBox' swapon is selected!"
 	depends on BUSYBOX_SWAPON
 
-config UTIL_LINUX_NG_SWITCH_ROOT
+config UTIL_LINUX_SWITCH_ROOT
 	bool
 	depends on !BUSYBOX_SWITCH_ROOT
 	prompt "switch_root"
@@ -492,10 +492,10 @@ config UTIL_LINUX_NG_SWITCH_ROOT
 comment "BusyBox' switch_root is selected!"
 	depends on BUSYBOX_SWITCH_ROOT
 
-config UTIL_LINUX_NG_UMOUNT
+config UTIL_LINUX_UMOUNT
 	bool
 	prompt "umount"
-	select UTIL_LINUX_NG_MOUNT
+	select UTIL_LINUX_MOUNT
 	depends on !BUSYBOX_MOUNT || ALLYES
 	depends on !BUSYBOX_UMOUNT || ALLYES
 	help
@@ -506,13 +506,13 @@ config UTIL_LINUX_NG_UMOUNT
 comment "BusyBox' umount is selected!"
 	depends on BUSYBOX_UMOUNT
 
-config UTIL_LINUX_NG_WDCTL
+config UTIL_LINUX_WDCTL
 	bool
 	prompt "wdctl"
 	help
 	  wdctl - Utility to show hardware watchdog status.
 
-config UTIL_LINUX_NG_ZRAMCTL
+config UTIL_LINUX_ZRAMCTL
 	bool
 	prompt "zramctl"
 	help
@@ -520,15 +520,15 @@ config UTIL_LINUX_NG_ZRAMCTL
 
 comment "term-utils"
 
-config UTIL_LINUX_NG_AGETTY
+config UTIL_LINUX_AGETTY
 	bool
 	prompt "agetty"
 	help
 	  A small getty.
 
-config UTIL_LINUX_NG_SETTERM
+config UTIL_LINUX_SETTERM
 	bool
-	select UTIL_LINUX_NG_USES_NCURSES
+	select UTIL_LINUX_USES_NCURSES
 	prompt "setterm"
 	help
 	  setterm - set terminal attributes like terminal name, cursor
@@ -536,14 +536,14 @@ config UTIL_LINUX_NG_SETTERM
 
 comment "text-utils"
 
-config UTIL_LINUX_NG_COLUMN
+config UTIL_LINUX_COLUMN
 	bool
-	select UTIL_LINUX_NG_LIBSMARTCOLS
+	select UTIL_LINUX_LIBSMARTCOLS
 	prompt "column"
 	help
 	  Columnate lists.
 
-config UTIL_LINUX_NG_LINE
+config UTIL_LINUX_LINE
 	bool
 	prompt "line"
 	help
diff --git a/rules/util-linux.make b/rules/util-linux.make
new file mode 100644
index 000000000..2f2103d7a
--- /dev/null
+++ b/rules/util-linux.make
@@ -0,0 +1,273 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2008 by Robert Schwebel
+#               2010 by Marc Kleine-Budde <mkl@penutronix.de>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_UTIL_LINUX) += util-linux
+
+#
+# Paths and names
+#
+UTIL_LINUX_VERSION	:= 2.38.1
+UTIL_LINUX_MD5		:= cd11456f4ddd31f7fbfdd9488c0c0d02
+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)))
+UTIL_LINUX_URL		:= $(call ptx/mirror, KERNEL, utils/util-linux/$(UTIL_LINUX_BASENAME)/$(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_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
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+UTIL_LINUX_CONF_ENV	:= \
+	$(CROSS_ENV) \
+	$(call ptx/ncurses, PTXCONF_UTIL_LINUX_USES_NCURSES) \
+	scanf_cv_type_modifier=as \
+	ac_cv_path_BLKID=no \
+	ac_cv_path_PERL=no \
+	ac_cv_path_VOLID=no
+
+#
+# autoconf
+#
+UTIL_LINUX_CONF_TOOL	:= autoconf
+UTIL_LINUX_CONF_OPT	:= \
+	$(CROSS_AUTOCONF_USR) \
+	--bindir=/usr/bin \
+	--sbindir=/usr/sbin \
+	--disable-werror \
+	--disable-asan \
+	--disable-ubsan \
+	--disable-fuzzing-engine \
+	--enable-shared \
+	--disable-static \
+	--enable-symvers \
+	--disable-gtk-doc \
+	$(GLOBAL_LARGE_FILE_OPTION) \
+	--enable-assert \
+	--disable-nls \
+	--disable-rpath \
+	--disable-static-programs \
+	--enable-all-programs=undefined \
+	--disable-asciidoc \
+	--disable-poman \
+	--enable-tls \
+	--disable-widechar \
+	--$(call ptx/endis, PTXCONF_UTIL_LINUX_LIBUUID)-libuuid \
+	--disable-libuuid-force-uuidd \
+	--$(call ptx/endis, PTXCONF_UTIL_LINUX_LIBBLKID)-libblkid \
+	--$(call ptx/endis, PTXCONF_UTIL_LINUX_LIBMOUNT)-libmount \
+	--disable-libmount-support-mtab \
+	--$(call ptx/endis, PTXCONF_UTIL_LINUX_LIBSMARTCOLS)-libsmartcols \
+	--$(call ptx/endis, PTXCONF_UTIL_LINUX_LIBFDISK)-libfdisk \
+	$(call ptx/ifdef, PTXCONF_UTIL_LINUX_FDISKS,,--disable-fdisks) \
+	--$(call ptx/endis, PTXCONF_UTIL_LINUX_MOUNT)-mount \
+	--$(call ptx/endis, PTXCONF_UTIL_LINUX_LOSETUP)-losetup \
+	--$(call ptx/endis, PTXCONF_UTIL_LINUX_ZRAMCTL)-zramctl \
+	--$(call ptx/endis, PTXCONF_UTIL_LINUX_FSCK)-fsck \
+	--$(call ptx/endis, PTXCONF_UTIL_LINUX_PARTX_TOOLS)-partx \
+	--$(call ptx/endis, PTXCONF_UTIL_LINUX_UUIDD)-uuidd \
+	--$(call ptx/endis, PTXCONF_UTIL_LINUX_UUIDGEN)-uuidgen \
+	--$(call ptx/endis, PTXCONF_UTIL_LINUX_BLKID)-blkid \
+	--$(call ptx/endis, PTXCONF_UTIL_LINUX_WIPEFS)-wipefs \
+	--$(call ptx/endis, PTXCONF_UTIL_LINUX_MOUNTPOINT)-mountpoint \
+	--disable-fallocate \
+	--disable-unshare \
+	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NSENTER)-nsenter \
+	--disable-setpriv \
+	--disable-hardlink \
+	--disable-eject \
+	--$(call ptx/endis, PTXCONF_UTIL_LINUX_AGETTY)-agetty \
+	--disable-plymouth_support \
+	--disable-cramfs \
+	--disable-bfs \
+	--disable-minix \
+	--disable-fdformat \
+	--$(call ptx/endis, PTXCONF_UTIL_LINUX_HWCLOCK)-hwclock \
+	--$(call ptx/endis, PTXCONF_UTIL_LINUX_MKFS)-mkfs \
+	--$(call ptx/endis, PTXCONF_UTIL_LINUX_FSTRIM)-fstrim \
+	--$(call ptx/endis, PTXCONF_UTIL_LINUX_SWAPON)-swapon \
+	--$(call ptx/endis, PTXCONF_UTIL_LINUX_LSCPU)-lscpu \
+	--disable-lslogins \
+	--$(call ptx/endis, PTXCONF_UTIL_LINUX_WDCTL)-wdctl \
+	--disable-cal \
+	--disable-logger \
+	--disable-whereis \
+	--$(call ptx/endis, PTXCONF_UTIL_LINUX_SWITCH_ROOT)-switch_root \
+	--$(call ptx/endis, PTXCONF_UTIL_LINUX_PIVOT_ROOT)-pivot_root \
+	--$(call ptx/endis, PTXCONF_UTIL_LINUX_LSMEM)-lsmem \
+	--$(call ptx/endis, PTXCONF_UTIL_LINUX_CHMEM)-chmem \
+	--$(call ptx/endis, PTXCONF_UTIL_LINUX_IPCRM)-ipcrm \
+	--$(call ptx/endis, PTXCONF_UTIL_LINUX_IPCS)-ipcs \
+	--$(call ptx/endis, PTXCONF_UTIL_LINUX_IRQTOP)-irqtop \
+	--$(call ptx/endis, PTXCONF_UTIL_LINUX_LSIRQ)-lsirq \
+	--disable-rfkill \
+	--disable-scriptutils \
+	--disable-tunelp \
+	--disable-kill \
+	--disable-last \
+	--disable-utmpdump \
+	--$(call ptx/endis, PTXCONF_UTIL_LINUX_LINE)-line \
+	--disable-mesg \
+	--disable-raw \
+	--disable-rename \
+	--disable-vipw \
+	--disable-newgrp \
+	--disable-chfn-chsh-password \
+	--disable-chfn-chsh \
+	--disable-chsh-only-listed \
+	--$(call ptx/endis, PTXCONF_UTIL_LINUX_LOGIN)-login \
+	--disable-login-chown-vcs \
+	--disable-login-stat-mail \
+	--disable-nologin \
+	--$(call ptx/endis, PTXCONF_UTIL_LINUX_SULOGIN)-sulogin \
+	--disable-su \
+	--disable-runuser \
+	--disable-ul \
+	--disable-more \
+	--disable-pg \
+	--$(call ptx/endis, PTXCONF_UTIL_LINUX_SETTERM)-setterm \
+	--$(call ptx/endis, PTXCONF_UTIL_LINUX_SCHEDUTILS)-schedutils \
+	--disable-wall \
+	--disable-write \
+	--disable-bash-completion \
+	--disable-pylibmount \
+	--disable-pg-bell \
+	--disable-use-tty-group \
+	--disable-sulogin-emergency-mount \
+	--disable-usrdir-path \
+	--disable-makeinstall-chown \
+	--disable-makeinstall-setuid \
+	--disable-colors-default \
+	--without-libiconv-prefix \
+	--without-libintl-prefix \
+	--with-util \
+	--without-selinux \
+	--without-audit \
+	--without-udev \
+	--without-ncursesw \
+	--$(call ptx/wwo, PTXCONF_UTIL_LINUX_USES_NCURSES)-ncurses \
+	--without-slang \
+	--without-tinfo \
+	--without-readline \
+	--without-utempter \
+	--without-cap-ng \
+	--without-libz \
+	--without-libmagic \
+	--without-user \
+	--without-btrfs \
+	--without-systemd \
+	--with-systemdsystemunitdir=/usr/lib/systemd/system \
+	--without-smack \
+	--without-econf \
+	--without-python \
+	--without-cryptsetup
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+UTIL_LINUX_LIB-y :=
+UTIL_LINUX_BIN-y :=
+
+# libraries
+UTIL_LINUX_LIB-$(PTXCONF_UTIL_LINUX_LIBBLKID)		+= blkid
+UTIL_LINUX_LIB-$(PTXCONF_UTIL_LINUX_LIBUUID)		+= uuid
+UTIL_LINUX_LIB-$(PTXCONF_UTIL_LINUX_LIBMOUNT)		+= mount
+UTIL_LINUX_LIB-$(PTXCONF_UTIL_LINUX_LIBSMARTCOLS)	+= smartcols
+UTIL_LINUX_LIB-$(PTXCONF_UTIL_LINUX_LIBFDISK)		+= fdisk
+
+# disk-utils
+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_FDISK)		+= sbin/fdisk
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_FSCK)		+= sbin/fsck
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_MKFS)		+= sbin/mkfs
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_MKSWAP)		+= sbin/mkswap
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_PARTX)		+= sbin/partx
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_SFDISK)		+= sbin/sfdisk
+# login-utils
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_LOGIN)		+= bin/login
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_SULOGIN)		+= sbin/sulogin
+# misc-utils
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_BLKID)		+= sbin/blkid
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_FINDFS)		+= sbin/findfs
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_GETOPT)		+= bin/getopt
+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_WIPEFS)		+= sbin/wipefs
+# schedutils
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_CHRT)		+= bin/chrt
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_IONICE)		+= bin/ionice
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_TASKSET)		+= bin/taskset
+# sys-utils
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_CHMEM)		+= bin/chmem
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_DMESG)		+= bin/dmesg
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_FLOCK)		+= bin/flock
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_FSFREEZE)		+= sbin/fsfreeze
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_FSTRIM)		+= sbin/fstrim
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_HWCLOCK)		+= sbin/hwclock
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_IPCRM)		+= bin/ipcrm
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_IPCS)		+= bin/ipcs
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_IRQTOP)		+= bin/irqtop
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_LDATTACH)		+= sbin/ldattach
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_LOSETUP)		+= sbin/losetup
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_LSCPU)		+= bin/lscpu
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_LSIRQ)		+= bin/lsirq
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_LSMEM)		+= bin/lsmem
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_MOUNT)		+= bin/mount
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_MOUNTPOINT)		+= bin/mountpoint
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NSENTER)		+= bin/nsenter
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_PIVOT_ROOT)		+= sbin/pivot_root
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_READPROFILE)	+= sbin/readprofile
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_SWAPON)		+= sbin/swapoff sbin/swapon
+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
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_ZRAMCTL)		+= sbin/zramctl
+# term-utils
+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_LINE)		+= bin/line
+
+$(STATEDIR)/util-linux.targetinstall:
+	@$(call targetinfo)
+
+	@$(call install_init, util-linux)
+	@$(call install_fixup, util-linux,PRIORITY,optional)
+	@$(call install_fixup, util-linux,SECTION,base)
+	@$(call install_fixup, util-linux,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
+	@$(call install_fixup, util-linux,DESCRIPTION,missing)
+
+	@$(foreach lib, $(UTIL_LINUX_LIB-y), \
+		$(call install_lib, util-linux, 0, 0, 0644, lib$(lib));)
+
+	@$(foreach tool, $(UTIL_LINUX_BIN-y), \
+		$(call install_copy, util-linux, 0, 0, 0755, -, \
+		/usr/$(tool));)
+
+	@$(call install_finish, util-linux)
+
+	@$(call touch)
+
+# vim: syntax=make
diff --git a/rules/xorg-app-xinit.in b/rules/xorg-app-xinit.in
index d82c3f5a8..e054c3ab7 100644
--- a/rules/xorg-app-xinit.in
+++ b/rules/xorg-app-xinit.in
@@ -4,8 +4,8 @@ menuconfig XORG_APP_XINIT
 	tristate
 	select XORG_LIB_X11
 	select XORG_APP_XAUTH		if XORG_APP_XINIT_STARTX && RUNTIME
-	select UTIL_LINUX_NG		if XORG_APP_XINIT_STARTX && RUNTIME
-	select UTIL_LINUX_NG_MCOOKIE	if XORG_APP_XINIT_STARTX
+	select UTIL_LINUX		if XORG_APP_XINIT_STARTX && RUNTIME
+	select UTIL_LINUX_MCOOKIE	if XORG_APP_XINIT_STARTX
 	prompt "xorg xinit"
 	help
 	  This package provides 'xinit' and 'startx', utilities for starting
diff --git a/scripts/migrate/migrate_ptx b/scripts/migrate/migrate_ptx
index caee22fdd..7779c2937 100755
--- a/scripts/migrate/migrate_ptx
+++ b/scripts/migrate/migrate_ptx
@@ -453,3 +453,10 @@ s/^\(\(# \)\?PTXCONF_LIBTHEORA_\)_/\1/
 # reason : upstream lighttpd module mod_compress was replaced by mod_deflate
 #
 s/^\(\(# \)\?PTXCONF_LIGHTTPD_MOD_\)COMPRESS\>/\1DEFLATE/
+
+# from   : ptxdist-2022.09.0
+# to     : ptxdist-2022.10.0
+# symbol : UTIL_LINUX_NG* -> UTIL_LINUX*
+# reason : upstream util-linux-ng fork was renamed back to util-linux over a decade ago
+#
+s/^\(\(# \)\?PTXCONF_UTIL_LINUX\)_NG/\1/
-- 
2.32.0




^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-09-29 14:02 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-25  8:10 [ptxdist] [PATCH] util-linux-ng: Rename to util-linux Ladislav Michl
2022-09-29 14:01 ` Michael Olbrich

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