From b8ada3ae2e1a054215ac2ce444e1c0db8d6c204f Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Oct 2019 23:55:42 +0300 Subject: [PATCH] general: Use getopt from util-linux --- core/busybox/checksums | 2 +- core/busybox/files/.config | 4 ++-- core/busybox/version | 2 +- core/util-linux/build | 4 ---- core/util-linux/version | 2 +- 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/core/busybox/checksums b/core/busybox/checksums index 0ed0f146..275c34f7 100644 --- a/core/busybox/checksums +++ b/core/busybox/checksums @@ -1,5 +1,5 @@ 0e4925392fd9f3743cc517e031b68b012b24a63b0cf6c1ff03cce7bb3846cc99 busybox-1.31.0.tar.bz2 -cec205da3bcd60e9b32a0c72233f2343d1a6a0e374df138419dd6f84c3cbff1c .config +64167e8af824c8308331c2a05c6ac1aab16e342f5e0273acaf7ad9c11ee881fb .config da3ef90a65abcbd112fa98a00799745d88d568cde290e049a5380dfc74de620a .config-suid 6c3eb5cf839c7a31c337df0cd8388b397e1415ffa7a63e9678552c9c63dd869f acpid.run 814dea14ac612125e97dcc1d619219b2c9dfc14850bf48d858421fb2c98eca12 crond.run diff --git a/core/busybox/files/.config b/core/busybox/files/.config index fdeded0a..f8e9536d 100644 --- a/core/busybox/files/.config +++ b/core/busybox/files/.config @@ -618,8 +618,8 @@ CONFIG_FEATURE_ACPID_COMPAT=y # CONFIG_FSCK_MINIX is not set # CONFIG_FSFREEZE is not set # CONFIG_FSTRIM is not set -CONFIG_GETOPT=y -CONFIG_FEATURE_GETOPT_LONG=y +# CONFIG_GETOPT is not set +# CONFIG_FEATURE_GETOPT_LONG is not set # CONFIG_HEXDUMP is not set # CONFIG_FEATURE_HEXDUMP_REVERSE is not set CONFIG_HD=y diff --git a/core/busybox/version b/core/busybox/version index 990426ca..7f1938c2 100644 --- a/core/busybox/version +++ b/core/busybox/version @@ -1 +1 @@ -1.31.0 8 +1.31.0 9 diff --git a/core/util-linux/build b/core/util-linux/build index 47cd67a3..0b9b18b8 100755 --- a/core/util-linux/build +++ b/core/util-linux/build @@ -21,7 +21,3 @@ make make DESTDIR="$1" install - -# Remove getopt as it is provided by busybox. (For some reason -# ./configure does not support it) -rm -f "$1/usr/bin/getopt" diff --git a/core/util-linux/version b/core/util-linux/version index 8ac1a55f..5c4b0a5a 100644 --- a/core/util-linux/version +++ b/core/util-linux/version @@ -1 +1 @@ -2.34 3 +2.34 4