[ptxdist] [PATCH 2/2] util-linux-ng: Use for loop to install libs and tools
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) += bin/column +UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_LINE) += bin/line + $(STATEDIR)/util-linux-ng.targetinstall: @$(call targetinfo) @@ -191,173 +259,12 @@ $(STATEDIR)/util-linux-ng.targetinstall: @$(call install_fixup, util-linux-ng,AUTHOR,"Robert Schwebel ") @$(call install_fixup,
[ptxdist] [PATCH 1/2] util-linux-ng: Sort config entries
From: Ladislav Michl Date: Sat, 24 Sep 2022 20:57:26 +0200 Split menu entries into groups and sort them alphabetically. Signed-off-by: Ladislav Michl --- 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
