[ptxdist] [PATCH] modemmanager: version bump 1.18.10 -> 1.18.12

2022-09-29 Thread Bruno Thomsen 
NEWS ModemManager 1.18.12
https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/commit/180c171e8d10340b2bb618f4e2bf2fc6eb13b0e6

This release fixes a bearer issue that is caused by longer network
registration time after 2G and 3G network shutdown in Europe.
https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/issues/572

Signed-off-by: Bruno Thomsen 
---
 rules/modemmanager.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/modemmanager.make b/rules/modemmanager.make
index 9dd58dac0..f942b5a65 100644
--- a/rules/modemmanager.make
+++ b/rules/modemmanager.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MODEMMANAGER) += modemmanager
 #
 # Paths and names
 #
-MODEMMANAGER_VERSION   := 1.18.10
-MODEMMANAGER_MD5   := e3ed043771fdee6f2078b9e51ca5e56a
+MODEMMANAGER_VERSION   := 1.18.12
+MODEMMANAGER_MD5   := 9f014dfc59f1bd8bc230bb2c2974d104
 MODEMMANAGER   := ModemManager-$(MODEMMANAGER_VERSION)
 MODEMMANAGER_SUFFIX:= tar.xz
 MODEMMANAGER_URL   := 
https://www.freedesktop.org/software/ModemManager/$(MODEMMANAGER).$(MODEMMANAGER_SUFFIX)

base-commit: 4390464ca6d1c03a01f38cc175fcfbaaf12a6465
-- 
2.37.3

[ptxdist] [PATCH v2 3/3] util-linux-ng: Rename to util-linux

2022-09-29 Thread Ladislav Michl 
From: Ladislav Michl 

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 
---
 CHANGES:
 v2: - rebased on top of previous patch
 - -M10% option to format-patch to detect renames

 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 +-
 ...st-util-linux-ng.in => host-util-linux.in} |   4 +-
 ...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.in => util-linux.in} | 216 
 rules/{util-linux-ng.make => util-linux.make} | 234 +-
 rules/xorg-app-xinit.in   |   4 +-
 scripts/migrate/migrate_ptx   |   7 +
 19 files changed, 270 insertions(+), 263 deletions(-)
 rename rules/{host-util-linux-ng.in => host-util-linux.in} (47%)
 rename rules/{host-util-linux-ng.make => host-util-linux.make} (88%)
 rename rules/{util-linux-ng.in => util-linux.in} (74%)
 rename rules/{util-linux-ng.make => util-linux.make} (32%)

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_NGif 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

[ptxdist] [PATCH 2/3] util-linux-ng: Use for loop to install libs and tools

2022-09-29 Thread Ladislav Michl 
From: Ladislav Michl 

Options are sorted alphabetically inside each group. Please keep
it that way.

Signed-off-by: Ladislav Michl 
---
 CHANGES:
 - v2: $(ptx/nl) instead of ;

 rules/util-linux-ng.make | 240 ---
 1 file changed, 74 insertions(+), 166 deletions(-)

diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make
index 5421ab50a..74ea0 100644
--- a/rules/util-linux-ng.make
+++ b/rules/util-linux-ng.make
@@ -182,6 +182,74 @@ UTIL_LINUX_NG_CONF_OPT := \
 # 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)
 
@@ -191,173 +259,13 @@ $(STATEDIR)/util-linux-ng.targetinstall:
@$(call install_fixup, util-linux-ng,AUTHOR,"Robert Schwebel 
")
@$(call install_fixup,

[ptxdist] [PATCH v2 1/3] util-linux-ng: Sort config entries

2022-09-29 Thread Ladislav Michl 
From: Ladislav Michl 

Split menu entries into groups and sort them alphabetically.

Signed-off-by: Ladislav Michl 
---
 CHANGES:
 - v2: None

 rules/util-linux-ng.in | 610 +
 1 file changed, 312 insertions(+), 298 deletions(-)

diff --git a/rules/util-linux-ng.in b/rules/util-linux-ng.in
index b317d6505..772d913ff 100644
--- a/rules/util-linux-ng.in
+++ b/rules/util-linux-ng.in
@@ -44,36 +44,7 @@ config UTIL_LINUX_NG_PARTX_TOOLS
 config UTIL_LINUX_NG_SCHEDUTILS
bool
 
-config UTIL_LINUX_NG_AGETTY
-   bool
-   prompt "agetty"
-   help
- A small getty.
-
-config UTIL_LINUX_NG_COLUMN
-   bool
-   select UTIL_LINUX_NG_LIBSMARTCOLS
-   prompt "column"
-   help
- Columnate lists.
-
-config UTIL_LINUX_NG_LINE
-   bool
-   prompt "line"
-   help
- The line utility.
-
-config UTIL_LINUX_NG_GETOPT
-   bool
-   prompt "getopt"
-   depends on !BUSYBOX_GETOPT || ALLYES
-   help
- The getopt is used to break up (parse) options in command
- lines for easy parsing by shell procedures, and to check
- for valid options.
-
-comment "BusyBox' getopt is selected!"
-   depends on BUSYBOX_GETOPT
+comment "disk-utils"
 
 config UTIL_LINUX_NG_ADDPART
bool
@@ -82,46 +53,22 @@ config UTIL_LINUX_NG_ADDPART
help
  The addpart utility.
 
-config UTIL_LINUX_NG_DELPART
+config UTIL_LINUX_NG_CFDISK
bool
-   select UTIL_LINUX_NG_PARTX_TOOLS
-   prompt "delpart"
+   select UTIL_LINUX_NG_LIBFDISK
+   select UTIL_LINUX_NG_LIBSMARTCOLS
+   select UTIL_LINUX_NG_FDISKS
+   select UTIL_LINUX_NG_USES_NCURSES
+   prompt "cfdisk"
help
- The delpart utility.
+ cfdisk is a curses based program for partitioning any hard disk drive.
 
-config UTIL_LINUX_NG_PARTX
+config UTIL_LINUX_NG_DELPART
bool
select UTIL_LINUX_NG_PARTX_TOOLS
-   prompt "partx"
-   help
- The partx utility.
-
-config UTIL_LINUX_NG_DMESG
-   bool
-   depends on !BUSYBOX_DMESG || ALLYES
-   prompt "dmesg"
-   help
- The dmesg utility.
-
-comment "BusyBox' dmesg is selected!"
-   depends on BUSYBOX_DMESG
-
-config UTIL_LINUX_NG_NSENTER
-   bool
-   prompt "nsenter"
-   help
- The nsenter utility
-
-config UTIL_LINUX_NG_MOUNTPOINT
-   bool
-   select UTIL_LINUX_NG_LIBMOUNT
-   depends on !BUSYBOX_MOUNTPOINT || ALLYES
-   prompt "mountpoint"
+   prompt "delpart"
help
- The mountpoint utility.
-
-comment "BusyBox' mountpoint is selected!"
-   depends on BUSYBOX_MOUNTPOINT
+ The delpart utility.
 
 config UTIL_LINUX_NG_FDISK
bool
@@ -136,25 +83,26 @@ config UTIL_LINUX_NG_FDISK
 comment "BusyBox' fdisk is selected!"
depends on BUSYBOX_FDISK
 
-config UTIL_LINUX_NG_SFDISK
+config UTIL_LINUX_NG_FSCK
bool
-   prompt "sfdisk"
-   select UTIL_LINUX_NG_LIBFDISK
-   select UTIL_LINUX_NG_LIBSMARTCOLS
-   select UTIL_LINUX_NG_FDISKS
+   prompt "fsck"
+   select UTIL_LINUX_NG_LIBMOUNT
+   depends on !BUSYBOX_FSCK || ALLYES
help
- sfdisk - Partition table manipulator for Linux,
- scriptable for unattended partitioning
+ fsck  is  used  to  check and optionally repair one or
+ more Linux file systems. fsck is simply a front-end for
+ the various file system checkers (fsck.fstype) available
+ under Linux.
 
-config UTIL_LINUX_NG_CFDISK
+comment "BusyBox' fsck is selected!"
+   depends on BUSYBOX_FSCK
+
+config UTIL_LINUX_NG_MKFS
bool
-   select UTIL_LINUX_NG_LIBFDISK
-   select UTIL_LINUX_NG_LIBSMARTCOLS
-   select UTIL_LINUX_NG_FDISKS
-   select UTIL_LINUX_NG_USES_NCURSES
-   prompt "cfdisk"
+   prompt "mkfs"
help
- cfdisk is a curses based program for partitioning any hard disk drive.
+ The mkfs command is a generic wrapper for fs specific
+ mkfs.* commands.
 
 config UTIL_LINUX_NG_MKSWAP
bool
@@ -173,164 +121,134 @@ config UTIL_LINUX_NG_MKSWAP_UUID
 comment "BusyBox' mkswap is selected!"
depends on BUSYBOX_MKSWAP
 
-config UTIL_LINUX_NG_SWAPON
+config UTIL_LINUX_NG_PARTX
bool
-   prompt "swapon"
-   select UTIL_LINUX_NG_LIBBLKID
-   select UTIL_LINUX_NG_LIBMOUNT
-   select UTIL_LINUX_NG_LIBSMARTCOLS
-   depends on !BUSYBOX_SWAPON || ALLYES
+   select UTIL_LINUX_NG_PARTX_TOOLS
+   prompt "partx"
help
- Swapon is used to specify devices on which paging and swapping are to 
take place.
-
-comment "BusyBox' swapon is selected!"
-   depends on BUSYBOX_SWAPON
+ The partx utility.
 
-config UTIL_LINUX_NG_LOSETUP
+config UTIL_LINUX_NG_SFDISK
bool
-   prompt "losetup"
+   prompt "sfdisk"
+   select UTIL_LINUX_NG_LIBFDISK
select UTIL_LINUX_NG_LIBSMARTCOLS
-

[ptxdist] [PATCH] treewide: use $(ptx/nl) instead of ; in foreach loops

2022-09-29 Thread Ladislav Michl 
From: Ladislav Michl 

Signed-off-by: Ladislav Michl 
---
 rules/barebox.make| 2 +-
 rules/connman.make| 2 +-
 rules/easy-rsa.make   | 4 ++--
 rules/ecryptfs-utils.make | 2 +-
 rules/gtk-engines.make| 2 +-
 rules/kbd.make| 2 +-
 rules/libdrm.make | 3 ++-
 rules/libelf.make | 2 +-
 rules/libnl3.make | 3 ++-
 rules/libsndfile.make | 3 ++-
 rules/libva.make  | 2 +-
 rules/lighttpd.make   | 2 +-
 rules/mesa-demos.make | 3 ++-
 rules/munin.make  | 5 +++--
 rules/ncftp.make  | 3 ++-
 rules/opensc.make | 2 +-
 rules/perl.make   | 3 ++-
 rules/poco.make   | 2 +-
 rules/psmisc.make | 2 +-
 rules/rt-tests.make   | 2 +-
 rules/strongswan.make | 2 +-
 rules/systemd.make| 6 +++---
 rules/tomoyo-tools.make   | 6 --
 rules/trace-cmd.make  | 2 +-
 rules/udev.make   | 4 ++--
 rules/vim.make| 2 +-
 rules/vorbis-tools.make   | 3 ++-
 27 files changed, 43 insertions(+), 33 deletions(-)

diff --git a/rules/barebox.make b/rules/barebox.make
index adab3c4fe..a82879e19 100644
--- a/rules/barebox.make
+++ b/rules/barebox.make
@@ -173,7 +173,7 @@ ifneq ($(strip $(BAREBOX_PROGS_TARGET_y)),)
 
@$(foreach prog, $(BAREBOX_PROGS_TARGET_y), \
$(call install_copy, barebox, 0, 0, 0755, -, \
-   /usr/bin/$(prog));)
+   /usr/bin/$(prog))$(ptx/nl))
 
@$(call install_finish, barebox)
 endif
diff --git a/rules/connman.make b/rules/connman.make
index d6eed8aa8..0092ed6ef 100644
--- a/rules/connman.make
+++ b/rules/connman.make
@@ -179,7 +179,7 @@ endif
 ifdef PTXCONF_CONNMAN_TESTS
@$(foreach test, $(CONNMAN_TESTS), \
$(call install_copy, connman, 0, 0, 0755, -, \
-   /usr/sbin/cm-$(test));)
+   /usr/sbin/cm-$(test))$(ptx/nl))
 endif
 
@$(call install_finish, connman)
diff --git a/rules/easy-rsa.make b/rules/easy-rsa.make
index 6d86e5317..bbf915076 100644
--- a/rules/easy-rsa.make
+++ b/rules/easy-rsa.make
@@ -47,11 +47,11 @@ $(STATEDIR)/easy-rsa.targetinstall:
 
@$(foreach script,$(EASY_RSA_INSTALL_SCRIPTS), \
$(call install_copy, easy-rsa, 0, 0, 0755, -, \
-   /usr/share/easy-rsa/$(script));)
+   /usr/share/easy-rsa/$(script))$(ptx/nl))
 
@$(foreach file,$(EASY_RSA_INSTALL_FILES), \
$(call install_copy, easy-rsa, 0, 0, 0644, -, \
-   /usr/share/easy-rsa/$(file));)
+   /usr/share/easy-rsa/$(file))$(ptx/nl))
 
@$(call install_finish, easy-rsa)
 
diff --git a/rules/ecryptfs-utils.make b/rules/ecryptfs-utils.make
index 5c38842d4..b7198d16a 100644
--- a/rules/ecryptfs-utils.make
+++ b/rules/ecryptfs-utils.make
@@ -94,7 +94,7 @@ ifdef PTXCONF_ECRYPTFS_UTILS_MOUNT_ECRYPTFS
 endif
 
@$(foreach prog, $(ECRYPTFS_UTILS_PROGS_y), \
-   $(call install_copy, ecryptfs-utils, 0, 0, 0755, -, $(prog));)
+   $(call install_copy, ecryptfs-utils, 0, 0, 0755, -, 
$(prog))$(ptx/nl))
 
@$(call install_finish, ecryptfs-utils)
 
diff --git a/rules/gtk-engines.make b/rules/gtk-engines.make
index 2544c89cb..bbbe1162d 100644
--- a/rules/gtk-engines.make
+++ b/rules/gtk-engines.make
@@ -60,7 +60,7 @@ $(STATEDIR)/gtk-engines.targetinstall:
 
@$(foreach engine,$(GTK_ENGINES_ENGINES), \
$(call install_lib, gtk-engines, 0, 0, 0644, \
-   gtk-3.0/3.0.0/engines/lib$(engine));)
+   gtk-3.0/3.0.0/engines/lib$(engine))$(ptx/nl))
 
@$(call install_tree, gtk-engines, 0, 0, -, \
/usr/share/themes)
diff --git a/rules/kbd.make b/rules/kbd.make
index 67e4ff165..60bba99b2 100644
--- a/rules/kbd.make
+++ b/rules/kbd.make
@@ -82,7 +82,7 @@ $(STATEDIR)/kbd.targetinstall:
 
@$(foreach tool,$(KBD_TOOLS-y), \
$(call install_copy, kbd, 0, 0, 0755, -, \
-   /usr/bin/$(tool));)
+   /usr/bin/$(tool))$(ptx/nl))
 
 ifdef PTXCONF_KBD_PSFXTABLE
@$(call install_link, kbd, psfxtable, /usr/bin/psfaddtable)
diff --git a/rules/libdrm.make b/rules/libdrm.make
index 212946e97..262cd045d 100644
--- a/rules/libdrm.make
+++ b/rules/libdrm.make
@@ -83,7 +83,8 @@ $(STATEDIR)/libdrm.targetinstall:
@$(call install_lib, libdrm, 0, 0, 0644, libdrm)
 
@$(foreach backend,$(LIBDRM_BACKENDSL-y), \
-   $(call install_lib, libdrm, 0, 0, 0644, libdrm_$(backend));)
+   $(call install_lib, libdrm, 0, 0, 0644, \
+   libdrm_$(backend))$(ptx/nl))
 
 ifdef PTXCONF_LIBDRM_TESTS
@$(call install_copy, libdrm, 0, 0, 0755, -, /usr/bin/modetest)
diff --git a/rules/libelf.make b/rules/libelf.make
index 5b55a8aa2..4f34333a5 100644
--- a/rules/libelf.make
+++ b/rules/libelf.make
@@ -96,7 +96,7 @@ ifdef PTXCONF_LIBELF_ELFSUTILS

[ptxdist] [PATCH v4 4/5] lz4: version bump to 1.9.4 + adjust license files checksum

2022-09-29 Thread Marc Kleine-Budde 
- LICENSE:
  Paragraph about '`programs`, `tests` or `examples`' was changed from
  'receive more limited attention and support for such scenario.' to
  'are intended to be used "as is", as part of their intended scenarios,
   with no intention to support 3rd party integration use cases.'
- lib/LICENSE:
  Copyright years changed from "2011-2016" to "2011-2020".

Signed-off-by: Marc Kleine-Budde 
---
 rules/lz4.make | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/rules/lz4.make b/rules/lz4.make
index 79d8600c29db..4b9b2bb33076 100644
--- a/rules/lz4.make
+++ b/rules/lz4.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LZ4) += lz4
 #
 # Paths and names
 #
-LZ4_VERSION:= 1.9.3
-LZ4_MD5:= 3a1ab1684e14fc1afc66228ce61b2db3
+LZ4_VERSION:= 1.9.4
+LZ4_MD5:= e9286adb64040071c5e23498bf753261
 LZ4:= lz4-$(LZ4_VERSION)
 LZ4_SUFFIX := tar.gz
 LZ4_URL:= 
https://github.com/Cyan4973/lz4/archive/v$(LZ4_VERSION).$(LZ4_SUFFIX)
@@ -23,8 +23,8 @@ LZ4_SOURCE:= $(SRCDIR)/$(LZ4).$(LZ4_SUFFIX)
 LZ4_DIR:= $(BUILDDIR)/$(LZ4)
 LZ4_LICENSE:= BSD-2-Clause AND GPL-2.0-or-later
 LZ4_LICENSE_FILES := \
-   file://LICENSE;md5=d57c0d21cb917fb4e0af2454aa48b956 \
-   file://lib/LICENSE;md5=ebc2ea4814a64de7708f1571904b32cc \
+   file://LICENSE;md5=c5cc3cd6f9274b4d32988096df9c3ec3 \
+   file://lib/LICENSE;md5=5cd5f851b52ec832b10eedb3f01f885a \
file://programs/COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263
 
 # 
-- 
2.30.2

[ptxdist] [PATCH v4 5/5] nettle: version bump to 3.8.1

2022-09-29 Thread Marc Kleine-Budde 
Signed-off-by: Marc Kleine-Budde 
---
 rules/nettle.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/nettle.make b/rules/nettle.make
index c27f2116be66..43e0b41581e9 100644
--- a/rules/nettle.make
+++ b/rules/nettle.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_NETTLE) += nettle
 #
 # Paths and names
 #
-NETTLE_VERSION := 3.7.3
-NETTLE_MD5 := a60273d0fab9c808646fcf5e9edc2e8f
+NETTLE_VERSION := 3.8.1
+NETTLE_MD5 := e15c5fd5cc901f5dde6a271d7f2320d1
 NETTLE := nettle-$(NETTLE_VERSION)
 NETTLE_SUFFIX  := tar.gz
 NETTLE_SOURCE  := $(SRCDIR)/$(NETTLE).$(NETTLE_SUFFIX)
-- 
2.30.2

[ptxdist] [PATCH v4 3/5] dhcp: version bump to 4.4.3 + adjust license files checksum

2022-09-29 Thread Marc Kleine-Budde 
- LICENSE:
  Copyright years changed from "2004-2020" to "2004-2022".
  Paragraph 'THE SOFTWARE IS PROVIDED "AS IS"' removed.
  Address of "Internet Systems Consortium, Inc." removed.
- server/ldap.c:
  Copyright years changed from "2010-2019" to "2010-2022".
- server/ldap_casa.c:
  removed trailing whitespace
  Copyright years changed from "2004-2010" to "2004-2022".
  Address of "Internet Systems Consortium, Inc." adjusted.

Signed-off-by: Marc Kleine-Budde 
---
 ...0001-Fixed-gcc-10-compilation-issues.patch | 82 ---
 patches/dhcp-4.4.2/series |  4 -
 rules/dhcp.make   | 10 +--
 3 files changed, 5 insertions(+), 91 deletions(-)
 delete mode 100644 
patches/dhcp-4.4.2/0001-Fixed-gcc-10-compilation-issues.patch
 delete mode 100644 patches/dhcp-4.4.2/series

diff --git a/patches/dhcp-4.4.2/0001-Fixed-gcc-10-compilation-issues.patch 
b/patches/dhcp-4.4.2/0001-Fixed-gcc-10-compilation-issues.patch
deleted file mode 100644
index f0e3cc450bbe..
--- a/patches/dhcp-4.4.2/0001-Fixed-gcc-10-compilation-issues.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From: Thomas Markwalder 
-Date: Thu, 30 Jul 2020 10:01:36 -0400
-Subject: [PATCH] Fixed gcc 10 compilation issues
-
-client/dhclient.c
-relay/dhcrelay.c
-extern'ed local_port,remote_port
-
-common/discover.c
-init local_port,remote_port to 0
-
-server/mdb.c
-extern'ed dhcp_type_host
-
-server/mdb6.c
-create_prefix6() - eliminated memcpy string overflow error
-
-Origin: 
https://sources.debian.org/patches/isc-dhcp/4.4.1-2.2/Fixed_gcc_10_compilation_issues.patch/

- client/dhclient.c | 5 +++--
- relay/dhcrelay.c  | 4 ++--
- server/mdb.c  | 2 +-
- server/mdb6.c | 2 +-
- 4 files changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/client/dhclient.c b/client/dhclient.c
-index 189e527094e8..7a7837cb8152 100644
 a/client/dhclient.c
-+++ b/client/dhclient.c
-@@ -83,8 +83,9 @@ static const char message [] = "Internet Systems Consortium 
DHCP Client";
- static const char url [] = "For info, please visit 
https://www.isc.org/software/dhcp/;;
- #endif /* UNIT_TEST */
- 
--u_int16_t local_port = 0;
--u_int16_t remote_port = 0;
-+extern u_int16_t local_port;
-+extern u_int16_t remote_port;
-+
- #if defined(DHCPv6) && defined(DHCP4o6)
- int dhcp4o6_state = -1; /* -1 = stopped, 0 = polling, 1 = started */
- #endif
-diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c
-index 883d5058f2ee..7211e3bbbec9 100644
 a/relay/dhcrelay.c
-+++ b/relay/dhcrelay.c
-@@ -95,8 +95,8 @@ enum { forward_and_append,   /* Forward and append our own 
relay option. */
-forward_untouched, /* Forward without changes. */
-discard } agent_relay_mode = forward_and_replace;
- 
--u_int16_t local_port;
--u_int16_t remote_port;
-+extern u_int16_t local_port;
-+extern u_int16_t remote_port;
- 
- /* Relay agent server list. */
- struct server_list {
-diff --git a/server/mdb.c b/server/mdb.c
-index ff8a707fac1b..8266d76432b8 100644
 a/server/mdb.c
-+++ b/server/mdb.c
-@@ -67,7 +67,7 @@ static host_id_info_t *host_id_info = NULL;
- 
- int numclasseswritten;
- 
--omapi_object_type_t *dhcp_type_host;
-+extern omapi_object_type_t *dhcp_type_host;
- 
- isc_result_t enter_class(cd, dynamicp, commit)
-   struct class *cd;
-diff --git a/server/mdb6.c b/server/mdb6.c
-index da7baf6e50df..ebe01e5607cb 100644
 a/server/mdb6.c
-+++ b/server/mdb6.c
-@@ -1945,7 +1945,7 @@ create_prefix6(struct ipv6_pool *pool, struct iasubopt 
**pref,
-   }
-   new_ds.data = new_ds.buffer->data;
-   memcpy(new_ds.buffer->data, ds.data, ds.len);
--  memcpy(new_ds.buffer->data + ds.len, , sizeof(tmp));
-+  memcpy(_ds.buffer->data[0] + ds.len, , sizeof(tmp));
-   data_string_forget(, MDL);
-   data_string_copy(, _ds, MDL);
-   data_string_forget(_ds, MDL);
diff --git a/patches/dhcp-4.4.2/series b/patches/dhcp-4.4.2/series
deleted file mode 100644
index de5f31877455..
--- a/patches/dhcp-4.4.2/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-Fixed-gcc-10-compilation-issues.patch
-# dd19bdbd49b780e973ed9392604d03fe  - git-ptx-patches magic
diff --git a/rules/dhcp.make b/rules/dhcp.make
index 7feb6ef5b668..f4860507ded0 100644
--- a/rules/dhcp.make
+++ b/rules/dhcp.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_DHCP) += dhcp
 #
 # Paths and names
 #
-DHCP_VERSION   := 4.4.2
-DHCP_MD5   := 2afdaf8498dc1edaf3012efdd589b3e1
+DHCP_VERSION   := 4.4.3
+DHCP_MD5   := 9076af4cc1293dde5a7c6cae7de6ab45
 DHCP   := dhcp-$(DHCP_VERSION)
 DHCP_SUFFIX:= tar.gz
 DHCP_URL   := \
@@ -29,9 +29,9 @@ DHCP_SOURCE   := $(SRCDIR)/$(DHCP).$(DHCP_SUFFIX)
 DHCP_DIR   := $(BUILDDIR)/$(DHCP)
 DHCP_LICENSE   := MPL-2.0 AND BSD-3-Clause AND ISC
 DHCP_LICENSE_FILES := \
-   file://LICENSE;md5=b9c6e660b3d9260de9a342d2fb77540a \
-

[ptxdist] [PATCH v4 1/5] libcurl: fix configure if no SSL backend is selected

2022-09-29 Thread Marc Kleine-Budde 
If no SSL backend is selected configure will fail with the following
error:

| configure: error: TLS not detected, you will not be able to use HTTPS, FTPS, 
NTLM and more.
| Use --with-openssl, --with-gnutls, --with-wolfssl, --with-mbedtls,
| --with-nss, --with-schannel, --with-secure-transport, --with-amissl,
| --with-bearssl or --with-rustls to address this.

Fixes: 34db9dd470bd ("libcurl: Version bump. 7.84.0 -> 7.85.0")
Signed-off-by: Marc Kleine-Budde 
---
 rules/libcurl.make | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/libcurl.make b/rules/libcurl.make
index 0d0ac9ea33d0..5da835d730a8 100644
--- a/rules/libcurl.make
+++ b/rules/libcurl.make
@@ -93,6 +93,7 @@ LIBCURL_CONF_OPT  := \
--without-schannel \
--without-secure-transport \
--without-amissl \
+   --$(call ptx/wwo,PTXCONF_LIBCURL_SSL)-ssl \
--with-openssl=$(call ptx/ifdef, 
PTXCONF_LIBCURL_SSL_OPENSSL,$(SYSROOT)/usr,no) \
--with-gnutls=$(call ptx/ifdef, 
PTXCONF_LIBCURL_SSL_GNUTLS,$(SYSROOT)/usr,no) \
--without-mbedtls \
-- 
2.30.2

[ptxdist] [PATCH v4 2/5] bind: version bump to 9.11.37 + adjust license files checksum

2022-09-29 Thread Marc Kleine-Budde 
- COPYRIGHT:
  Copyright years changed from "1996-2021" to "1996-2022".

Signed-off-by: Marc Kleine-Budde 
---
 rules/bind.make | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rules/bind.make b/rules/bind.make
index b547eeff0993..18eac0eaee50 100644
--- a/rules/bind.make
+++ b/rules/bind.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_BIND) += bind
 #
 # Paths and names
 #
-BIND_VERSION   := 9.11.31
-BIND_MD5   := 40732ca6e4fcc9d022ab0f17b3e55b71
+BIND_VERSION   := 9.11.37
+BIND_MD5   := 0a11e9596c46d6728fa3b0989ee75197
 BIND   := bind-$(BIND_VERSION)
 BIND_SUFFIX:= tar.gz
 BIND_URL   := 
https://ftp.isc.org/isc/bind9/$(BIND_VERSION)/$(BIND).$(BIND_SUFFIX)
@@ -25,7 +25,7 @@ BIND_LICENSE  := MPL-2.0 AND ISC AND BSD-3-Clause AND 
BSD-2-Clause \
AND unknown AND JPNIC AND RSA-MD AND OpenSSL AND Apache-2.0
 BIND_LICENSE_FILES := \
file://LICENSE;md5=f27a50d2e878867827842f2c60e30bfc \
-   file://COPYRIGHT;md5=b88e7ca5f21908e1b2720169f6807cf6
+   file://COPYRIGHT;md5=89a97ebbf713f7125fe5c02223d3ae95
 
 # 
 # Prepare
-- 
2.30.2

[ptxdist] [PATCH v4 0/5] various version bumps

2022-09-29 Thread Marc Kleine-Budde 
this series contains a few versions bumps and a configure fix for
libcurl with deactivated ssl backend.

regards,
Marc

changes since v1: 
https://lore.ptxdist.org/ptxdist/20220920125705.2728029-1-...@pengutronix.de
- clarify subject and patch description for 1/7

changes since v2: 
https://lore.ptxdist.org/ptxdist/20220920141759.3394460-1-...@pengutronix.de
- 1/5 simplify no SSL backend fix (thanks mol)
- 2/5, 3/5, 4/5 update license file checksums
- 5/5 nettle: new patch
- dropped already applied patches

changes since v3: 
https://lore.ptxdist.org/ptxdist/20220928121609.1209927-1-...@pengutronix.de/
- 2/5, 3/5, 4/5: explain diff of license files

Re: [ptxdist] [PATCH v3 2/5] bind: version bump to 9.11.37 + adjust license files checksum

2022-09-29 Thread Michael Olbrich 
Hi,

I meant, adding to the commit message what change in the license.
Real changes? Whitespaces? Copyright year?
Same for the other patches.

Michael

On Wed, Sep 28, 2022 at 02:16:06PM +0200, Marc Kleine-Budde wrote:
> Signed-off-by: Marc Kleine-Budde 
> ---
>  rules/bind.make | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/rules/bind.make b/rules/bind.make
> index b547eeff0993..18eac0eaee50 100644
> --- a/rules/bind.make
> +++ b/rules/bind.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_BIND) += bind
>  #
>  # Paths and names
>  #
> -BIND_VERSION := 9.11.31
> -BIND_MD5 := 40732ca6e4fcc9d022ab0f17b3e55b71
> +BIND_VERSION := 9.11.37
> +BIND_MD5 := 0a11e9596c46d6728fa3b0989ee75197
>  BIND := bind-$(BIND_VERSION)
>  BIND_SUFFIX  := tar.gz
>  BIND_URL := 
> https://ftp.isc.org/isc/bind9/$(BIND_VERSION)/$(BIND).$(BIND_SUFFIX)
> @@ -25,7 +25,7 @@ BIND_LICENSE:= MPL-2.0 AND ISC AND 
> BSD-3-Clause AND BSD-2-Clause \
>   AND unknown AND JPNIC AND RSA-MD AND OpenSSL AND Apache-2.0
>  BIND_LICENSE_FILES   := \
>   file://LICENSE;md5=f27a50d2e878867827842f2c60e30bfc \
> - file://COPYRIGHT;md5=b88e7ca5f21908e1b2720169f6807cf6
> + file://COPYRIGHT;md5=89a97ebbf713f7125fe5c02223d3ae95
>  
>  # 
> 
>  # Prepare
> -- 
> 2.30.2
> 
> 
> 

-- 
Pengutronix e.K.   | |
Steuerwalder Str. 21   | http://www.pengutronix.de/  |
31137 Hildesheim, Germany  | Phone: +49-5121-206917-0|
Amtsgericht Hildesheim, HRA 2686   | Fax:   +49-5121-206917- |

Re: [ptxdist] [PATCH] util-linux-ng: Rename to util-linux

2022-09-29 Thread Michael Olbrich 
On Sun, Sep 25, 2022 at 10:10:06AM +0200, Ladislav Michl wrote:
> From: Ladislav Michl 
> 
> 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 
> ---
>  This one applies on top of previous two patches. Now sure
>  if it is worth renaming, so consider it as an RFC :)

I think it's time to do this. It was renamed upstream a really long time
ago. So please resent with the new version.

Michael

>  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_NGif 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

Re: [ptxdist] [PATCH 2/2] util-linux-ng: Use for loop to install libs and tools

2022-09-29 Thread Michael Olbrich 
On Sat, Sep 24, 2022 at 10:19:42PM +0200, Ladislav Michl wrote:
> From: Ladislav Michl 
> Date: Sat, 24 Sep 2022 21:42:39 +0200
> 
> Options are sorted alphabetically inside each group. Please keep
> it that way.
> 
> Signed-off-by: Ladislav Michl 
> ---
>  rules/util-linux-ng.make | 239 ---
>  1 file changed, 73 insertions(+), 166 deletions(-)
> 
> diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make
> index 5421ab50a..f5e57a56f 100644
> --- a/rules/util-linux-ng.make
> +++ b/rules/util-linux-ng.make
> @@ -182,6 +182,74 @@ UTIL_LINUX_NG_CONF_OPT   := \
>  # 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)