* [ptxdist] [PATCH 1/2] util-linux-ng: Sort config entries
@ 2022-09-24 20:17 Ladislav Michl
2022-09-24 20:19 ` [ptxdist] [PATCH 2/2] util-linux-ng: Use for loop to install libs and tools Ladislav Michl
0 siblings, 1 reply; 3+ messages in thread
From: Ladislav Michl @ 2022-09-24 20:17 UTC (permalink / raw)
To: ptxdist
From: Ladislav Michl <ladis@linux-mips.org>
Date: Sat, 24 Sep 2022 20:57:26 +0200
Split menu entries into groups and sort them alphabetically.
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
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
- depends on !BUSYBOX_LOSETUP || ALLYES
+ select UTIL_LINUX_NG_FDISKS
help
- losetup is used to associate or detach a loop device with a regular
- file or block device, and to query the status of a loop device.
+ sfdisk - Partition table manipulator for Linux,
+ scriptable for unattended partitioning
-comment "BusyBox' losetup is selected!"
- depends on BUSYBOX_LOSETUP
+comment "login-utils"
-config UTIL_LINUX_NG_MOUNT
+config UTIL_LINUX_NG_LOGIN
bool
- prompt "mount"
- select UTIL_LINUX_NG_LIBMOUNT
- depends on !BUSYBOX_MOUNT || ALLYES
+ select UTIL_LINUX_NG_USES_PAM
+ depends on GLOBAL_PAM && ((!BUSYBOX_LOGIN && !SHADOW) || ALLYES)
+ prompt "login"
help
- The mount command serves to attach the file system
- found on some device to the big file tree.
+ The login program is used to establish a new session with
+ the system.
-comment "BusyBox' mount is selected!"
- depends on BUSYBOX_MOUNT
+comment "BusyBox' login is selected!"
+ depends on BUSYBOX_LOGIN
-config UTIL_LINUX_NG_UMOUNT
+comment "Shadow package is selected!"
+ depends on SHADOW
+
+config UTIL_LINUX_NG_SULOGIN
bool
- prompt "umount"
- select UTIL_LINUX_NG_MOUNT
- depends on !BUSYBOX_MOUNT || ALLYES
- depends on !BUSYBOX_UMOUNT || ALLYES
+ depends on !BUSYBOX_SULOGIN || ALLYES
+ prompt "sulogin"
help
- The mount(8) command serves to attach the file system
- found on some device to the big file tree.
- Conversely, the umount(8) command will detach it again.
+ sulogin is invoked by init when the system goes into
+ single-user mode.
-comment "BusyBox' umount is selected!"
- depends on BUSYBOX_UMOUNT
+comment "BusyBox' sulogin is selected!"
+ depends on BUSYBOX_SULOGIN
-config UTIL_LINUX_NG_FLOCK
+comment "misc-utils"
+
+config UTIL_LINUX_NG_BLKID
bool
- prompt "flock"
- depends on !BUSYBOX_FLOCK || ALLYES
+ select UTIL_LINUX_NG_LIBBLKID
+ depends on !BUSYBOX_BLKID || ALLYES
+ prompt "blkid"
help
- The flock utility manages flock(2) locks from within
- shell scripts or from the command line.
+ The blkid program is the command-line interface to working with libblkid
+ library. It can determine the type of content (e.g. filesystem, swap)
+ a block device holds, and also attributes (tokens, NAME=value pairs) from
+ the content meta‐data (e.g. LABEL or UUID fields).
-comment "BusyBox' flock is selected!"
- depends on BUSYBOX_FLOCK
+comment "BusyBox' blkid is selected!"
+ depends on BUSYBOX_BLKID
-config UTIL_LINUX_NG_FSCK
+config UTIL_LINUX_NG_FINDFS
bool
- prompt "fsck"
- select UTIL_LINUX_NG_LIBMOUNT
- depends on !BUSYBOX_FSCK || ALLYES
+ select UTIL_LINUX_NG_LIBBLKID
+ depends on !BUSYBOX_FINDFS || ALLYES
+ prompt "findfs"
help
- 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.
+ findfs will search the disks in the system looking for a filesystem
+ which has a label matching label or a UUID equal to uuid.
-comment "BusyBox' fsck is selected!"
- depends on BUSYBOX_FSCK
+comment "BusyBox' findfs is selected!"
+ depends on BUSYBOX_FINDFS
-config UTIL_LINUX_NG_FSFREEZE
+config UTIL_LINUX_NG_GETOPT
bool
- prompt "fsfreeze"
- depends on !BUSYBOX_FSFREEZE || ALLYES
+ prompt "getopt"
+ depends on !BUSYBOX_GETOPT || ALLYES
help
- fsfreeze suspends or resumes access to a filesystem.
+ 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' fsfreeze is selected!"
- depends on BUSYBOX_FSFREEZE
+comment "BusyBox' getopt is selected!"
+ depends on BUSYBOX_GETOPT
-config UTIL_LINUX_NG_FSTRIM
+config UTIL_LINUX_NG_LSBLK
bool
- prompt "fstrim"
- depends on !BUSYBOX_FSTRIM || ALLYES
+ select UTIL_LINUX_NG_LIBBLKID
+ select UTIL_LINUX_NG_LIBMOUNT
+ select UTIL_LINUX_NG_LIBSMARTCOLS
+ prompt "lsblk"
help
- fstrim is used on a mounted filesystem to discard (or "trim")
- blocks which are not in use by the filesystem. This is useful
- for solid-state drives (SSDs) and thinly-provisioned storage.
-
-comment "BusyBox' fstrim is selected!"
- depends on BUSYBOX_FSTRIM
+ The lsblk command lists information about all available or the
+ specified block devices.
-config UTIL_LINUX_NG_IPCS
+config UTIL_LINUX_NG_MCOOKIE
bool
- prompt "ipcs"
- depends on !BUSYBOX_IPCS || ALLYES
+ prompt "mcookie"
help
- ipcs provides information on the ipc facilities
- for which the calling process has read access.
+ mcookie generates a 128-bit random hexadecimal number for
+ use with the X authority system.
-config UTIL_LINUX_NG_IRQTOP
+config UTIL_LINUX_NG_UUIDD
bool
- select UTIL_LINUX_NG_USES_NCURSES
- prompt "irqtop"
+ select UTIL_LINUX_NG_LIBUUID
+ prompt "uuidd"
help
- irqtop is a tool to observe irqs and softirqs in
- a top like fashion.
+ The uuidd daemon is used by the UUID library to generate
+ universally unique identifiers (UUIDs), especially time-based UUIDs,
+ 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_LSIRQ
+config UTIL_LINUX_NG_UUIDGEN
bool
- prompt "lsirq"
- help
- lsirq is a tool to list kernel interrupt information.
-
-comment "BusyBox' ipcs is selected!"
- depends on BUSYBOX_IPCS
-
-config UTIL_LINUX_NG_IPCRM
- bool
- prompt "ipcrm"
- depends on !BUSYBOX_IPCRM || ALLYES
+ select UTIL_LINUX_NG_LIBUUID
+ prompt "uuidgen"
help
- ipcrm removes ipc facilities for which the calling process has
- read access.
-
-comment "BusyBox' ipcrm is selected!"
- depends on BUSYBOX_IPCRM
+ uuidgen is a command-line utility to create a new UUID value.
-config UTIL_LINUX_NG_READPROFILE
+config UTIL_LINUX_NG_WIPEFS
bool
- prompt "readprofile"
- depends on !BUSYBOX_READPROFILE || ALLYES
+ select UTIL_LINUX_NG_LIBBLKID
+ prompt "wipefs"
help
- The readprofile command uses the /proc/profile information
- to print ascii data on standard output. The output is
- organized in three columns: the first is the number of
- clock ticks, the second is the name of the C function
- in the kernel where those many ticks occurred, and the
- third is the normalized `load' of the procedure, calculated
- as a ratio between the number of ticks and the length of the
- procedure. The output is filled with blanks to ease readability.
-
-comment "BusyBox' readprofile is selected!"
- depends on BUSYBOX_READPROFILE
+ The wipefs program can erase filesystem, raid or partition-table
+ signatures.
-config UTIL_LINUX_NG_SETTERM
- bool
- select UTIL_LINUX_NG_USES_NCURSES
- prompt "setterm"
- help
- setterm - set terminal attributes like terminal name, cursor
- blinking and beeper sound
+comment "schedutils"
config UTIL_LINUX_NG_CHRT
bool
@@ -343,25 +261,6 @@ config UTIL_LINUX_NG_CHRT
comment "BusyBox' chrt is selected!"
depends on BUSYBOX_CHRT
-config UTIL_LINUX_NG_HWCLOCK
- bool
- prompt "hwclock"
- depends on !BUSYBOX_HWCLOCK || ALLYES
- help
- hwclock - The hwclock utility is used to read and set the hardware
- clock on a system. This is primarily used to set the current time
- on shutdown in the hardware clock, so the hardware will keep the
- correct time when Linux is _not_ running.
-
-comment "BusyBox' hwclock is selected!"
- depends on BUSYBOX_HWCLOCK
-
-config UTIL_LINUX_NG_WDCTL
- bool
- prompt "wdctl"
- help
- wdctl - Utility to show hardware watchdog status.
-
config UTIL_LINUX_NG_IONICE
bool
prompt "ionice"
@@ -380,85 +279,131 @@ config UTIL_LINUX_NG_TASKSET
comment "BusyBox' taskset is selected!"
depends on BUSYBOX_TASKSET
-config UTIL_LINUX_NG_MCOOKIE
+comment "sys-utils"
+
+config UTIL_LINUX_NG_CHMEM
bool
- prompt "mcookie"
+ prompt "chmem"
help
- mcookie generates a 128-bit random hexadecimal number for
- use with the X authority system.
+ The chmem command sets a particular size or range of
+ memory online or offline.
-config UTIL_LINUX_NG_LDATTACH
+config UTIL_LINUX_NG_DMESG
bool
- prompt "ldattach"
+ depends on !BUSYBOX_DMESG || ALLYES
+ prompt "dmesg"
help
- attach a line discipline to a serial line
+ The dmesg utility.
-config UTIL_LINUX_NG_UUIDD
+comment "BusyBox' dmesg is selected!"
+ depends on BUSYBOX_DMESG
+
+config UTIL_LINUX_NG_FLOCK
bool
- select UTIL_LINUX_NG_LIBUUID
- prompt "uuidd"
+ prompt "flock"
+ depends on !BUSYBOX_FLOCK || ALLYES
help
- The uuidd daemon is used by the UUID library to generate
- universally unique identifiers (UUIDs), especially time-based UUIDs,
- in a secure and guaranteed- unique fashion, even in the face of large
- numbers of threads running on different CPUs trying to grab UUIDs.
+ The flock utility manages flock(2) locks from within
+ shell scripts or from the command line.
-config UTIL_LINUX_NG_UUIDGEN
+comment "BusyBox' flock is selected!"
+ depends on BUSYBOX_FLOCK
+
+config UTIL_LINUX_NG_FSFREEZE
bool
- select UTIL_LINUX_NG_LIBUUID
- prompt "uuidgen"
+ prompt "fsfreeze"
+ depends on !BUSYBOX_FSFREEZE || ALLYES
help
- uuidgen is a command-line utility to create a new UUID value.
+ fsfreeze suspends or resumes access to a filesystem.
-config UTIL_LINUX_NG_BLKID
+comment "BusyBox' fsfreeze is selected!"
+ depends on BUSYBOX_FSFREEZE
+
+config UTIL_LINUX_NG_FSTRIM
bool
- select UTIL_LINUX_NG_LIBBLKID
- depends on !BUSYBOX_BLKID || ALLYES
- prompt "blkid"
+ prompt "fstrim"
+ depends on !BUSYBOX_FSTRIM || ALLYES
help
- The blkid program is the command-line interface to working with libblkid
- library. It can determine the type of content (e.g. filesystem, swap)
- a block device holds, and also attributes (tokens, NAME=value pairs) from
- the content meta‐data (e.g. LABEL or UUID fields).
+ fstrim is used on a mounted filesystem to discard (or "trim")
+ blocks which are not in use by the filesystem. This is useful
+ for solid-state drives (SSDs) and thinly-provisioned storage.
-comment "BusyBox' blkid is selected!"
- depends on BUSYBOX_BLKID
+comment "BusyBox' fstrim is selected!"
+ depends on BUSYBOX_FSTRIM
-config UTIL_LINUX_NG_LSBLK
+config UTIL_LINUX_NG_HWCLOCK
bool
- select UTIL_LINUX_NG_LIBBLKID
- select UTIL_LINUX_NG_LIBMOUNT
- select UTIL_LINUX_NG_LIBSMARTCOLS
- prompt "lsblk"
+ prompt "hwclock"
+ depends on !BUSYBOX_HWCLOCK || ALLYES
help
- The lsblk command lists information about all available or the
- specified block devices.
+ hwclock - The hwclock utility is used to read and set the hardware
+ clock on a system. This is primarily used to set the current time
+ on shutdown in the hardware clock, so the hardware will keep the
+ correct time when Linux is _not_ running.
-config UTIL_LINUX_NG_FINDFS
+comment "BusyBox' hwclock is selected!"
+ depends on BUSYBOX_HWCLOCK
+
+config UTIL_LINUX_NG_IPCRM
bool
- select UTIL_LINUX_NG_LIBBLKID
- depends on !BUSYBOX_FINDFS || ALLYES
- prompt "findfs"
+ prompt "ipcrm"
+ depends on !BUSYBOX_IPCRM || ALLYES
help
- findfs will search the disks in the system looking for a filesystem
- which has a label matching label or a UUID equal to uuid.
+ ipcrm removes ipc facilities for which the calling process has
+ read access.
-comment "BusyBox' findfs is selected!"
- depends on BUSYBOX_FINDFS
+comment "BusyBox' ipcrm is selected!"
+ depends on BUSYBOX_IPCRM
-config UTIL_LINUX_NG_WIPEFS
+config UTIL_LINUX_NG_IPCS
bool
- select UTIL_LINUX_NG_LIBBLKID
- prompt "wipefs"
+ prompt "ipcs"
+ depends on !BUSYBOX_IPCS || ALLYES
help
- The wipefs program can erase filesystem, raid or partition-table
- signatures.
+ ipcs provides information on the ipc facilities
+ for which the calling process has read access.
-config UTIL_LINUX_NG_ZRAMCTL
+comment "BusyBox' ipcs is selected!"
+ depends on BUSYBOX_IPCS
+
+config UTIL_LINUX_NG_IRQTOP
bool
- prompt "zramctl"
+ select UTIL_LINUX_NG_USES_NCURSES
+ prompt "irqtop"
help
- The zramctl program is a tool to set up and control zram devices.
+ irqtop is a tool to observe irqs and softirqs in
+ a top like fashion.
+
+config UTIL_LINUX_NG_LDATTACH
+ bool
+ prompt "ldattach"
+ help
+ attach a line discipline to a serial line
+
+config UTIL_LINUX_NG_LOSETUP
+ bool
+ prompt "losetup"
+ select UTIL_LINUX_NG_LIBSMARTCOLS
+ depends on !BUSYBOX_LOSETUP || ALLYES
+ help
+ losetup is used to associate or detach a loop device with a regular
+ file or block device, and to query the status of a loop device.
+
+comment "BusyBox' losetup is selected!"
+ depends on BUSYBOX_LOSETUP
+
+config UTIL_LINUX_NG_LSCPU
+ bool
+ select UTIL_LINUX_NG_LIBSMARTCOLS
+ prompt "lscpu"
+ help
+ lscpu shows information about the CPU architecture
+
+config UTIL_LINUX_NG_LSIRQ
+ bool
+ prompt "lsirq"
+ help
+ lsirq is a tool to list kernel interrupt information.
config UTIL_LINUX_NG_LSMEM
bool
@@ -467,52 +412,74 @@ config UTIL_LINUX_NG_LSMEM
The lsmem command lists the ranges of available memory and
it's online status.
-config UTIL_LINUX_NG_CHMEM
+config UTIL_LINUX_NG_MOUNT
bool
- prompt "chmem"
+ prompt "mount"
+ select UTIL_LINUX_NG_LIBMOUNT
+ depends on !BUSYBOX_MOUNT || ALLYES
help
- The chmem command sets a particular size or range of
- memory online or offline.
+ The mount command serves to attach the file system
+ found on some device to the big file tree.
-config UTIL_LINUX_NG_MKFS
+comment "BusyBox' mount is selected!"
+ depends on BUSYBOX_MOUNT
+
+config UTIL_LINUX_NG_MOUNTPOINT
bool
- prompt "mkfs"
+ select UTIL_LINUX_NG_LIBMOUNT
+ depends on !BUSYBOX_MOUNTPOINT || ALLYES
+ prompt "mountpoint"
help
- The mkfs command is a generic wrapper for fs specific
- mkfs.* commands.
+ The mountpoint utility.
-config UTIL_LINUX_NG_LSCPU
+comment "BusyBox' mountpoint is selected!"
+ depends on BUSYBOX_MOUNTPOINT
+
+config UTIL_LINUX_NG_NSENTER
bool
- select UTIL_LINUX_NG_LIBSMARTCOLS
- prompt "lscpu"
+ prompt "nsenter"
help
- lscpu shows information about the CPU architecture
+ The nsenter utility
-config UTIL_LINUX_NG_LOGIN
+config UTIL_LINUX_NG_PIVOT_ROOT
bool
- select UTIL_LINUX_NG_USES_PAM
- depends on GLOBAL_PAM && ((!BUSYBOX_LOGIN && !SHADOW) || ALLYES)
- prompt "login"
+ depends on !BUSYBOX_PIVOT_ROOT
+ prompt "pivot_root"
help
- The login program is used to establish a new session with
- the system.
+ change the root filesystem.
-comment "BusyBox' login is selected!"
- depends on BUSYBOX_LOGIN
+comment "BusyBox' pivot_root is selected!"
+ depends on BUSYBOX_PIVOT_ROOT
-comment "Shadow package is selected!"
- depends on SHADOW
+config UTIL_LINUX_NG_READPROFILE
+ bool
+ prompt "readprofile"
+ depends on !BUSYBOX_READPROFILE || ALLYES
+ help
+ The readprofile command uses the /proc/profile information
+ to print ascii data on standard output. The output is
+ organized in three columns: the first is the number of
+ clock ticks, the second is the name of the C function
+ in the kernel where those many ticks occurred, and the
+ third is the normalized `load' of the procedure, calculated
+ as a ratio between the number of ticks and the length of the
+ procedure. The output is filled with blanks to ease readability.
-config UTIL_LINUX_NG_SULOGIN
+comment "BusyBox' readprofile is selected!"
+ depends on BUSYBOX_READPROFILE
+
+config UTIL_LINUX_NG_SWAPON
bool
- depends on !BUSYBOX_SULOGIN || ALLYES
- prompt "sulogin"
+ prompt "swapon"
+ select UTIL_LINUX_NG_LIBBLKID
+ select UTIL_LINUX_NG_LIBMOUNT
+ select UTIL_LINUX_NG_LIBSMARTCOLS
+ depends on !BUSYBOX_SWAPON || ALLYES
help
- sulogin is invoked by init when the system goes into
- single-user mode.
+ Swapon is used to specify devices on which paging and swapping are to take place.
-comment "BusyBox' sulogin is selected!"
- depends on BUSYBOX_SULOGIN
+comment "BusyBox' swapon is selected!"
+ depends on BUSYBOX_SWAPON
config UTIL_LINUX_NG_SWITCH_ROOT
bool
@@ -525,14 +492,61 @@ config UTIL_LINUX_NG_SWITCH_ROOT
comment "BusyBox' switch_root is selected!"
depends on BUSYBOX_SWITCH_ROOT
-config UTIL_LINUX_NG_PIVOT_ROOT
+config UTIL_LINUX_NG_UMOUNT
bool
- depends on !BUSYBOX_PIVOT_ROOT
- prompt "pivot_root"
+ prompt "umount"
+ select UTIL_LINUX_NG_MOUNT
+ depends on !BUSYBOX_MOUNT || ALLYES
+ depends on !BUSYBOX_UMOUNT || ALLYES
help
- change the root filesystem.
+ The mount(8) command serves to attach the file system
+ found on some device to the big file tree.
+ Conversely, the umount(8) command will detach it again.
-comment "BusyBox' pivot_root is selected!"
- depends on BUSYBOX_PIVOT_ROOT
+comment "BusyBox' umount is selected!"
+ depends on BUSYBOX_UMOUNT
+
+config UTIL_LINUX_NG_WDCTL
+ bool
+ prompt "wdctl"
+ help
+ wdctl - Utility to show hardware watchdog status.
+
+config UTIL_LINUX_NG_ZRAMCTL
+ bool
+ prompt "zramctl"
+ help
+ The zramctl program is a tool to set up and control zram devices.
+
+comment "term-utils"
+
+config UTIL_LINUX_NG_AGETTY
+ bool
+ prompt "agetty"
+ help
+ A small getty.
+
+config UTIL_LINUX_NG_SETTERM
+ bool
+ select UTIL_LINUX_NG_USES_NCURSES
+ prompt "setterm"
+ help
+ setterm - set terminal attributes like terminal name, cursor
+ blinking and beeper sound
+
+comment "text-utils"
+
+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.
endif
--
2.32.0
^ permalink raw reply [flat|nested] 3+ messages in thread
* [ptxdist] [PATCH 2/2] util-linux-ng: Use for loop to install libs and tools
2022-09-24 20:17 [ptxdist] [PATCH 1/2] util-linux-ng: Sort config entries Ladislav Michl
@ 2022-09-24 20:19 ` Ladislav Michl
2022-09-29 12:42 ` Michael Olbrich
0 siblings, 1 reply; 3+ messages in thread
From: Ladislav Michl @ 2022-09-24 20:19 UTC (permalink / raw)
To: ptxdist
From: Ladislav Michl <ladis@linux-mips.org>
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 <ladis@linux-mips.org>
---
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 <r.schwebel@pengutronix.de>")
@$(call install_fixup, util-linux-ng,DESCRIPTION,missing)
-ifdef PTXCONF_UTIL_LINUX_NG_LIBUUID
- @$(call install_lib, util-linux-ng, 0, 0, 0644, libuuid)
-endif
-ifdef PTXCONF_UTIL_LINUX_NG_LIBBLKID
- @$(call install_lib, util-linux-ng, 0, 0, 0644, libblkid)
-endif
-ifdef PTXCONF_UTIL_LINUX_NG_LIBMOUNT
- @$(call install_lib, util-linux-ng, 0, 0, 0644, libmount)
-endif
-ifdef PTXCONF_UTIL_LINUX_NG_LIBSMARTCOLS
- @$(call install_lib, util-linux-ng, 0, 0, 0644, libsmartcols)
-endif
-ifdef PTXCONF_UTIL_LINUX_NG_LIBFDISK
- @$(call install_lib, util-linux-ng, 0, 0, 0644, libfdisk)
-endif
+ @$(foreach lib, $(UTIL_LINUX_LIB-y), \
+ $(call install_lib, util-linux-ng, 0, 0, 0644, lib$(lib));)
-ifdef PTXCONF_UTIL_LINUX_NG_LSMEM
- @$(call install_copy, util-linux-ng, root, root, 0755, -, /usr/bin/lsmem)
-endif
-ifdef PTXCONF_UTIL_LINUX_NG_CHMEM
- @$(call install_copy, util-linux-ng, root, root, 0755, -, /usr/bin/chmem)
-endif
-ifdef PTXCONF_UTIL_LINUX_NG_COLUMN
- @$(call install_copy, util-linux-ng, root, root, 0755, -, /usr/bin/column)
-endif
-ifdef PTXCONF_UTIL_LINUX_NG_LINE
- @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/line)
-endif
-ifdef PTXCONF_UTIL_LINUX_NG_GETOPT
- @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/getopt)
-endif
-ifdef PTXCONF_UTIL_LINUX_NG_DMESG
- @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/dmesg)
-endif
-ifdef PTXCONF_UTIL_LINUX_NG_MOUNTPOINT
- @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/mountpoint)
-endif
-ifdef PTXCONF_UTIL_LINUX_NG_NSENTER
- @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/nsenter)
-endif
-ifdef PTXCONF_UTIL_LINUX_NG_ADDPART
- @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/addpart)
-endif
-ifdef PTXCONF_UTIL_LINUX_NG_DELPART
- @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/delpart)
-endif
-ifdef PTXCONF_UTIL_LINUX_NG_PARTX
- @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/partx)
-endif
-ifdef PTXCONF_UTIL_LINUX_NG_AGETTY
- @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/agetty)
-endif
-ifdef PTXCONF_UTIL_LINUX_NG_MKSWAP
- @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/mkswap)
-endif
-ifdef PTXCONF_UTIL_LINUX_NG_SWAPON
- @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/swapon)
- @$(call install_link, util-linux-ng, swapon, /usr/sbin/swapoff)
-endif
-ifdef PTXCONF_UTIL_LINUX_NG_LOSETUP
- @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/losetup)
-endif
-ifdef PTXCONF_UTIL_LINUX_NG_MOUNT
- @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/mount)
-endif
-ifdef PTXCONF_UTIL_LINUX_NG_UMOUNT
- @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/umount)
-endif
-ifdef PTXCONF_UTIL_LINUX_NG_FLOCK
- @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/flock)
-endif
-ifdef PTXCONF_UTIL_LINUX_NG_FSCK
- @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/fsck)
-endif
-ifdef PTXCONF_UTIL_LINUX_NG_FSFREEZE
- @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/fsfreeze)
-endif
-ifdef PTXCONF_UTIL_LINUX_NG_FSTRIM
- @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/fstrim)
-endif
-ifdef PTXCONF_UTIL_LINUX_NG_IPCS
- @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/ipcs)
-endif
-ifdef PTXCONF_UTIL_LINUX_NG_IRQTOP
- @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/irqtop)
-endif
-ifdef PTXCONF_UTIL_LINUX_NG_LSIRQ
- @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/lsirq)
-endif
-ifdef PTXCONF_UTIL_LINUX_NG_IPCRM
- @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/ipcrm)
-endif
-ifdef PTXCONF_UTIL_LINUX_NG_READPROFILE
- @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/readprofile)
-endif
-ifdef PTXCONF_UTIL_LINUX_NG_FDISK
- @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/fdisk)
-endif
-ifdef PTXCONF_UTIL_LINUX_NG_SFDISK
- @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/sfdisk)
-endif
-ifdef PTXCONF_UTIL_LINUX_NG_CFDISK
- @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/cfdisk)
-endif
-ifdef PTXCONF_UTIL_LINUX_NG_SETTERM
- @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/setterm)
-endif
-ifdef PTXCONF_UTIL_LINUX_NG_CHRT
- @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/chrt)
-endif
-ifdef PTXCONF_UTIL_LINUX_NG_HWCLOCK
- @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/hwclock)
-endif
-ifdef PTXCONF_UTIL_LINUX_NG_WDCTL
- @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/wdctl)
-endif
-ifdef PTXCONF_UTIL_LINUX_NG_IONICE
- @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/ionice)
-endif
-ifdef PTXCONF_UTIL_LINUX_NG_TASKSET
- @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/taskset)
-endif
-ifdef PTXCONF_UTIL_LINUX_NG_MCOOKIE
- @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/mcookie)
-endif
-ifdef PTXCONF_UTIL_LINUX_NG_LDATTACH
- @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/ldattach)
-endif
-ifdef PTXCONF_UTIL_LINUX_NG_BLKID
- @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/blkid)
-endif
-ifdef PTXCONF_UTIL_LINUX_NG_LSBLK
- @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/lsblk)
-endif
-ifdef PTXCONF_UTIL_LINUX_NG_UUIDD
- @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/uuidd)
-endif
-ifdef PTXCONF_UTIL_LINUX_NG_UUIDGEN
- @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/uuidgen)
-endif
-ifdef PTXCONF_UTIL_LINUX_NG_FINDFS
- @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/findfs)
-endif
-ifdef PTXCONF_UTIL_LINUX_NG_WIPEFS
- @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/wipefs)
-endif
-ifdef PTXCONF_UTIL_LINUX_NG_ZRAMCTL
- @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/zramctl)
-endif
-ifdef PTXCONF_UTIL_LINUX_NG_MKFS
- @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/mkfs)
-endif
-ifdef PTXCONF_UTIL_LINUX_NG_LSCPU
- @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/lscpu)
-endif
-ifdef PTXCONF_UTIL_LINUX_NG_LOGIN
- @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/login)
-endif
-ifdef PTXCONF_UTIL_LINUX_NG_SULOGIN
- @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/sulogin)
-endif
-ifdef PTXCONF_UTIL_LINUX_NG_SWITCH_ROOT
- @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/switch_root)
-endif
-ifdef PTXCONF_UTIL_LINUX_NG_PIVOT_ROOT
- @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/pivot_root)
-endif
+ @$(foreach tool, $(UTIL_LINUX_BIN-y), \
+ $(call install_copy, util-linux-ng, 0, 0, 0755, -, \
+ /usr/$(tool));)
@$(call install_finish, util-linux-ng)
--
2.32.0
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [ptxdist] [PATCH 2/2] util-linux-ng: Use for loop to install libs and tools
2022-09-24 20:19 ` [ptxdist] [PATCH 2/2] util-linux-ng: Use for loop to install libs and tools Ladislav Michl
@ 2022-09-29 12:42 ` Michael Olbrich
0 siblings, 0 replies; 3+ messages in thread
From: Michael Olbrich @ 2022-09-29 12:42 UTC (permalink / raw)
To: Ladislav Michl; +Cc: ptxdist
On Sat, Sep 24, 2022 at 10:19:42PM +0200, Ladislav Michl wrote:
> From: Ladislav Michl <ladis@linux-mips.org>
> 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 <ladis@linux-mips.org>
> ---
> 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 <r.schwebel@pengutronix.de>")
> @$(call install_fixup, util-linux-ng,DESCRIPTION,missing)
>
> -ifdef PTXCONF_UTIL_LINUX_NG_LIBUUID
> - @$(call install_lib, util-linux-ng, 0, 0, 0644, libuuid)
> -endif
> -ifdef PTXCONF_UTIL_LINUX_NG_LIBBLKID
> - @$(call install_lib, util-linux-ng, 0, 0, 0644, libblkid)
> -endif
> -ifdef PTXCONF_UTIL_LINUX_NG_LIBMOUNT
> - @$(call install_lib, util-linux-ng, 0, 0, 0644, libmount)
> -endif
> -ifdef PTXCONF_UTIL_LINUX_NG_LIBSMARTCOLS
> - @$(call install_lib, util-linux-ng, 0, 0, 0644, libsmartcols)
> -endif
> -ifdef PTXCONF_UTIL_LINUX_NG_LIBFDISK
> - @$(call install_lib, util-linux-ng, 0, 0, 0644, libfdisk)
> -endif
> + @$(foreach lib, $(UTIL_LINUX_LIB-y), \
> + $(call install_lib, util-linux-ng, 0, 0, 0644, lib$(lib));)
Use $(ptx/nl) instead of ; please.
>
> -ifdef PTXCONF_UTIL_LINUX_NG_LSMEM
> - @$(call install_copy, util-linux-ng, root, root, 0755, -, /usr/bin/lsmem)
> -endif
> -ifdef PTXCONF_UTIL_LINUX_NG_CHMEM
> - @$(call install_copy, util-linux-ng, root, root, 0755, -, /usr/bin/chmem)
> -endif
> -ifdef PTXCONF_UTIL_LINUX_NG_COLUMN
> - @$(call install_copy, util-linux-ng, root, root, 0755, -, /usr/bin/column)
> -endif
> -ifdef PTXCONF_UTIL_LINUX_NG_LINE
> - @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/line)
> -endif
> -ifdef PTXCONF_UTIL_LINUX_NG_GETOPT
> - @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/getopt)
> -endif
> -ifdef PTXCONF_UTIL_LINUX_NG_DMESG
> - @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/dmesg)
> -endif
> -ifdef PTXCONF_UTIL_LINUX_NG_MOUNTPOINT
> - @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/mountpoint)
> -endif
> -ifdef PTXCONF_UTIL_LINUX_NG_NSENTER
> - @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/nsenter)
> -endif
> -ifdef PTXCONF_UTIL_LINUX_NG_ADDPART
> - @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/addpart)
> -endif
> -ifdef PTXCONF_UTIL_LINUX_NG_DELPART
> - @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/delpart)
> -endif
> -ifdef PTXCONF_UTIL_LINUX_NG_PARTX
> - @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/partx)
> -endif
> -ifdef PTXCONF_UTIL_LINUX_NG_AGETTY
> - @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/agetty)
> -endif
> -ifdef PTXCONF_UTIL_LINUX_NG_MKSWAP
> - @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/mkswap)
> -endif
> -ifdef PTXCONF_UTIL_LINUX_NG_SWAPON
> - @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/swapon)
> - @$(call install_link, util-linux-ng, swapon, /usr/sbin/swapoff)
> -endif
> -ifdef PTXCONF_UTIL_LINUX_NG_LOSETUP
> - @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/losetup)
> -endif
> -ifdef PTXCONF_UTIL_LINUX_NG_MOUNT
> - @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/mount)
> -endif
> -ifdef PTXCONF_UTIL_LINUX_NG_UMOUNT
> - @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/umount)
> -endif
> -ifdef PTXCONF_UTIL_LINUX_NG_FLOCK
> - @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/flock)
> -endif
> -ifdef PTXCONF_UTIL_LINUX_NG_FSCK
> - @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/fsck)
> -endif
> -ifdef PTXCONF_UTIL_LINUX_NG_FSFREEZE
> - @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/fsfreeze)
> -endif
> -ifdef PTXCONF_UTIL_LINUX_NG_FSTRIM
> - @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/fstrim)
> -endif
> -ifdef PTXCONF_UTIL_LINUX_NG_IPCS
> - @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/ipcs)
> -endif
> -ifdef PTXCONF_UTIL_LINUX_NG_IRQTOP
> - @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/irqtop)
> -endif
> -ifdef PTXCONF_UTIL_LINUX_NG_LSIRQ
> - @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/lsirq)
> -endif
> -ifdef PTXCONF_UTIL_LINUX_NG_IPCRM
> - @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/ipcrm)
> -endif
> -ifdef PTXCONF_UTIL_LINUX_NG_READPROFILE
> - @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/readprofile)
> -endif
> -ifdef PTXCONF_UTIL_LINUX_NG_FDISK
> - @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/fdisk)
> -endif
> -ifdef PTXCONF_UTIL_LINUX_NG_SFDISK
> - @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/sfdisk)
> -endif
> -ifdef PTXCONF_UTIL_LINUX_NG_CFDISK
> - @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/cfdisk)
> -endif
> -ifdef PTXCONF_UTIL_LINUX_NG_SETTERM
> - @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/setterm)
> -endif
> -ifdef PTXCONF_UTIL_LINUX_NG_CHRT
> - @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/chrt)
> -endif
> -ifdef PTXCONF_UTIL_LINUX_NG_HWCLOCK
> - @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/hwclock)
> -endif
> -ifdef PTXCONF_UTIL_LINUX_NG_WDCTL
> - @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/wdctl)
> -endif
> -ifdef PTXCONF_UTIL_LINUX_NG_IONICE
> - @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/ionice)
> -endif
> -ifdef PTXCONF_UTIL_LINUX_NG_TASKSET
> - @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/taskset)
> -endif
> -ifdef PTXCONF_UTIL_LINUX_NG_MCOOKIE
> - @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/mcookie)
> -endif
> -ifdef PTXCONF_UTIL_LINUX_NG_LDATTACH
> - @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/ldattach)
> -endif
> -ifdef PTXCONF_UTIL_LINUX_NG_BLKID
> - @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/blkid)
> -endif
> -ifdef PTXCONF_UTIL_LINUX_NG_LSBLK
> - @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/lsblk)
> -endif
> -ifdef PTXCONF_UTIL_LINUX_NG_UUIDD
> - @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/uuidd)
> -endif
> -ifdef PTXCONF_UTIL_LINUX_NG_UUIDGEN
> - @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/uuidgen)
> -endif
> -ifdef PTXCONF_UTIL_LINUX_NG_FINDFS
> - @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/findfs)
> -endif
> -ifdef PTXCONF_UTIL_LINUX_NG_WIPEFS
> - @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/wipefs)
> -endif
> -ifdef PTXCONF_UTIL_LINUX_NG_ZRAMCTL
> - @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/zramctl)
> -endif
> -ifdef PTXCONF_UTIL_LINUX_NG_MKFS
> - @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/mkfs)
> -endif
> -ifdef PTXCONF_UTIL_LINUX_NG_LSCPU
> - @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/lscpu)
> -endif
> -ifdef PTXCONF_UTIL_LINUX_NG_LOGIN
> - @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/login)
> -endif
> -ifdef PTXCONF_UTIL_LINUX_NG_SULOGIN
> - @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/sulogin)
> -endif
> -ifdef PTXCONF_UTIL_LINUX_NG_SWITCH_ROOT
> - @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/switch_root)
> -endif
> -ifdef PTXCONF_UTIL_LINUX_NG_PIVOT_ROOT
> - @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/pivot_root)
> -endif
> + @$(foreach tool, $(UTIL_LINUX_BIN-y), \
> + $(call install_copy, util-linux-ng, 0, 0, 0755, -, \
> + /usr/$(tool));)
Same here.
Michael
>
> @$(call install_finish, util-linux-ng)
>
> --
> 2.32.0
>
>
>
--
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-5555 |
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-09-29 12:43 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-24 20:17 [ptxdist] [PATCH 1/2] util-linux-ng: Sort config entries Ladislav Michl
2022-09-24 20:19 ` [ptxdist] [PATCH 2/2] util-linux-ng: Use for loop to install libs and tools Ladislav Michl
2022-09-29 12:42 ` Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox