From be86489b161442d81e757aa333ddbc5c9c1022b3 Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Fri, 22 Aug 2025 12:55:53 -0500 Subject: [PATCH] Update prerequisite build. --- scripts/prereq/generated/config.h | 394 +++++++++++++++++++++++++++-- scripts/prereq/generated/flags.h | 4 +- scripts/prereq/generated/help.h | 2 +- scripts/prereq/generated/newtoys.h | 36 +-- scripts/recreate-prereq.sh | 6 +- 5 files changed, 396 insertions(+), 46 deletions(-) diff --git a/scripts/prereq/generated/config.h b/scripts/prereq/generated/config.h index 60c87b5b..0da29fc5 100644 --- a/scripts/prereq/generated/config.h +++ b/scripts/prereq/generated/config.h @@ -1,706 +1,1052 @@ #define CFG_TOYBOX_ON_ANDROID 0 #define USE_TOYBOX_ON_ANDROID(...) +#define SKIP_TOYBOX_ON_ANDROID(...) __VA_ARGS__ #define CFG_TOYBOX_FORK 1 #define USE_TOYBOX_FORK(...) __VA_ARGS__ +#define SKIP_TOYBOX_FORK(...) #define CFG_BASENAME 1 #define USE_BASENAME(...) __VA_ARGS__ +#define SKIP_BASENAME(...) #define CFG_CAL 0 #define USE_CAL(...) +#define SKIP_CAL(...) __VA_ARGS__ #define CFG_CAT 1 #define USE_CAT(...) __VA_ARGS__ +#define SKIP_CAT(...) #define CFG_CHGRP 0 #define USE_CHGRP(...) +#define SKIP_CHGRP(...) __VA_ARGS__ #define CFG_CHOWN 0 #define USE_CHOWN(...) +#define SKIP_CHOWN(...) __VA_ARGS__ #define CFG_CHMOD 1 #define USE_CHMOD(...) __VA_ARGS__ +#define SKIP_CHMOD(...) #define CFG_CKSUM 0 #define USE_CKSUM(...) +#define SKIP_CKSUM(...) __VA_ARGS__ #define CFG_CRC32 0 #define USE_CRC32(...) +#define SKIP_CRC32(...) __VA_ARGS__ #define CFG_CMP 1 #define USE_CMP(...) __VA_ARGS__ +#define SKIP_CMP(...) #define CFG_COMM 0 #define USE_COMM(...) +#define SKIP_COMM(...) __VA_ARGS__ #define CFG_CP 0 #define USE_CP(...) +#define SKIP_CP(...) __VA_ARGS__ #define CFG_MV 0 #define USE_MV(...) +#define SKIP_MV(...) __VA_ARGS__ #define CFG_INSTALL 0 #define USE_INSTALL(...) +#define SKIP_INSTALL(...) __VA_ARGS__ #define CFG_CPIO 0 #define USE_CPIO(...) +#define SKIP_CPIO(...) __VA_ARGS__ #define CFG_CUT 0 #define USE_CUT(...) +#define SKIP_CUT(...) __VA_ARGS__ #define CFG_DATE 0 #define USE_DATE(...) +#define SKIP_DATE(...) __VA_ARGS__ #define CFG_DD 0 #define USE_DD(...) +#define SKIP_DD(...) __VA_ARGS__ #define CFG_DF 0 #define USE_DF(...) +#define SKIP_DF(...) __VA_ARGS__ #define CFG_DIRNAME 1 #define USE_DIRNAME(...) __VA_ARGS__ +#define SKIP_DIRNAME(...) #define CFG_DU 0 #define USE_DU(...) +#define SKIP_DU(...) __VA_ARGS__ #define CFG_ECHO 1 #define USE_ECHO(...) __VA_ARGS__ +#define SKIP_ECHO(...) #define CFG_ENV 0 #define USE_ENV(...) +#define SKIP_ENV(...) __VA_ARGS__ #define CFG_EXPAND 0 #define USE_EXPAND(...) +#define SKIP_EXPAND(...) __VA_ARGS__ #define CFG_FALSE 0 #define USE_FALSE(...) +#define SKIP_FALSE(...) __VA_ARGS__ #define CFG_FILE 0 #define USE_FILE(...) +#define SKIP_FILE(...) __VA_ARGS__ #define CFG_FIND 0 #define USE_FIND(...) +#define SKIP_FIND(...) __VA_ARGS__ #define CFG_FOLD 1 #define USE_FOLD(...) __VA_ARGS__ +#define SKIP_FOLD(...) #define CFG_GETCONF 0 #define USE_GETCONF(...) +#define SKIP_GETCONF(...) __VA_ARGS__ #define CFG_GREP 1 #define USE_GREP(...) __VA_ARGS__ +#define SKIP_GREP(...) #define CFG_EGREP 1 #define USE_EGREP(...) __VA_ARGS__ +#define SKIP_EGREP(...) #define CFG_FGREP 1 #define USE_FGREP(...) __VA_ARGS__ +#define SKIP_FGREP(...) #define CFG_HEAD 1 #define USE_HEAD(...) __VA_ARGS__ +#define SKIP_HEAD(...) #define CFG_ICONV 0 #define USE_ICONV(...) +#define SKIP_ICONV(...) __VA_ARGS__ #define CFG_ID 0 #define USE_ID(...) -#define CFG_ID_Z 0 -#define USE_ID_Z(...) +#define SKIP_ID(...) __VA_ARGS__ #define CFG_GROUPS 0 #define USE_GROUPS(...) +#define SKIP_GROUPS(...) __VA_ARGS__ #define CFG_LOGNAME 0 #define USE_LOGNAME(...) +#define SKIP_LOGNAME(...) __VA_ARGS__ #define CFG_WHOAMI 0 #define USE_WHOAMI(...) +#define SKIP_WHOAMI(...) __VA_ARGS__ #define CFG_KILL 0 #define USE_KILL(...) +#define SKIP_KILL(...) __VA_ARGS__ #define CFG_KILLALL5 0 #define USE_KILLALL5(...) +#define SKIP_KILLALL5(...) __VA_ARGS__ #define CFG_LINK 0 #define USE_LINK(...) +#define SKIP_LINK(...) __VA_ARGS__ #define CFG_LN 1 #define USE_LN(...) __VA_ARGS__ +#define SKIP_LN(...) #define CFG_LOGGER 0 #define USE_LOGGER(...) +#define SKIP_LOGGER(...) __VA_ARGS__ #define CFG_LS 1 #define USE_LS(...) __VA_ARGS__ +#define SKIP_LS(...) #define CFG_MKDIR 1 #define USE_MKDIR(...) __VA_ARGS__ -#define CFG_MKDIR_Z 0 -#define USE_MKDIR_Z(...) +#define SKIP_MKDIR(...) #define CFG_MKFIFO 0 #define USE_MKFIFO(...) -#define CFG_MKFIFO_Z 0 -#define USE_MKFIFO_Z(...) +#define SKIP_MKFIFO(...) __VA_ARGS__ #define CFG_NICE 0 #define USE_NICE(...) +#define SKIP_NICE(...) __VA_ARGS__ #define CFG_NL 0 #define USE_NL(...) +#define SKIP_NL(...) __VA_ARGS__ #define CFG_NOHUP 0 #define USE_NOHUP(...) +#define SKIP_NOHUP(...) __VA_ARGS__ #define CFG_OD 1 #define USE_OD(...) __VA_ARGS__ +#define SKIP_OD(...) #define CFG_PASTE 0 #define USE_PASTE(...) +#define SKIP_PASTE(...) __VA_ARGS__ #define CFG_PATCH 0 #define USE_PATCH(...) +#define SKIP_PATCH(...) __VA_ARGS__ #define CFG_PRINTF 0 #define USE_PRINTF(...) +#define SKIP_PRINTF(...) __VA_ARGS__ #define CFG_PS 0 #define USE_PS(...) +#define SKIP_PS(...) __VA_ARGS__ #define CFG_TOP 0 #define USE_TOP(...) +#define SKIP_TOP(...) __VA_ARGS__ #define CFG_IOTOP 0 #define USE_IOTOP(...) +#define SKIP_IOTOP(...) __VA_ARGS__ #define CFG_PGREP 0 #define USE_PGREP(...) +#define SKIP_PGREP(...) __VA_ARGS__ #define CFG_PKILL 0 #define USE_PKILL(...) +#define SKIP_PKILL(...) __VA_ARGS__ #define CFG_PWD 0 #define USE_PWD(...) +#define SKIP_PWD(...) __VA_ARGS__ #define CFG_RENICE 0 #define USE_RENICE(...) +#define SKIP_RENICE(...) __VA_ARGS__ #define CFG_RM 1 #define USE_RM(...) __VA_ARGS__ +#define SKIP_RM(...) #define CFG_RMDIR 0 #define USE_RMDIR(...) +#define SKIP_RMDIR(...) __VA_ARGS__ #define CFG_SED 1 #define USE_SED(...) __VA_ARGS__ +#define SKIP_SED(...) #define CFG_SLEEP 0 #define USE_SLEEP(...) +#define SKIP_SLEEP(...) __VA_ARGS__ #define CFG_SORT 1 #define USE_SORT(...) __VA_ARGS__ -#define CFG_SORT_FLOAT 0 -#define USE_SORT_FLOAT(...) +#define SKIP_SORT(...) #define CFG_SPLIT 0 #define USE_SPLIT(...) +#define SKIP_SPLIT(...) __VA_ARGS__ #define CFG_STRINGS 0 #define USE_STRINGS(...) +#define SKIP_STRINGS(...) __VA_ARGS__ #define CFG_TAIL 1 #define USE_TAIL(...) __VA_ARGS__ +#define SKIP_TAIL(...) #define CFG_TAR 0 #define USE_TAR(...) +#define SKIP_TAR(...) __VA_ARGS__ #define CFG_TEE 1 #define USE_TEE(...) __VA_ARGS__ +#define SKIP_TEE(...) #define CFG_TEST 0 #define USE_TEST(...) +#define SKIP_TEST(...) __VA_ARGS__ #define CFG_TEST_GLUE 0 #define USE_TEST_GLUE(...) +#define SKIP_TEST_GLUE(...) __VA_ARGS__ #define CFG_TIME 0 #define USE_TIME(...) +#define SKIP_TIME(...) __VA_ARGS__ #define CFG_TOUCH 0 #define USE_TOUCH(...) +#define SKIP_TOUCH(...) __VA_ARGS__ #define CFG_TRUE 0 #define USE_TRUE(...) +#define SKIP_TRUE(...) __VA_ARGS__ #define CFG_TSORT 0 #define USE_TSORT(...) +#define SKIP_TSORT(...) __VA_ARGS__ #define CFG_TTY 0 #define USE_TTY(...) +#define SKIP_TTY(...) __VA_ARGS__ #define CFG_ULIMIT 0 #define USE_ULIMIT(...) +#define SKIP_ULIMIT(...) __VA_ARGS__ #define CFG_ARCH 0 #define USE_ARCH(...) +#define SKIP_ARCH(...) __VA_ARGS__ #define CFG_UNAME 1 #define USE_UNAME(...) __VA_ARGS__ +#define SKIP_UNAME(...) #define CFG_UNIQ 0 #define USE_UNIQ(...) +#define SKIP_UNIQ(...) __VA_ARGS__ #define CFG_UNLINK 0 #define USE_UNLINK(...) +#define SKIP_UNLINK(...) __VA_ARGS__ #define CFG_UUDECODE 0 #define USE_UUDECODE(...) +#define SKIP_UUDECODE(...) __VA_ARGS__ #define CFG_UUENCODE 0 #define USE_UUENCODE(...) +#define SKIP_UUENCODE(...) __VA_ARGS__ #define CFG_WC 1 #define USE_WC(...) __VA_ARGS__ +#define SKIP_WC(...) #define CFG_WHO 0 #define USE_WHO(...) +#define SKIP_WHO(...) __VA_ARGS__ #define CFG_XARGS 1 #define USE_XARGS(...) __VA_ARGS__ +#define SKIP_XARGS(...) #define CFG_ARP 0 #define USE_ARP(...) +#define SKIP_ARP(...) __VA_ARGS__ #define CFG_ARPING 0 #define USE_ARPING(...) +#define SKIP_ARPING(...) __VA_ARGS__ +#define CFG_AWK 0 +#define USE_AWK(...) +#define SKIP_AWK(...) __VA_ARGS__ #define CFG_BC 0 #define USE_BC(...) +#define SKIP_BC(...) __VA_ARGS__ #define CFG_BOOTCHARTD 0 #define USE_BOOTCHARTD(...) +#define SKIP_BOOTCHARTD(...) __VA_ARGS__ #define CFG_BRCTL 0 #define USE_BRCTL(...) +#define SKIP_BRCTL(...) __VA_ARGS__ #define CFG_CHSH 0 #define USE_CHSH(...) +#define SKIP_CHSH(...) __VA_ARGS__ #define CFG_CROND 0 #define USE_CROND(...) +#define SKIP_CROND(...) __VA_ARGS__ #define CFG_CRONTAB 0 #define USE_CRONTAB(...) +#define SKIP_CRONTAB(...) __VA_ARGS__ #define CFG_CSPLIT 0 #define USE_CSPLIT(...) +#define SKIP_CSPLIT(...) __VA_ARGS__ #define CFG_DHCP 0 #define USE_DHCP(...) +#define SKIP_DHCP(...) __VA_ARGS__ #define CFG_DHCP6 0 #define USE_DHCP6(...) +#define SKIP_DHCP6(...) __VA_ARGS__ #define CFG_DHCPD 0 #define USE_DHCPD(...) +#define SKIP_DHCPD(...) __VA_ARGS__ #define CFG_DEBUG_DHCP 0 #define USE_DEBUG_DHCP(...) +#define SKIP_DEBUG_DHCP(...) __VA_ARGS__ #define CFG_DIFF 0 #define USE_DIFF(...) +#define SKIP_DIFF(...) __VA_ARGS__ #define CFG_DUMPLEASES 0 #define USE_DUMPLEASES(...) +#define SKIP_DUMPLEASES(...) __VA_ARGS__ #define CFG_EXPR 0 #define USE_EXPR(...) +#define SKIP_EXPR(...) __VA_ARGS__ #define CFG_FDISK 0 #define USE_FDISK(...) +#define SKIP_FDISK(...) __VA_ARGS__ #define CFG_FSCK 0 #define USE_FSCK(...) +#define SKIP_FSCK(...) __VA_ARGS__ #define CFG_GETFATTR 0 #define USE_GETFATTR(...) +#define SKIP_GETFATTR(...) __VA_ARGS__ #define CFG_GETTY 0 #define USE_GETTY(...) +#define SKIP_GETTY(...) __VA_ARGS__ #define CFG_GITCOMPAT 0 #define USE_GITCOMPAT(...) +#define SKIP_GITCOMPAT(...) __VA_ARGS__ #define CFG_GITCLONE 0 #define USE_GITCLONE(...) +#define SKIP_GITCLONE(...) __VA_ARGS__ #define CFG_GITINIT 0 #define USE_GITINIT(...) +#define SKIP_GITINIT(...) __VA_ARGS__ #define CFG_GITREMOTE 0 #define USE_GITREMOTE(...) +#define SKIP_GITREMOTE(...) __VA_ARGS__ #define CFG_GITFETCH 0 #define USE_GITFETCH(...) +#define SKIP_GITFETCH(...) __VA_ARGS__ #define CFG_GITCHECKOUT 0 #define USE_GITCHECKOUT(...) +#define SKIP_GITCHECKOUT(...) __VA_ARGS__ #define CFG_GROUPADD 0 #define USE_GROUPADD(...) +#define SKIP_GROUPADD(...) __VA_ARGS__ #define CFG_GROUPDEL 0 #define USE_GROUPDEL(...) +#define SKIP_GROUPDEL(...) __VA_ARGS__ #define CFG_HEXDUMP 0 #define USE_HEXDUMP(...) -#define CFG_HD 0 -#define USE_HD(...) +#define SKIP_HEXDUMP(...) __VA_ARGS__ #define CFG_INIT 0 #define USE_INIT(...) +#define SKIP_INIT(...) __VA_ARGS__ #define CFG_IP 0 #define USE_IP(...) +#define SKIP_IP(...) __VA_ARGS__ #define CFG_IPCRM 0 #define USE_IPCRM(...) +#define SKIP_IPCRM(...) __VA_ARGS__ #define CFG_IPCS 0 #define USE_IPCS(...) +#define SKIP_IPCS(...) __VA_ARGS__ #define CFG_KLOGD 0 #define USE_KLOGD(...) -#define CFG_KLOGD_SOURCE_RING_BUFFER 0 -#define USE_KLOGD_SOURCE_RING_BUFFER(...) +#define SKIP_KLOGD(...) __VA_ARGS__ #define CFG_LAST 0 #define USE_LAST(...) +#define SKIP_LAST(...) __VA_ARGS__ #define CFG_LSOF 0 #define USE_LSOF(...) +#define SKIP_LSOF(...) __VA_ARGS__ #define CFG_MAN 0 #define USE_MAN(...) +#define SKIP_MAN(...) __VA_ARGS__ #define CFG_MDEV 0 #define USE_MDEV(...) +#define SKIP_MDEV(...) __VA_ARGS__ #define CFG_MDEV_CONF 0 #define USE_MDEV_CONF(...) -#define CFG_MKE2FS 0 -#define USE_MKE2FS(...) -#define CFG_MKE2FS_JOURNAL 0 -#define USE_MKE2FS_JOURNAL(...) -#define CFG_MKE2FS_GEN 0 -#define USE_MKE2FS_GEN(...) -#define CFG_MKE2FS_LABEL 0 -#define USE_MKE2FS_LABEL(...) -#define CFG_MKE2FS_EXTENDED 0 -#define USE_MKE2FS_EXTENDED(...) +#define SKIP_MDEV_CONF(...) __VA_ARGS__ #define CFG_MODPROBE 0 #define USE_MODPROBE(...) +#define SKIP_MODPROBE(...) __VA_ARGS__ #define CFG_MORE 0 #define USE_MORE(...) +#define SKIP_MORE(...) __VA_ARGS__ #define CFG_ROUTE 0 #define USE_ROUTE(...) +#define SKIP_ROUTE(...) __VA_ARGS__ #define CFG_SH 0 #define USE_SH(...) +#define SKIP_SH(...) __VA_ARGS__ +#define CFG_ALIAS 0 +#define USE_ALIAS(...) +#define SKIP_ALIAS(...) __VA_ARGS__ +#define CFG_BREAK 0 +#define USE_BREAK(...) +#define SKIP_BREAK(...) __VA_ARGS__ #define CFG_CD 0 #define USE_CD(...) +#define SKIP_CD(...) __VA_ARGS__ +#define CFG_CONTINUE 0 +#define USE_CONTINUE(...) +#define SKIP_CONTINUE(...) __VA_ARGS__ #define CFG_DECLARE 0 #define USE_DECLARE(...) +#define SKIP_DECLARE(...) __VA_ARGS__ #define CFG_EXIT 0 #define USE_EXIT(...) +#define SKIP_EXIT(...) __VA_ARGS__ #define CFG_SET 0 #define USE_SET(...) +#define SKIP_SET(...) __VA_ARGS__ #define CFG_UNSET 0 #define USE_UNSET(...) +#define SKIP_UNSET(...) __VA_ARGS__ #define CFG_EVAL 0 #define USE_EVAL(...) +#define SKIP_EVAL(...) __VA_ARGS__ #define CFG_EXEC 0 #define USE_EXEC(...) +#define SKIP_EXEC(...) __VA_ARGS__ #define CFG_EXPORT 0 #define USE_EXPORT(...) +#define SKIP_EXPORT(...) __VA_ARGS__ #define CFG_JOBS 0 #define USE_JOBS(...) +#define SKIP_JOBS(...) __VA_ARGS__ #define CFG_LOCAL 0 #define USE_LOCAL(...) +#define SKIP_LOCAL(...) __VA_ARGS__ +#define CFG_RETURN 0 +#define USE_RETURN(...) +#define SKIP_RETURN(...) __VA_ARGS__ #define CFG_SHIFT 0 #define USE_SHIFT(...) +#define SKIP_SHIFT(...) __VA_ARGS__ #define CFG_SOURCE 0 #define USE_SOURCE(...) +#define SKIP_SOURCE(...) __VA_ARGS__ +#define CFG_TRAP 0 +#define USE_TRAP(...) +#define SKIP_TRAP(...) __VA_ARGS__ +#define CFG_UNALIAS 0 +#define USE_UNALIAS(...) +#define SKIP_UNALIAS(...) __VA_ARGS__ #define CFG_WAIT 0 #define USE_WAIT(...) +#define SKIP_WAIT(...) __VA_ARGS__ #define CFG_STRACE 0 #define USE_STRACE(...) +#define SKIP_STRACE(...) __VA_ARGS__ #define CFG_STTY 0 #define USE_STTY(...) +#define SKIP_STTY(...) __VA_ARGS__ #define CFG_SULOGIN 0 #define USE_SULOGIN(...) +#define SKIP_SULOGIN(...) __VA_ARGS__ #define CFG_SYSLOGD 0 #define USE_SYSLOGD(...) +#define SKIP_SYSLOGD(...) __VA_ARGS__ #define CFG_TCPSVD 0 #define USE_TCPSVD(...) +#define SKIP_TCPSVD(...) __VA_ARGS__ #define CFG_TELNET 0 #define USE_TELNET(...) +#define SKIP_TELNET(...) __VA_ARGS__ #define CFG_TELNETD 0 #define USE_TELNETD(...) +#define SKIP_TELNETD(...) __VA_ARGS__ #define CFG_TFTP 0 #define USE_TFTP(...) +#define SKIP_TFTP(...) __VA_ARGS__ #define CFG_TFTPD 0 #define USE_TFTPD(...) +#define SKIP_TFTPD(...) __VA_ARGS__ #define CFG_TR 1 #define USE_TR(...) __VA_ARGS__ +#define SKIP_TR(...) #define CFG_TRACEROUTE 0 #define USE_TRACEROUTE(...) +#define SKIP_TRACEROUTE(...) __VA_ARGS__ #define CFG_USERADD 0 #define USE_USERADD(...) +#define SKIP_USERADD(...) __VA_ARGS__ #define CFG_USERDEL 0 #define USE_USERDEL(...) +#define SKIP_USERDEL(...) __VA_ARGS__ #define CFG_VI 0 #define USE_VI(...) +#define SKIP_VI(...) __VA_ARGS__ #define CFG_XZCAT 0 #define USE_XZCAT(...) +#define SKIP_XZCAT(...) __VA_ARGS__ #define CFG_ACPI 0 #define USE_ACPI(...) +#define SKIP_ACPI(...) __VA_ARGS__ #define CFG_ASCII 0 #define USE_ASCII(...) +#define SKIP_ASCII(...) __VA_ARGS__ #define CFG_UNICODE 0 #define USE_UNICODE(...) +#define SKIP_UNICODE(...) __VA_ARGS__ #define CFG_BASE64 0 #define USE_BASE64(...) +#define SKIP_BASE64(...) __VA_ARGS__ #define CFG_BASE32 0 #define USE_BASE32(...) +#define SKIP_BASE32(...) __VA_ARGS__ #define CFG_BLKDISCARD 0 #define USE_BLKDISCARD(...) +#define SKIP_BLKDISCARD(...) __VA_ARGS__ #define CFG_BLKID 0 #define USE_BLKID(...) +#define SKIP_BLKID(...) __VA_ARGS__ #define CFG_FSTYPE 0 #define USE_FSTYPE(...) +#define SKIP_FSTYPE(...) __VA_ARGS__ #define CFG_BLOCKDEV 0 #define USE_BLOCKDEV(...) +#define SKIP_BLOCKDEV(...) __VA_ARGS__ #define CFG_BUNZIP2 0 #define USE_BUNZIP2(...) +#define SKIP_BUNZIP2(...) __VA_ARGS__ #define CFG_BZCAT 0 #define USE_BZCAT(...) +#define SKIP_BZCAT(...) __VA_ARGS__ #define CFG_CHCON 0 #define USE_CHCON(...) +#define SKIP_CHCON(...) __VA_ARGS__ #define CFG_CHROOT 0 #define USE_CHROOT(...) +#define SKIP_CHROOT(...) __VA_ARGS__ #define CFG_CHRT 0 #define USE_CHRT(...) +#define SKIP_CHRT(...) __VA_ARGS__ #define CFG_CLEAR 0 #define USE_CLEAR(...) +#define SKIP_CLEAR(...) __VA_ARGS__ #define CFG_COUNT 0 #define USE_COUNT(...) +#define SKIP_COUNT(...) __VA_ARGS__ #define CFG_DEVMEM 0 #define USE_DEVMEM(...) +#define SKIP_DEVMEM(...) __VA_ARGS__ #define CFG_DOS2UNIX 0 #define USE_DOS2UNIX(...) +#define SKIP_DOS2UNIX(...) __VA_ARGS__ #define CFG_UNIX2DOS 0 #define USE_UNIX2DOS(...) +#define SKIP_UNIX2DOS(...) __VA_ARGS__ #define CFG_EJECT 0 #define USE_EJECT(...) +#define SKIP_EJECT(...) __VA_ARGS__ #define CFG_FACTOR 0 #define USE_FACTOR(...) +#define SKIP_FACTOR(...) __VA_ARGS__ #define CFG_FALLOCATE 0 #define USE_FALLOCATE(...) +#define SKIP_FALLOCATE(...) __VA_ARGS__ #define CFG_FLOCK 0 #define USE_FLOCK(...) +#define SKIP_FLOCK(...) __VA_ARGS__ #define CFG_FMT 0 #define USE_FMT(...) +#define SKIP_FMT(...) __VA_ARGS__ #define CFG_FREE 0 #define USE_FREE(...) +#define SKIP_FREE(...) __VA_ARGS__ #define CFG_FREERAMDISK 0 #define USE_FREERAMDISK(...) +#define SKIP_FREERAMDISK(...) __VA_ARGS__ #define CFG_FSFREEZE 0 #define USE_FSFREEZE(...) +#define SKIP_FSFREEZE(...) __VA_ARGS__ #define CFG_FSYNC 0 #define USE_FSYNC(...) +#define SKIP_FSYNC(...) __VA_ARGS__ #define CFG_GETOPT 0 #define USE_GETOPT(...) +#define SKIP_GETOPT(...) __VA_ARGS__ #define CFG_GPIODETECT 0 #define USE_GPIODETECT(...) +#define SKIP_GPIODETECT(...) __VA_ARGS__ #define CFG_GPIOFIND 0 #define USE_GPIOFIND(...) +#define SKIP_GPIOFIND(...) __VA_ARGS__ #define CFG_GPIOINFO 0 #define USE_GPIOINFO(...) +#define SKIP_GPIOINFO(...) __VA_ARGS__ #define CFG_GPIOGET 0 #define USE_GPIOGET(...) +#define SKIP_GPIOGET(...) __VA_ARGS__ #define CFG_GPIOSET 0 #define USE_GPIOSET(...) +#define SKIP_GPIOSET(...) __VA_ARGS__ +#define CFG_HD 0 +#define USE_HD(...) +#define SKIP_HD(...) __VA_ARGS__ #define CFG_HELP 0 #define USE_HELP(...) +#define SKIP_HELP(...) __VA_ARGS__ #define CFG_HEXEDIT 0 #define USE_HEXEDIT(...) +#define SKIP_HEXEDIT(...) __VA_ARGS__ #define CFG_HWCLOCK 0 #define USE_HWCLOCK(...) +#define SKIP_HWCLOCK(...) __VA_ARGS__ #define CFG_I2CDETECT 0 #define USE_I2CDETECT(...) +#define SKIP_I2CDETECT(...) __VA_ARGS__ #define CFG_I2CDUMP 0 #define USE_I2CDUMP(...) +#define SKIP_I2CDUMP(...) __VA_ARGS__ #define CFG_I2CGET 0 #define USE_I2CGET(...) +#define SKIP_I2CGET(...) __VA_ARGS__ #define CFG_I2CSET 0 #define USE_I2CSET(...) +#define SKIP_I2CSET(...) __VA_ARGS__ #define CFG_I2CTRANSFER 0 #define USE_I2CTRANSFER(...) +#define SKIP_I2CTRANSFER(...) __VA_ARGS__ #define CFG_INOTIFYD 0 #define USE_INOTIFYD(...) +#define SKIP_INOTIFYD(...) __VA_ARGS__ #define CFG_INSMOD 0 #define USE_INSMOD(...) +#define SKIP_INSMOD(...) __VA_ARGS__ #define CFG_IONICE 0 #define USE_IONICE(...) +#define SKIP_IONICE(...) __VA_ARGS__ #define CFG_IORENICE 0 #define USE_IORENICE(...) +#define SKIP_IORENICE(...) __VA_ARGS__ #define CFG_LINUX32 0 #define USE_LINUX32(...) +#define SKIP_LINUX32(...) __VA_ARGS__ #define CFG_LOGIN 0 #define USE_LOGIN(...) +#define SKIP_LOGIN(...) __VA_ARGS__ #define CFG_LOSETUP 0 #define USE_LOSETUP(...) +#define SKIP_LOSETUP(...) __VA_ARGS__ #define CFG_LSATTR 0 #define USE_LSATTR(...) +#define SKIP_LSATTR(...) __VA_ARGS__ #define CFG_CHATTR 0 #define USE_CHATTR(...) +#define SKIP_CHATTR(...) __VA_ARGS__ #define CFG_LSMOD 0 #define USE_LSMOD(...) +#define SKIP_LSMOD(...) __VA_ARGS__ #define CFG_LSPCI 0 #define USE_LSPCI(...) +#define SKIP_LSPCI(...) __VA_ARGS__ #define CFG_LSUSB 0 #define USE_LSUSB(...) +#define SKIP_LSUSB(...) __VA_ARGS__ #define CFG_MAKEDEVS 0 #define USE_MAKEDEVS(...) +#define SKIP_MAKEDEVS(...) __VA_ARGS__ #define CFG_MCOOKIE 0 #define USE_MCOOKIE(...) +#define SKIP_MCOOKIE(...) __VA_ARGS__ #define CFG_MEMEATER 0 #define USE_MEMEATER(...) +#define SKIP_MEMEATER(...) __VA_ARGS__ #define CFG_MIX 0 #define USE_MIX(...) +#define SKIP_MIX(...) __VA_ARGS__ #define CFG_MKPASSWD 0 #define USE_MKPASSWD(...) +#define SKIP_MKPASSWD(...) __VA_ARGS__ #define CFG_MKSWAP 0 #define USE_MKSWAP(...) +#define SKIP_MKSWAP(...) __VA_ARGS__ #define CFG_MODINFO 0 #define USE_MODINFO(...) +#define SKIP_MODINFO(...) __VA_ARGS__ #define CFG_MOUNTPOINT 0 #define USE_MOUNTPOINT(...) +#define SKIP_MOUNTPOINT(...) __VA_ARGS__ #define CFG_NBD_CLIENT 0 #define USE_NBD_CLIENT(...) +#define SKIP_NBD_CLIENT(...) __VA_ARGS__ #define CFG_NBD_SERVER 0 #define USE_NBD_SERVER(...) +#define SKIP_NBD_SERVER(...) __VA_ARGS__ +#define CFG_NOLOGIN 0 +#define USE_NOLOGIN(...) +#define SKIP_NOLOGIN(...) __VA_ARGS__ #define CFG_UNSHARE 0 #define USE_UNSHARE(...) +#define SKIP_UNSHARE(...) __VA_ARGS__ #define CFG_NSENTER 0 #define USE_NSENTER(...) +#define SKIP_NSENTER(...) __VA_ARGS__ #define CFG_ONEIT 0 #define USE_ONEIT(...) +#define SKIP_ONEIT(...) __VA_ARGS__ #define CFG_OPENVT 0 #define USE_OPENVT(...) +#define SKIP_OPENVT(...) __VA_ARGS__ #define CFG_CHVT 0 #define USE_CHVT(...) +#define SKIP_CHVT(...) __VA_ARGS__ #define CFG_DEALLOCVT 0 #define USE_DEALLOCVT(...) +#define SKIP_DEALLOCVT(...) __VA_ARGS__ #define CFG_PARTPROBE 0 #define USE_PARTPROBE(...) +#define SKIP_PARTPROBE(...) __VA_ARGS__ #define CFG_PIVOT_ROOT 0 #define USE_PIVOT_ROOT(...) +#define SKIP_PIVOT_ROOT(...) __VA_ARGS__ #define CFG_PMAP 0 #define USE_PMAP(...) +#define SKIP_PMAP(...) __VA_ARGS__ #define CFG_PRINTENV 0 #define USE_PRINTENV(...) +#define SKIP_PRINTENV(...) __VA_ARGS__ #define CFG_PWDX 0 #define USE_PWDX(...) +#define SKIP_PWDX(...) __VA_ARGS__ #define CFG_PWGEN 0 #define USE_PWGEN(...) +#define SKIP_PWGEN(...) __VA_ARGS__ #define CFG_READAHEAD 0 #define USE_READAHEAD(...) +#define SKIP_READAHEAD(...) __VA_ARGS__ #define CFG_READELF 0 #define USE_READELF(...) +#define SKIP_READELF(...) __VA_ARGS__ #define CFG_READLINK 1 #define USE_READLINK(...) __VA_ARGS__ +#define SKIP_READLINK(...) #define CFG_REALPATH 0 #define USE_REALPATH(...) +#define SKIP_REALPATH(...) __VA_ARGS__ #define CFG_REBOOT 0 #define USE_REBOOT(...) +#define SKIP_REBOOT(...) __VA_ARGS__ #define CFG_RESET 0 #define USE_RESET(...) +#define SKIP_RESET(...) __VA_ARGS__ #define CFG_REV 0 #define USE_REV(...) +#define SKIP_REV(...) __VA_ARGS__ #define CFG_RMMOD 0 #define USE_RMMOD(...) +#define SKIP_RMMOD(...) __VA_ARGS__ #define CFG_RTCWAKE 0 #define USE_RTCWAKE(...) +#define SKIP_RTCWAKE(...) __VA_ARGS__ #define CFG_SETFATTR 0 #define USE_SETFATTR(...) +#define SKIP_SETFATTR(...) __VA_ARGS__ #define CFG_SETSID 0 #define USE_SETSID(...) +#define SKIP_SETSID(...) __VA_ARGS__ #define CFG_SHA3SUM 0 #define USE_SHA3SUM(...) +#define SKIP_SHA3SUM(...) __VA_ARGS__ #define CFG_SHRED 0 #define USE_SHRED(...) +#define SKIP_SHRED(...) __VA_ARGS__ #define CFG_SHUF 0 #define USE_SHUF(...) +#define SKIP_SHUF(...) __VA_ARGS__ #define CFG_STAT 0 #define USE_STAT(...) +#define SKIP_STAT(...) __VA_ARGS__ #define CFG_SWAPOFF 0 #define USE_SWAPOFF(...) +#define SKIP_SWAPOFF(...) __VA_ARGS__ #define CFG_SWAPON 0 #define USE_SWAPON(...) +#define SKIP_SWAPON(...) __VA_ARGS__ #define CFG_SWITCH_ROOT 0 #define USE_SWITCH_ROOT(...) +#define SKIP_SWITCH_ROOT(...) __VA_ARGS__ #define CFG_SYSCTL 0 #define USE_SYSCTL(...) +#define SKIP_SYSCTL(...) __VA_ARGS__ #define CFG_TAC 0 #define USE_TAC(...) +#define SKIP_TAC(...) __VA_ARGS__ #define CFG_NPROC 0 #define USE_NPROC(...) +#define SKIP_NPROC(...) __VA_ARGS__ #define CFG_TASKSET 0 #define USE_TASKSET(...) +#define SKIP_TASKSET(...) __VA_ARGS__ #define CFG_TIMEOUT 0 #define USE_TIMEOUT(...) +#define SKIP_TIMEOUT(...) __VA_ARGS__ #define CFG_TRUNCATE 0 #define USE_TRUNCATE(...) +#define SKIP_TRUNCATE(...) __VA_ARGS__ #define CFG_TS 0 #define USE_TS(...) +#define SKIP_TS(...) __VA_ARGS__ #define CFG_UCLAMPSET 0 #define USE_UCLAMPSET(...) +#define SKIP_UCLAMPSET(...) __VA_ARGS__ #define CFG_UPTIME 0 #define USE_UPTIME(...) +#define SKIP_UPTIME(...) __VA_ARGS__ #define CFG_USLEEP 0 #define USE_USLEEP(...) +#define SKIP_USLEEP(...) __VA_ARGS__ #define CFG_UUIDGEN 0 #define USE_UUIDGEN(...) +#define SKIP_UUIDGEN(...) __VA_ARGS__ #define CFG_VCONFIG 0 #define USE_VCONFIG(...) +#define SKIP_VCONFIG(...) __VA_ARGS__ #define CFG_VMSTAT 0 #define USE_VMSTAT(...) +#define SKIP_VMSTAT(...) __VA_ARGS__ #define CFG_W 0 #define USE_W(...) +#define SKIP_W(...) __VA_ARGS__ #define CFG_WATCH 0 #define USE_WATCH(...) +#define SKIP_WATCH(...) __VA_ARGS__ #define CFG_WATCHDOG 0 #define USE_WATCHDOG(...) +#define SKIP_WATCHDOG(...) __VA_ARGS__ #define CFG_WHICH 1 #define USE_WHICH(...) __VA_ARGS__ +#define SKIP_WHICH(...) #define CFG_XXD 0 #define USE_XXD(...) +#define SKIP_XXD(...) __VA_ARGS__ #define CFG_YES 0 #define USE_YES(...) +#define SKIP_YES(...) __VA_ARGS__ #define CFG_FTPGET 0 #define USE_FTPGET(...) +#define SKIP_FTPGET(...) __VA_ARGS__ #define CFG_FTPPUT 0 #define USE_FTPPUT(...) +#define SKIP_FTPPUT(...) __VA_ARGS__ #define CFG_HOST 0 #define USE_HOST(...) +#define SKIP_HOST(...) __VA_ARGS__ #define CFG_HTTPD 0 #define USE_HTTPD(...) +#define SKIP_HTTPD(...) __VA_ARGS__ #define CFG_IFCONFIG 0 #define USE_IFCONFIG(...) +#define SKIP_IFCONFIG(...) __VA_ARGS__ #define CFG_MICROCOM 0 #define USE_MICROCOM(...) +#define SKIP_MICROCOM(...) __VA_ARGS__ #define CFG_NETCAT 0 #define USE_NETCAT(...) +#define SKIP_NETCAT(...) __VA_ARGS__ #define CFG_NETSTAT 0 #define USE_NETSTAT(...) +#define SKIP_NETSTAT(...) __VA_ARGS__ #define CFG_PING 0 #define USE_PING(...) +#define SKIP_PING(...) __VA_ARGS__ #define CFG_RFKILL 0 #define USE_RFKILL(...) +#define SKIP_RFKILL(...) __VA_ARGS__ #define CFG_SNTP 0 #define USE_SNTP(...) +#define SKIP_SNTP(...) __VA_ARGS__ #define CFG_TUNCTL 0 #define USE_TUNCTL(...) +#define SKIP_TUNCTL(...) __VA_ARGS__ #define CFG_WGET 0 #define USE_WGET(...) +#define SKIP_WGET(...) __VA_ARGS__ #define CFG_WGET_LIBTLS 0 #define USE_WGET_LIBTLS(...) +#define SKIP_WGET_LIBTLS(...) __VA_ARGS__ #define CFG_DMESG 0 #define USE_DMESG(...) +#define SKIP_DMESG(...) __VA_ARGS__ #define CFG_GZIP 1 #define USE_GZIP(...) __VA_ARGS__ +#define SKIP_GZIP(...) #define CFG_GUNZIP 0 #define USE_GUNZIP(...) +#define SKIP_GUNZIP(...) __VA_ARGS__ #define CFG_ZCAT 0 #define USE_ZCAT(...) +#define SKIP_ZCAT(...) __VA_ARGS__ #define CFG_HOSTNAME 0 #define USE_HOSTNAME(...) +#define SKIP_HOSTNAME(...) __VA_ARGS__ #define CFG_DNSDOMAINNAME 0 #define USE_DNSDOMAINNAME(...) +#define SKIP_DNSDOMAINNAME(...) __VA_ARGS__ #define CFG_KILLALL 0 #define USE_KILLALL(...) +#define SKIP_KILLALL(...) __VA_ARGS__ #define CFG_MD5SUM 0 #define USE_MD5SUM(...) +#define SKIP_MD5SUM(...) __VA_ARGS__ #define CFG_SHA1SUM 0 #define USE_SHA1SUM(...) +#define SKIP_SHA1SUM(...) __VA_ARGS__ #define CFG_SHA224SUM 0 #define USE_SHA224SUM(...) +#define SKIP_SHA224SUM(...) __VA_ARGS__ #define CFG_SHA256SUM 0 #define USE_SHA256SUM(...) +#define SKIP_SHA256SUM(...) __VA_ARGS__ #define CFG_SHA384SUM 0 #define USE_SHA384SUM(...) +#define SKIP_SHA384SUM(...) __VA_ARGS__ #define CFG_SHA512SUM 0 #define USE_SHA512SUM(...) +#define SKIP_SHA512SUM(...) __VA_ARGS__ +#define CFG_B3SUM 0 +#define USE_B3SUM(...) +#define SKIP_B3SUM(...) __VA_ARGS__ #define CFG_MKNOD 0 #define USE_MKNOD(...) -#define CFG_MKNOD_Z 0 -#define USE_MKNOD_Z(...) +#define SKIP_MKNOD(...) __VA_ARGS__ #define CFG_MKTEMP 0 #define USE_MKTEMP(...) +#define SKIP_MKTEMP(...) __VA_ARGS__ #define CFG_MOUNT 0 #define USE_MOUNT(...) +#define SKIP_MOUNT(...) __VA_ARGS__ #define CFG_PASSWD 0 #define USE_PASSWD(...) +#define SKIP_PASSWD(...) __VA_ARGS__ #define CFG_PASSWD_SAD 0 #define USE_PASSWD_SAD(...) +#define SKIP_PASSWD_SAD(...) __VA_ARGS__ #define CFG_PIDOF 0 #define USE_PIDOF(...) +#define SKIP_PIDOF(...) __VA_ARGS__ #define CFG_SEQ 0 #define USE_SEQ(...) +#define SKIP_SEQ(...) __VA_ARGS__ #define CFG_SU 0 #define USE_SU(...) +#define SKIP_SU(...) __VA_ARGS__ #define CFG_SYNC 0 #define USE_SYNC(...) +#define SKIP_SYNC(...) __VA_ARGS__ #define CFG_UMOUNT 0 #define USE_UMOUNT(...) +#define SKIP_UMOUNT(...) __VA_ARGS__ #define CFG_DEMO_MANY_OPTIONS 0 #define USE_DEMO_MANY_OPTIONS(...) +#define SKIP_DEMO_MANY_OPTIONS(...) __VA_ARGS__ #define CFG_DEMO_NUMBER 0 #define USE_DEMO_NUMBER(...) +#define SKIP_DEMO_NUMBER(...) __VA_ARGS__ #define CFG_DEMO_SCANKEY 0 #define USE_DEMO_SCANKEY(...) +#define SKIP_DEMO_SCANKEY(...) __VA_ARGS__ #define CFG_DEMO_UTF8TOWC 0 #define USE_DEMO_UTF8TOWC(...) +#define SKIP_DEMO_UTF8TOWC(...) __VA_ARGS__ #define CFG_HELLO 0 #define USE_HELLO(...) +#define SKIP_HELLO(...) __VA_ARGS__ #define CFG_HOSTID 0 #define USE_HOSTID(...) +#define SKIP_HOSTID(...) __VA_ARGS__ #define CFG_LOGPATH 0 #define USE_LOGPATH(...) +#define SKIP_LOGPATH(...) __VA_ARGS__ #define CFG_SKELETON 0 #define USE_SKELETON(...) +#define SKIP_SKELETON(...) __VA_ARGS__ #define CFG_SKELETON_ALIAS 0 #define USE_SKELETON_ALIAS(...) +#define SKIP_SKELETON_ALIAS(...) __VA_ARGS__ #define CFG_GETENFORCE 0 #define USE_GETENFORCE(...) +#define SKIP_GETENFORCE(...) __VA_ARGS__ #define CFG_LOAD_POLICY 0 #define USE_LOAD_POLICY(...) +#define SKIP_LOAD_POLICY(...) __VA_ARGS__ #define CFG_LOG 0 #define USE_LOG(...) +#define SKIP_LOG(...) __VA_ARGS__ #define CFG_RESTORECON 0 #define USE_RESTORECON(...) +#define SKIP_RESTORECON(...) __VA_ARGS__ #define CFG_RUNCON 0 #define USE_RUNCON(...) +#define SKIP_RUNCON(...) __VA_ARGS__ #define CFG_SENDEVENT 0 #define USE_SENDEVENT(...) +#define SKIP_SENDEVENT(...) __VA_ARGS__ #define CFG_SETENFORCE 0 #define USE_SETENFORCE(...) +#define SKIP_SETENFORCE(...) __VA_ARGS__ #define CFG_TOYBOX 1 #define USE_TOYBOX(...) __VA_ARGS__ +#define SKIP_TOYBOX(...) #define CFG_TOYBOX_SUID 0 #define USE_TOYBOX_SUID(...) +#define SKIP_TOYBOX_SUID(...) __VA_ARGS__ #define CFG_TOYBOX_LSM_NONE 1 #define USE_TOYBOX_LSM_NONE(...) __VA_ARGS__ +#define SKIP_TOYBOX_LSM_NONE(...) #define CFG_TOYBOX_SELINUX 0 #define USE_TOYBOX_SELINUX(...) +#define SKIP_TOYBOX_SELINUX(...) __VA_ARGS__ #define CFG_TOYBOX_SMACK 0 #define USE_TOYBOX_SMACK(...) +#define SKIP_TOYBOX_SMACK(...) __VA_ARGS__ #define CFG_TOYBOX_LIBCRYPTO 0 #define USE_TOYBOX_LIBCRYPTO(...) +#define SKIP_TOYBOX_LIBCRYPTO(...) __VA_ARGS__ #define CFG_TOYBOX_LIBZ 0 #define USE_TOYBOX_LIBZ(...) +#define SKIP_TOYBOX_LIBZ(...) __VA_ARGS__ #define CFG_TOYBOX_FLOAT 0 #define USE_TOYBOX_FLOAT(...) +#define SKIP_TOYBOX_FLOAT(...) __VA_ARGS__ #define CFG_TOYBOX_HELP 0 #define USE_TOYBOX_HELP(...) +#define SKIP_TOYBOX_HELP(...) __VA_ARGS__ #define CFG_TOYBOX_HELP_DASHDASH 0 #define USE_TOYBOX_HELP_DASHDASH(...) +#define SKIP_TOYBOX_HELP_DASHDASH(...) __VA_ARGS__ #define CFG_TOYBOX_ZHELP 0 #define USE_TOYBOX_ZHELP(...) +#define SKIP_TOYBOX_ZHELP(...) __VA_ARGS__ #define CFG_TOYBOX_FREE 0 #define USE_TOYBOX_FREE(...) +#define SKIP_TOYBOX_FREE(...) __VA_ARGS__ #define CFG_TOYBOX_NORECURSE 0 #define USE_TOYBOX_NORECURSE(...) +#define SKIP_TOYBOX_NORECURSE(...) __VA_ARGS__ #define CFG_TOYBOX_DEBUG 0 #define USE_TOYBOX_DEBUG(...) +#define SKIP_TOYBOX_DEBUG(...) __VA_ARGS__ #define CFG_TOYBOX_UID_SYS 100 #define CFG_TOYBOX_UID_USR 500 #define CFG_TOYBOX_FORCE_NOMMU 0 #define USE_TOYBOX_FORCE_NOMMU(...) +#define SKIP_TOYBOX_FORCE_NOMMU(...) __VA_ARGS__ diff --git a/scripts/prereq/generated/flags.h b/scripts/prereq/generated/flags.h index 9b63929a..e9d761f9 100644 --- a/scripts/prereq/generated/flags.h +++ b/scripts/prereq/generated/flags.h @@ -27,9 +27,9 @@ #undef FLAG_u #endif -// chmod <2?vfR[-vf] <2?vfR[-vf] +// chmod <2?cvfR[-cvf] <2?cvfR[-cvf] #undef OPTSTR_chmod -#define OPTSTR_chmod "<2?vfR[-vf]" +#define OPTSTR_chmod "<2?cvfR[-cvf]" #ifdef CLEANUP_chmod #undef CLEANUP_chmod #undef FOR_chmod diff --git a/scripts/prereq/generated/help.h b/scripts/prereq/generated/help.h index 4457710d..f8f6357d 100644 --- a/scripts/prereq/generated/help.h +++ b/scripts/prereq/generated/help.h @@ -1,4 +1,5 @@ #define HELP_toybox "" +#define HELP_ln "" #define HELP_as "" #define HELP_basename "" #define HELP_cat "" @@ -14,7 +15,6 @@ #define HELP_gzip "" #define HELP_head "" #define HELP_ld "" -#define HELP_ln "" #define HELP_ls "" #define HELP_make "" #define HELP_mkdir "" diff --git a/scripts/prereq/generated/newtoys.h b/scripts/prereq/generated/newtoys.h index a9ed915d..43fbc3cf 100644 --- a/scripts/prereq/generated/newtoys.h +++ b/scripts/prereq/generated/newtoys.h @@ -9,6 +9,7 @@ USE_SH(OLDTOY([[, test, TOYFLAG_NOFORK|TOYFLAG_NOHELP)) USE_GROUPADD(OLDTOY(addgroup, groupadd, TOYFLAG_NEEDROOT|TOYFLAG_SBIN)) USE_USERADD(OLDTOY(adduser, useradd, TOYFLAG_NEEDROOT|TOYFLAG_UMASK|TOYFLAG_SBIN)) USE_ASCII(NEWTOY(ascii, 0, TOYFLAG_USR|TOYFLAG_BIN|TOYFLAG_LINEBUF)) +USE_B3SUM(OLDTOY(b3sum, md5sum, TOYFLAG_USR|TOYFLAG_BIN)) USE_BASE32(NEWTOY(base32, "diw#<0=76[!dw]", TOYFLAG_USR|TOYFLAG_BIN|TOYFLAG_LINEBUF)) USE_BASE64(NEWTOY(base64, "diw#<0=76[!dw]", TOYFLAG_USR|TOYFLAG_BIN|TOYFLAG_LINEBUF)) USE_BASENAME(NEWTOY(basename, "^<1as:", TOYFLAG_USR|TOYFLAG_BIN)) @@ -16,7 +17,7 @@ USE_SH(OLDTOY(bash, sh, TOYFLAG_BIN)) USE_BZCAT(NEWTOY(bzcat, 0, TOYFLAG_USR|TOYFLAG_BIN)) USE_CAT(NEWTOY(cat, "uvte", TOYFLAG_BIN)) USE_CHATTR(NEWTOY(chattr, "?p#v#R", TOYFLAG_BIN)) -USE_CHMOD(NEWTOY(chmod, "<2?vfR[-vf]", TOYFLAG_BIN)) +USE_CHMOD(NEWTOY(chmod, "<2?cvfR[-cvf]", TOYFLAG_BIN)) USE_CHOWN(OLDTOY(chown, chgrp, TOYFLAG_BIN)) USE_CKSUM(NEWTOY(cksum, "HIPLN", TOYFLAG_BIN)) USE_CMP(NEWTOY(cmp, "<1>4ls(silent)(quiet)n#<1[!ls]", TOYFLAG_USR|TOYFLAG_BIN|TOYFLAG_ARGFAIL(2))) @@ -26,11 +27,11 @@ USE_USERDEL(OLDTOY(deluser, userdel, TOYFLAG_NEEDROOT|TOYFLAG_SBIN)) USE_DEMO_UTF8TOWC(NEWTOY(demo_utf8towc, 0, TOYFLAG_USR|TOYFLAG_BIN)) USE_DIRNAME(NEWTOY(dirname, "<1", TOYFLAG_USR|TOYFLAG_BIN)) USE_DUMPLEASES(NEWTOY(dumpleases, ">0arf:[!ar]", TOYFLAG_USR|TOYFLAG_BIN)) -USE_ECHO(NEWTOY(echo, "^?Een[-eE]", TOYFLAG_BIN|TOYFLAG_MAYFORK|TOYFLAG_LINEBUF)) -USE_EGREP(OLDTOY(egrep, grep, TOYFLAG_BIN|TOYFLAG_ARGFAIL(2)|TOYFLAG_LINEBUF)) +USE_ECHO(NEWTOY(echo, "^?Een[-eE]", TOYFLAG_BIN|TOYFLAG_MAYFORK|TOYFLAG_LINEBUF|TOYFLAG_NOHELP)) +USE_EGREP(OLDTOY(egrep, grep, TOYFLAG_BIN|TOYFLAG_ARGFAIL(2)|TOYFLAG_LINEBUF|TOYFLAG_AUTOCONF)) USE_FALLOCATE(NEWTOY(fallocate, ">1l#|o#", TOYFLAG_USR|TOYFLAG_BIN)) USE_FALSE(NEWTOY(false, NULL, TOYFLAG_BIN|TOYFLAG_NOHELP|TOYFLAG_MAYFORK)) -USE_FGREP(OLDTOY(fgrep, grep, TOYFLAG_BIN|TOYFLAG_ARGFAIL(2)|TOYFLAG_LINEBUF)) +USE_FGREP(OLDTOY(fgrep, grep, TOYFLAG_BIN|TOYFLAG_ARGFAIL(2)|TOYFLAG_LINEBUF|TOYFLAG_AUTOCONF)) USE_FOLD(NEWTOY(fold, "bsw#<1=80", TOYFLAG_USR|TOYFLAG_BIN)) USE_FTPPUT(OLDTOY(ftpput, ftpget, TOYFLAG_USR|TOYFLAG_BIN)) USE_GETFATTR(NEWTOY(getfattr, "(only-values)dhn:", TOYFLAG_USR|TOYFLAG_BIN)) @@ -40,13 +41,13 @@ USE_GITFETCH(NEWTOY(gitfetch, 0, TOYFLAG_USR|TOYFLAG_BIN)) USE_GITINIT(NEWTOY(gitinit, "<1", TOYFLAG_USR|TOYFLAG_BIN)) USE_GITREMOTE(NEWTOY(gitremote, "<1", TOYFLAG_USR|TOYFLAG_BIN)) USE_GPIODETECT(NEWTOY(gpiodetect, ">0", TOYFLAG_USR|TOYFLAG_BIN)) -USE_GREP(NEWTOY(grep, "(line-buffered)(color):;(exclude-dir)*S(exclude)*M(include)*ZzEFHIab(byte-offset)h(no-filename)ino(only-matching)rRsvwc(count)L(files-without-match)l(files-with-matches)q(quiet)(silent)e*f*C#B#A#m#x[!wx][!EF]", TOYFLAG_BIN|TOYFLAG_ARGFAIL(2)|TOYFLAG_LINEBUF)) +USE_GREP(NEWTOY(grep, "(line-buffered)(color):;(exclude-dir)*S(exclude)*M(include)*ZzEFHIab(byte-offset)h(no-filename)ino(only-matching)rRsvwc(count)L(files-without-match)l(files-with-matches)q(quiet)(silent)e*f*C#B#A#m#x[!wx][!EF]", TOYFLAG_BIN|TOYFLAG_ARGFAIL(2)|TOYFLAG_LINEBUF|TOYFLAG_AUTOCONF)) USE_GZIP(NEWTOY(gzip, "n(no-name)cdfkt123456789[-123456789]", TOYFLAG_USR|TOYFLAG_BIN)) USE_REBOOT(OLDTOY(halt, reboot, TOYFLAG_SBIN|TOYFLAG_NEEDROOT)) -USE_HD(OLDTOY(hd, hexdump, TOYFLAG_USR|TOYFLAG_BIN)) USE_HEAD(NEWTOY(head, "?n(lines)#<0=10c(bytes)#<0qv[-nc]", TOYFLAG_USR|TOYFLAG_BIN|TOYFLAG_LINEBUF)) USE_HWCLOCK(NEWTOY(hwclock, ">0(fast)f(rtc):u(utc)l(localtime)t(systz)s(hctosys)r(show)w(systohc)[-ul][!rtsw]", TOYFLAG_SBIN)) USE_I2CTRANSFER(NEWTOY(i2ctransfer, "<2vfy", TOYFLAG_USR|TOYFLAG_SBIN)) +USE_ID(NEWTOY(id, ">1"SKIP_TOYBOX_LSM_NONE("Z")"nGgru[!"SKIP_TOYBOX_LSM_NONE("Z")"Ggu]", TOYFLAG_USR|TOYFLAG_BIN|TOYFLAG_MOREHELP(!CFG_TOYBOX_LSM_NONE))) USE_INSMOD(NEWTOY(insmod, "<1", TOYFLAG_SBIN|TOYFLAG_NEEDROOT)) USE_IP(OLDTOY(ipaddr, ip, TOYFLAG_SBIN)) USE_IPCRM(NEWTOY(ipcrm, "m*M*s*S*q*Q*", TOYFLAG_USR|TOYFLAG_BIN)) @@ -60,23 +61,24 @@ USE_LS(NEWTOY(ls, "(sort):(color):;(full-time)(show-control-chars)\377(block-siz USE_LSATTR(NEWTOY(lsattr, "ldapvR", TOYFLAG_BIN)) USE_LSMOD(NEWTOY(lsmod, NULL, TOYFLAG_SBIN)) USE_LSOF(NEWTOY(lsof, "lp*t", TOYFLAG_USR|TOYFLAG_BIN)) -USE_LSPCI(NEWTOY(lspci, "emkn@x@i:", TOYFLAG_USR|TOYFLAG_BIN)) -USE_LSUSB(NEWTOY(lsusb, "i:", TOYFLAG_USR|TOYFLAG_BIN)) +USE_LSPCI(NEWTOY(lspci, "eDmkn@x@i:", TOYFLAG_USR|TOYFLAG_BIN)) +USE_LSUSB(NEWTOY(lsusb, "ti:", TOYFLAG_USR|TOYFLAG_BIN)) USE_MAKEDEVS(NEWTOY(makedevs, "<1>1d:", TOYFLAG_USR|TOYFLAG_BIN)) USE_MDEV(NEWTOY(mdev, "s", TOYFLAG_USR|TOYFLAG_BIN|TOYFLAG_UMASK)) -USE_MKDIR(NEWTOY(mkdir, "<1"USE_MKDIR_Z("Z:")"vp(parent)(parents)m:", TOYFLAG_BIN|TOYFLAG_UMASK)) -USE_MKNOD(NEWTOY(mknod, "<2>4m(mode):"USE_MKNOD_Z("Z:"), TOYFLAG_BIN|TOYFLAG_UMASK)) +USE_MKDIR(NEWTOY(mkdir, "<1"SKIP_TOYBOX_LSM_NONE("Z:")"vp(parent)(parents)m:", TOYFLAG_BIN|TOYFLAG_UMASK|TOYFLAG_MOREHELP(!CFG_TOYBOX_LSM_NONE))) +USE_MKFIFO(NEWTOY(mkfifo, "<1"SKIP_TOYBOX_LSM_NONE("Z:")"m:", TOYFLAG_USR|TOYFLAG_BIN|TOYFLAG_MOREHELP(!CFG_TOYBOX_LSM_NONE))) +USE_MKNOD(NEWTOY(mknod, "<2>4m(mode):"SKIP_TOYBOX_LSM_NONE("Z:"), TOYFLAG_BIN|TOYFLAG_UMASK|TOYFLAG_MOREHELP(!CFG_TOYBOX_LSM_NONE))) USE_MKPASSWD(NEWTOY(mkpasswd, ">2S:m:P#=0<0", TOYFLAG_USR|TOYFLAG_BIN)) USE_MODINFO(NEWTOY(modinfo, "<1b:k:F:0", TOYFLAG_SBIN)) USE_MODPROBE(NEWTOY(modprobe, "alrqvsDbd*", TOYFLAG_SBIN)) USE_NBD_CLIENT(OLDTOY(nbd-client, nbd_client, TOYFLAG_USR|TOYFLAG_BIN)) USE_NBD_SERVER(OLDTOY(nbd-server, nbd_server, TOYFLAG_USR|TOYFLAG_BIN)) USE_NETCAT(OLDTOY(nc, netcat, TOYFLAG_USR|TOYFLAG_BIN)) -USE_NETCAT(NEWTOY(netcat, "^tElLw#<1W#<1p#<1>65535q#<1s:f:46uUnvz[!tlL][!Lw][!Lu][!46U]", TOYFLAG_BIN)) +USE_NETCAT(NEWTOY(netcat, "^tElLw#<1W#<1p#<1>65535q#<1O:o:s:f:46uUnz[!tlL][!Lw][!Lu][!46U][!oO]", TOYFLAG_BIN)) USE_OD(NEWTOY(od, "j#vw#<1=16N#xsodcbA:t*", TOYFLAG_USR|TOYFLAG_BIN)) -USE_PASSWD(NEWTOY(passwd, ">1a:dlu", TOYFLAG_STAYROOT|TOYFLAG_USR|TOYFLAG_BIN)) +USE_PASSWD(NEWTOY(passwd, ">1a:dlu", TOYFLAG_STAYROOT|TOYFLAG_USR|TOYFLAG_BIN|TOYFLAG_MOREHELP(CFG_PASSWD_SAD))) USE_PASTE(NEWTOY(paste, "d:s", TOYFLAG_USR|TOYFLAG_BIN)) -USE_PGREP(NEWTOY(pgrep, "?cld:u*U*t*s*P*g*G*fnovxL:[-no]", TOYFLAG_USR|TOYFLAG_BIN)) +USE_PGREP(NEWTOY(pgrep, "acld:u*U*t*s*P*g*G*fnovxL:[-no]", TOYFLAG_USR|TOYFLAG_BIN)) USE_PING(OLDTOY(ping6, ping, TOYFLAG_USR|TOYFLAG_BIN|TOYFLAG_LINEBUF)) USE_REBOOT(OLDTOY(poweroff, reboot, TOYFLAG_SBIN|TOYFLAG_NEEDROOT)) USE_ULIMIT(OLDTOY(prlimit, ulimit, TOYFLAG_USR|TOYFLAG_BIN)) @@ -85,7 +87,7 @@ USE_READLINK(NEWTOY(readlink, "<1vnf(canonicalize)emqz[-mef][-qv]", TOYFLAG_USR| USE_RM(NEWTOY(rm, "f(force)iRrv[-fi]", TOYFLAG_BIN)) USE_RMDIR(NEWTOY(rmdir, "<1(ignore-fail-on-non-empty)p(parents)", TOYFLAG_BIN)) USE_RMMOD(NEWTOY(rmmod, "<1wf", TOYFLAG_SBIN|TOYFLAG_NEEDROOT)) -USE_SED(NEWTOY(sed, "(help)(version)(tarxform)e*f*i:;nErz(null-data)s[+Er]", TOYFLAG_BIN|TOYFLAG_NOHELP)) +USE_SED(NEWTOY(sed, "(help)(version)(tarxform)e*f*i:;nErz(null-data)s[+Er]", TOYFLAG_BIN|TOYFLAG_AUTOCONF)) USE_SETFATTR(NEWTOY(setfattr, "hn:|v:x:|[!xv]", TOYFLAG_USR|TOYFLAG_BIN)) USE_SHA1SUM(OLDTOY(sha1sum, md5sum, TOYFLAG_USR|TOYFLAG_BIN)) USE_SHA224SUM(OLDTOY(sha224sum, md5sum, TOYFLAG_USR|TOYFLAG_BIN)) @@ -93,12 +95,13 @@ USE_SHA256SUM(OLDTOY(sha256sum, md5sum, TOYFLAG_USR|TOYFLAG_BIN)) USE_SHA384SUM(OLDTOY(sha384sum, md5sum, TOYFLAG_USR|TOYFLAG_BIN)) USE_SHA512SUM(OLDTOY(sha512sum, md5sum, TOYFLAG_USR|TOYFLAG_BIN)) USE_SKELETON_ALIAS(NEWTOY(skeleton_alias, "b#dq", TOYFLAG_USR|TOYFLAG_BIN)) -USE_SORT(NEWTOY(sort, USE_SORT_FLOAT("g")"S:T:m" "o:k*t:" "xVbMCcszdfirun", TOYFLAG_USR|TOYFLAG_BIN|TOYFLAG_ARGFAIL(2))) +USE_SORT(NEWTOY(sort, USE_TOYBOX_FLOAT("g")"S:T:m" "o:k*t:" "xVbMCcszdfirun", TOYFLAG_USR|TOYFLAG_BIN|TOYFLAG_ARGFAIL(2)|TOYFLAG_MOREHELP(CFG_TOYBOX_FLOAT))) USE_STRACE(NEWTOY(strace, "^p#s#v", TOYFLAG_USR|TOYFLAG_SBIN)) USE_STRINGS(NEWTOY(strings, "t:an#=4<1fo", TOYFLAG_USR|TOYFLAG_BIN)) USE_SYSLOGD(NEWTOY(syslogd,">0l#<1>8=8R:b#<0>99=1s#<0=200m#<0>71582787=20O:p:f:a:nSKLD", TOYFLAG_SBIN|TOYFLAG_STAYROOT)) USE_TAIL(NEWTOY(tail, "?fFs:c(bytes)-n(lines)-[-cn][-fF]", TOYFLAG_USR|TOYFLAG_BIN|TOYFLAG_LINEBUF)) -USE_TASKSET(NEWTOY(taskset, "<1^pa", TOYFLAG_USR|TOYFLAG_BIN)) +USE_TAR(NEWTOY(tar, "&(one-file-system)(no-ignore-case)(ignore-case)(no-anchored)(anchored)(no-wildcards)(wildcards)(no-wildcards-match-slash)(wildcards-match-slash)(show-transformed-names)(selinux)(restrict)(full-time)(no-recursion)(null)(numeric-owner)(no-same-permissions)(overwrite)(exclude)*(sort);:(mode):(mtime):(group):(owner):(to-command):~(strip-components)(strip)#~(transform)(xform)*Z(zstd)o(no-same-owner)p(same-permissions)k(keep-old)c(create)|h(dereference)x(extract)|t(list)|v(verbose)J(xz)j(bzip2)z(gzip)S(sparse)O(to-stdout)P(absolute-names)m(touch)X(exclude-from)*T(files-from)*I(use-compress-program):C(directory):f(file):as[!txc][!jzJa]", TOYFLAG_USR|TOYFLAG_BIN|TOYFLAG_UMASK)) +USE_TASKSET(NEWTOY(taskset, "^pa", TOYFLAG_USR|TOYFLAG_BIN)) USE_TEE(NEWTOY(tee, "ia", TOYFLAG_USR|TOYFLAG_BIN)) USE_TELNET(NEWTOY(telnet, "<1>2", TOYFLAG_BIN)) USE_TELNETD(NEWTOY(telnetd, "w#<0b:p#<0>65535=23f:l:FSKi[!wi]", TOYFLAG_USR|TOYFLAG_BIN)) @@ -116,6 +119,7 @@ USE_USERADD(NEWTOY(useradd, "<1>2u#<0G:s:g:h:SDH", TOYFLAG_NEEDROOT|TOYFLAG_UMAS USE_UUDECODE(NEWTOY(uudecode, ">1o:", TOYFLAG_USR|TOYFLAG_BIN|TOYFLAG_UMASK)) USE_UUENCODE(NEWTOY(uuencode, "<1>2m", TOYFLAG_USR|TOYFLAG_BIN)) USE_WC(NEWTOY(wc, "Lcmwl", TOYFLAG_USR|TOYFLAG_BIN)) +USE_WGET(NEWTOY(wget, "<1>1(max-redirect)#<0=20d(debug)O(output-document):p(post-data):", TOYFLAG_USR|TOYFLAG_BIN|TOYFLAG_MOREHELP(CFG_WGET_LIBTLS|CFG_TOYBOX_LIBCRYPTO))) USE_WHICH(NEWTOY(which, "<1a", TOYFLAG_USR|TOYFLAG_BIN)) USE_WHOAMI(OLDTOY(whoami, logname, TOYFLAG_USR|TOYFLAG_BIN)) USE_XARGS(NEWTOY(xargs, "^E:P#<0(null)=1optr(no-run-if-empty)n#<1(max-args)s#0[!0E]", TOYFLAG_USR|TOYFLAG_BIN)) diff --git a/scripts/recreate-prereq.sh b/scripts/recreate-prereq.sh index ec90f5ac..84228ad3 100755 --- a/scripts/recreate-prereq.sh +++ b/scripts/recreate-prereq.sh @@ -4,9 +4,9 @@ # Detect toybox prerequisites using record-commands -mkroot/record-commands make clean defconfig toybox -sed -i 's/default y/default n/' generated/Config.probed -CMDLIST="$(echo toybox; ./toybox cut -DF 1 log.txt | sort -u | grep -v nproc)" +mkroot/record-commands make clean defconfig toybox && +sed -i 's/default y/default n/' generated/Config.probed || exit 1 +CMDLIST="$(echo toybox; echo ln; ./toybox cut -DF 1 log.txt | sort -u | grep -v nproc)" { for i in $(tr '[:lower:]' '[:upper:]' <<<"$CMDLIST") do -- 2.39.5