From 907c7e036ef64db096c64fa81bc417412c248c54 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 3 Feb 2021 15:33:38 +0100 Subject: [PATCH 1/2] busybox: fix tests. --- srcpkgs/busybox/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/busybox/template b/srcpkgs/busybox/template index 707dac57d2d..c7c2e9ebbb9 100644 --- a/srcpkgs/busybox/template +++ b/srcpkgs/busybox/template @@ -87,7 +87,7 @@ do_check() { cp src/scripts/echo.c "${t}/scripts" # Run the testsuite ( - cd "${t}" + cd "${t}/testsuite" SKIP_KNOWN_BUGS=yes ./runtest -v ) done From 93bb9f8d1581ba5da2b1872072186bd8ce0a717c Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 3 Feb 2021 14:25:20 +0100 Subject: [PATCH 2/2] busybox: add more applets to busybox-huge. --- srcpkgs/busybox/files/dotconfig.d/huge.patch | 421 +++++++++++++++++++ srcpkgs/busybox/template | 4 +- 2 files changed, 423 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/busybox/files/dotconfig.d/huge.patch diff --git a/srcpkgs/busybox/files/dotconfig.d/huge.patch b/srcpkgs/busybox/files/dotconfig.d/huge.patch new file mode 100644 index 00000000000..1ef1465cffd --- /dev/null +++ b/srcpkgs/busybox/files/dotconfig.d/huge.patch @@ -0,0 +1,421 @@ +@@ -93,7 +93,7 @@ + CONFIG_PASSWORD_MINLEN=6 + CONFIG_MD5_SMALL=1 + CONFIG_SHA3_SMALL=1 +-# CONFIG_FEATURE_FAST_TOP is not set ++CONFIG_FEATURE_FAST_TOP=y + # CONFIG_FEATURE_ETC_NETWORKS is not set + # CONFIG_FEATURE_ETC_SERVICES is not set + CONFIG_FEATURE_EDITING=y +@@ -124,7 +124,7 @@ + CONFIG_FEATURE_USE_SENDFILE=y + CONFIG_FEATURE_COPYBUF_KB=4 + CONFIG_FEATURE_SKIP_ROOTFS=y +-# CONFIG_MONOTONIC_SYSCALL is not set ++CONFIG_MONOTONIC_SYSCALL=y + # CONFIG_IOCTL_HEX2STR_ERROR is not set + # CONFIG_FEATURE_HWIB is not set + +@@ -158,9 +158,9 @@ + CONFIG_BZIP2=y + CONFIG_BZIP2_SMALL=8 + CONFIG_FEATURE_BZIP2_DECOMPRESS=y +-# CONFIG_CPIO is not set +-# CONFIG_FEATURE_CPIO_O is not set +-# CONFIG_FEATURE_CPIO_P is not set ++CONFIG_CPIO=y ++CONFIG_FEATURE_CPIO_O=y ++CONFIG_FEATURE_CPIO_P=y + # CONFIG_DPKG is not set + # CONFIG_DPKG_DEB is not set + CONFIG_GZIP=y +@@ -191,7 +191,7 @@ + CONFIG_FEATURE_UNZIP_BZIP2=y + CONFIG_FEATURE_UNZIP_LZMA=y + CONFIG_FEATURE_UNZIP_XZ=y +-# CONFIG_FEATURE_LZMA_FAST is not set ++CONFIG_FEATURE_LZMA_FAST=y + + # + # Coreutils +@@ -205,7 +205,7 @@ + CONFIG_CHOWN=y + CONFIG_FEATURE_CHOWN_LONG_OPTIONS=y + CONFIG_CHROOT=y +-# CONFIG_CKSUM is not set ++CONFIG_CKSUM=y + CONFIG_COMM=y + CONFIG_CP=y + CONFIG_FEATURE_CP_LONG_OPTIONS=y +@@ -213,11 +213,11 @@ + CONFIG_CUT=y + CONFIG_DATE=y + CONFIG_FEATURE_DATE_ISOFMT=y +-# CONFIG_FEATURE_DATE_NANO is not set ++CONFIG_FEATURE_DATE_NANO=y + CONFIG_FEATURE_DATE_COMPAT=y + CONFIG_DD=y + CONFIG_FEATURE_DD_SIGNAL_HANDLING=y +-# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set ++CONFIG_FEATURE_DD_THIRD_STATUS_LINE=y + CONFIG_FEATURE_DD_IBS_OBS=y + CONFIG_FEATURE_DD_STATUS=y + CONFIG_DF=y +@@ -267,7 +266,7 @@ + # + # Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum + # +-# CONFIG_FEATURE_MD5_SHA1_SUM_CHECK is not set ++CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y + CONFIG_MKDIR=y + CONFIG_MKFIFO=y + CONFIG_MKNOD=y +@@ -313,7 +313,7 @@ + CONFIG_TEST1=y + CONFIG_TEST2=y + CONFIG_FEATURE_TEST_64=y +-# CONFIG_TIMEOUT is not set ++CONFIG_TIMEOUT=y + CONFIG_TOUCH=y + CONFIG_FEATURE_TOUCH_NODEREF=y + CONFIG_FEATURE_TOUCH_SUSV3=y +@@ -328,7 +328,7 @@ + CONFIG_BB_ARCH=y + CONFIG_UNIQ=y + CONFIG_UNLINK=y +-# CONFIG_USLEEP is not set ++CONFIG_USLEEP=y + CONFIG_UUDECODE=y + CONFIG_BASE64=y + CONFIG_UUENCODE=y +@@ -371,7 +371,7 @@ + # CONFIG_FEATURE_LOADFONT_PSF2 is not set + # CONFIG_FEATURE_LOADFONT_RAW is not set + CONFIG_LOADKMAP=y +-# CONFIG_OPENVT is not set ++CONFIG_OPENVT=y + CONFIG_RESET=y + # CONFIG_RESIZE is not set + # CONFIG_FEATURE_RESIZE_PRINT is not set +@@ -543,7 +543,7 @@ + # + CONFIG_CHATTR=y + # CONFIG_FSCK is not set +-# CONFIG_LSATTR is not set ++CONFIG_LSATTR=y + # CONFIG_TUNE2FS is not set + + # +@@ -586,7 +586,7 @@ + CONFIG_BLKID=y + CONFIG_FEATURE_BLKID_TYPE=y + # CONFIG_BLOCKDEV is not set +-# CONFIG_CAL is not set ++CONFIG_CAL=y + # CONFIG_CHRT is not set + CONFIG_DMESG=y + CONFIG_FEATURE_DMESG_PRETTY=y +@@ -639,13 +639,13 @@ + CONFIG_FEATURE_MDEV_DAEMON=y + # CONFIG_MESG is not set + # CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set +-# CONFIG_MKE2FS is not set +-# CONFIG_MKFS_EXT2 is not set ++CONFIG_MKE2FS=y ++CONFIG_MKFS_EXT2=y + # CONFIG_MKFS_MINIX is not set + # CONFIG_FEATURE_MINIX2 is not set + # CONFIG_MKFS_REISER is not set +-# CONFIG_MKDOSFS is not set +-# CONFIG_MKFS_VFAT is not set ++CONFIG_MKDOSFS=y ++CONFIG_MKFS_VFAT=y + CONFIG_MKSWAP=y + CONFIG_FEATURE_MKSWAP_UUID=y + CONFIG_MORE=y +@@ -654,24 +654,24 @@ + CONFIG_FEATURE_MOUNT_VERBOSE=y + CONFIG_FEATURE_MOUNT_HELPERS=y + CONFIG_FEATURE_MOUNT_LABEL=y +-CONFIG_FEATURE_MOUNT_NFS=n ++# CONFIG_FEATURE_MOUNT_NFS is not set + CONFIG_FEATURE_MOUNT_CIFS=y + CONFIG_FEATURE_MOUNT_FLAGS=y + CONFIG_FEATURE_MOUNT_FSTAB=y + CONFIG_FEATURE_MOUNT_OTHERTAB=y +-# CONFIG_MOUNTPOINT is not set ++CONFIG_MOUNTPOINT=y + # CONFIG_NOLOGIN is not set + # CONFIG_NOLOGIN_DEPENDENCIES is not set + CONFIG_NSENTER=y + CONFIG_PIVOT_ROOT=y +-# CONFIG_RDATE is not set ++CONFIG_RDATE=y + # CONFIG_RDEV is not set + # CONFIG_READPROFILE is not set + CONFIG_RENICE=y +-# CONFIG_REV is not set ++CONFIG_REV=y + # CONFIG_RTCWAKE is not set +-# CONFIG_SCRIPT is not set +-# CONFIG_SCRIPTREPLAY is not set ++CONFIG_SCRIPT=y ++CONFIG_SCRIPTREPLAY=y + CONFIG_SETARCH=y + CONFIG_LINUX32=y + CONFIG_LINUX64=y +@@ -686,8 +686,8 @@ + CONFIG_SWAPOFF=y + CONFIG_FEATURE_SWAPONOFF_LABEL=y + CONFIG_SWITCH_ROOT=y +-# CONFIG_TASKSET is not set +-# CONFIG_FEATURE_TASKSET_FANCY is not set ++CONFIG_TASKSET=y ++CONFIG_FEATURE_TASKSET_FANCY=y + CONFIG_UEVENT=y + CONFIG_UMOUNT=y + CONFIG_FEATURE_UMOUNT_ALL=y +@@ -737,7 +737,12 @@ + # CONFIG_ADJTIMEX is not set + # CONFIG_BBCONFIG is not set + # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set +-# CONFIG_BC is not set ++CONFIG_BC=y ++CONFIG_DC=y ++CONFIG_FEATURE_DC_BIG=y ++# CONFIG_FEATURE_DC_LIBM is not set ++CONFIG_FEATURE_BC_INTERACTIVE=y ++CONFIG_FEATURE_BC_LONG_OPTIONS=y + # CONFIG_BEEP is not set + CONFIG_FEATURE_BEEP_FREQ=0 + CONFIG_FEATURE_BEEP_LENGTH_MS=0 +@@ -756,9 +761,6 @@ + # CONFIG_FEATURE_CROND_SPECIAL_TIMES is not set + CONFIG_FEATURE_CROND_DIR="" + # CONFIG_CRONTAB is not set +-CONFIG_DC=y +-# CONFIG_FEATURE_DC_BIG is not set +-CONFIG_FEATURE_DC_LIBM=y + # CONFIG_DEVFSD is not set + # CONFIG_DEVFSD_MODLOAD is not set + # CONFIG_DEVFSD_FG_NP is not set +@@ -802,7 +804,7 @@ + # CONFIG_FEATURE_MAKEDEVS_LEAF is not set + # CONFIG_FEATURE_MAKEDEVS_TABLE is not set + # CONFIG_MAN is not set +-# CONFIG_MICROCOM is not set ++CONFIG_MICROCOM=y + # CONFIG_MT is not set + # CONFIG_NANDWRITE is not set + # CONFIG_NANDDUMP is not set +@@ -813,7 +815,7 @@ + # CONFIG_RUNLEVEL is not set + # CONFIG_RX is not set + CONFIG_SETFATTR=y +-# CONFIG_SETSERIAL is not set ++CONFIG_SETSERIAL=y + CONFIG_STRINGS=y + CONFIG_TIME=y + CONFIG_TS=y +@@ -836,20 +838,20 @@ + CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y + # CONFIG_VERBOSE_RESOLUTION_ERRORS is not set + # CONFIG_FEATURE_TLS_SHA1 is not set +-# CONFIG_ARP is not set +-# CONFIG_ARPING is not set ++CONFIG_ARP=y ++CONFIG_ARPING=y + CONFIG_BRCTL=y + CONFIG_FEATURE_BRCTL_FANCY=y + CONFIG_FEATURE_BRCTL_SHOW=y + # CONFIG_DNSD is not set +-# CONFIG_ETHER_WAKE is not set +-# CONFIG_FTPD is not set +-# CONFIG_FEATURE_FTPD_WRITE is not set +-# CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set +-# CONFIG_FEATURE_FTPD_AUTHENTICATION is not set +-# CONFIG_FTPGET is not set +-# CONFIG_FTPPUT is not set +-# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set ++CONFIG_ETHER_WAKE=y ++CONFIG_FTPD=y ++CONFIG_FEATURE_FTPD_WRITE=y ++CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y ++CONFIG_FEATURE_FTPD_AUTHENTICATION=y ++CONFIG_FTPGET=y ++CONFIG_FTPPUT=y ++CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y + CONFIG_HOSTNAME=y + CONFIG_DNSDOMAINNAME=y + CONFIG_HTTPD=y +@@ -880,12 +882,12 @@ + # CONFIG_FEATURE_IFUPDOWN_IPV6 is not set + # CONFIG_FEATURE_IFUPDOWN_MAPPING is not set + # CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set +-# CONFIG_INETD is not set +-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set +-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set +-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set +-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set +-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set ++CONFIG_INETD=y ++CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO=y ++CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD=y ++CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME=y ++CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME=y ++CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN=y + # CONFIG_FEATURE_INETD_RPC is not set + CONFIG_IP=y + CONFIG_IPADDR=y +@@ -906,11 +908,11 @@ + # CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set + # CONFIG_FEATURE_IPCALC_FANCY is not set + # CONFIG_FAKEIDENTD is not set +-# CONFIG_NAMEIF is not set +-# CONFIG_FEATURE_NAMEIF_EXTENDED is not set +-# CONFIG_NBDCLIENT is not set ++CONFIG_NAMEIF=y ++CONFIG_FEATURE_NAMEIF_EXTENDED=y ++CONFIG_NBDCLIENT=y + CONFIG_NC=y +-# CONFIG_NETCAT is not set ++CONFIG_NETCAT=y + CONFIG_NC_SERVER=y + CONFIG_NC_EXTRA=y + # CONFIG_NC_110_COMPAT is not set +@@ -928,13 +930,13 @@ + CONFIG_PING6=y + CONFIG_FEATURE_FANCY_PING=y + # CONFIG_PSCAN is not set +-# CONFIG_ROUTE is not set ++CONFIG_ROUTE=y + # CONFIG_SLATTACH is not set + CONFIG_SSL_CLIENT=y + CONFIG_TC=y + CONFIG_FEATURE_TC_INGRESS=y +-# CONFIG_TCPSVD is not set +-# CONFIG_UDPSVD is not set ++CONFIG_TCPSVD=y ++CONFIG_UDPSVD=y + CONFIG_TELNET=y + CONFIG_FEATURE_TELNET_TTYPE=y + CONFIG_FEATURE_TELNET_AUTOLOGIN=y +@@ -942,20 +944,21 @@ + # CONFIG_TELNETD is not set + # CONFIG_FEATURE_TELNETD_STANDALONE is not set + # CONFIG_FEATURE_TELNETD_INETD_WAIT is not set +-# CONFIG_TFTP is not set +-# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set +-# CONFIG_TFTPD is not set +-# CONFIG_FEATURE_TFTP_GET is not set +-# CONFIG_FEATURE_TFTP_PUT is not set +-# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set ++CONFIG_TFTP=y ++CONFIG_FEATURE_TFTP_PROGRESS_BAR=y ++CONFIG_FEATURE_TFTP_HPA_COMPAT=y ++CONFIG_TFTPD=y ++CONFIG_FEATURE_TFTP_GET=y ++CONFIG_FEATURE_TFTP_PUT=y ++CONFIG_FEATURE_TFTP_BLOCKSIZE=y + # CONFIG_TFTP_DEBUG is not set + CONFIG_TLS=y +-# CONFIG_TRACEROUTE is not set +-# CONFIG_TRACEROUTE6 is not set +-# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set +-# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set +-# CONFIG_TUNCTL is not set +-# CONFIG_FEATURE_TUNCTL_UG is not set ++CONFIG_TRACEROUTE=y ++CONFIG_TRACEROUTE6=y ++CONFIG_FEATURE_TRACEROUTE_VERBOSE=y ++CONFIG_FEATURE_TRACEROUTE_USE_ICMP=y ++CONFIG_TUNCTL=y ++CONFIG_FEATURE_TUNCTL_UG=y + # CONFIG_VCONFIG is not set + CONFIG_WGET=y + CONFIG_FEATURE_WGET_LONG_OPTIONS=y +@@ -966,21 +969,21 @@ + CONFIG_FEATURE_WGET_OPENSSL=y + CONFIG_WHOIS=y + # CONFIG_ZCIP is not set +-# CONFIG_UDHCPD is not set ++CONFIG_UDHCPD=y + # CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set +-# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set +-CONFIG_DHCPD_LEASES_FILE="" ++CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY=y ++CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases" + # CONFIG_DUMPLEASES is not set + # CONFIG_DHCPRELAY is not set + CONFIG_UDHCPC=y + CONFIG_FEATURE_UDHCPC_ARPING=y + CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y + CONFIG_UDHCPC_DEFAULT_SCRIPT="" +-# CONFIG_UDHCPC6 is not set +-# CONFIG_FEATURE_UDHCPC6_RFC3646 is not set +-# CONFIG_FEATURE_UDHCPC6_RFC4704 is not set +-# CONFIG_FEATURE_UDHCPC6_RFC4833 is not set +-# CONFIG_FEATURE_UDHCPC6_RFC5970 is not set ++CONFIG_UDHCPC6=y ++CONFIG_FEATURE_UDHCPC6_RFC3646=y ++CONFIG_FEATURE_UDHCPC6_RFC4704=y ++CONFIG_FEATURE_UDHCPC6_RFC4833=y ++CONFIG_FEATURE_UDHCPC6_RFC5970=y + + # + # Common options for DHCP applets +@@ -1002,13 +1005,13 @@ + # + # Mail Utilities + # +-# CONFIG_MAKEMIME is not set ++CONFIG_MAKEMIME=y + # CONFIG_POPMAILDIR is not set + # CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set +-# CONFIG_REFORMIME is not set +-# CONFIG_FEATURE_REFORMIME_COMPAT is not set +-# CONFIG_SENDMAIL is not set +-CONFIG_FEATURE_MIME_CHARSET="" ++CONFIG_REFORMIME=y ++CONFIG_FEATURE_REFORMIME_COMPAT=y ++CONFIG_SENDMAIL=y ++CONFIG_FEATURE_MIME_CHARSET="us-ascii" + + # + # Process Utilities +@@ -1021,7 +1024,7 @@ + CONFIG_KILLALL5=y + CONFIG_LSOF=y + CONFIG_MPSTAT=y +-# CONFIG_NMETER is not set ++CONFIG_NMETER=y + CONFIG_PGREP=y + CONFIG_PKILL=y + CONFIG_PIDOF=y +@@ -1037,7 +1040,7 @@ + CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS=y + CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y + CONFIG_PSTREE=y +-# CONFIG_PWDX is not set ++CONFIG_PWDX=y + # CONFIG_SMEMCAP is not set + CONFIG_BB_SYSCTL=y + CONFIG_TOP=y +@@ -1050,7 +1053,7 @@ + CONFIG_FEATURE_TOPMEM=y + CONFIG_UPTIME=y + # CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set +-# CONFIG_WATCH is not set ++CONFIG_WATCH=y + CONFIG_FEATURE_SHOW_THREADS=y + + # +@@ -1068,7 +1071,7 @@ + CONFIG_SV_DEFAULT_SERVICE_DIR="/var/service" + # CONFIG_SVC is not set + CONFIG_SVOK=y +-# CONFIG_SVLOGD is not set ++CONFIG_SVLOGD=y + # CONFIG_CHCON is not set + # CONFIG_GETENFORCE is not set + # CONFIG_GETSEBOOL is not set diff --git a/srcpkgs/busybox/template b/srcpkgs/busybox/template index c7c2e9ebbb9..63d7aeb7ceb 100644 --- a/srcpkgs/busybox/template +++ b/srcpkgs/busybox/template @@ -1,7 +1,7 @@ # Template file for 'busybox' pkgname=busybox version=1.31.1 -revision=4 +revision=5 hostmakedepends="perl" checkdepends="zip" short_desc="Swiss Army Knife of Embedded Linux" @@ -60,7 +60,7 @@ do_configure() { _patch_config busybox udhcpc ntpd _patch_config busybox-static udhcpc ntpd static - _patch_config busybox-huge udhcpc ntpd httpd mdev sysklogd + _patch_config busybox-huge udhcpc ntpd httpd mdev sysklogd huge for t in busybox-core busybox busybox-static busybox-huge; do make -C "${t}" KBUILD_SRC="${wrksrc}/src" -f "${wrksrc}/src/Makefile" prepare "${makejobs}"