aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2017-09-27 10:31:48 +0100
committerRon Yorston <rmy@pobox.com>2017-09-27 10:31:48 +0100
commit236e13e3da46e10607d32905b96e3f5e3330700e (patch)
tree418db43a487c7ea7da5fe8834e272b1e8310ea9f
parentd9383e984da8de72e61e5094a3cf6404c5707ddc (diff)
downloadbusybox-w32-236e13e3da46e10607d32905b96e3f5e3330700e.tar.gz
busybox-w32-236e13e3da46e10607d32905b96e3f5e3330700e.tar.bz2
busybox-w32-236e13e3da46e10607d32905b96e3f5e3330700e.zip
Post-merge fixes
Diffstat
-rw-r--r--configs/mingw32_defconfig7
-rw-r--r--configs/mingw64_defconfig7
2 files changed, 12 insertions, 2 deletions
diff --git a/configs/mingw32_defconfig b/configs/mingw32_defconfig
index 3a30cf366..92935f9fb 100644
--- a/configs/mingw32_defconfig
+++ b/configs/mingw32_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Busybox version: 1.28.0.git 3# Busybox version: 1.28.0.git
4# Tue Aug 22 15:08:16 2017 4# Wed Sep 27 10:21:20 2017
5# 5#
6CONFIG_HAVE_DOT_CONFIG=y 6CONFIG_HAVE_DOT_CONFIG=y
7# CONFIG_PLATFORM_POSIX is not set 7# CONFIG_PLATFORM_POSIX is not set
@@ -465,6 +465,8 @@ CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y
465CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y 465CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y
466CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y 466CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
467CONFIG_FEATURE_XARGS_SUPPORT_REPL_STR=y 467CONFIG_FEATURE_XARGS_SUPPORT_REPL_STR=y
468# CONFIG_FEATURE_XARGS_SUPPORT_PARALLEL is not set
469CONFIG_FEATURE_XARGS_SUPPORT_ARGS_FILE=y
468 470
469# 471#
470# Init Utilities 472# Init Utilities
@@ -753,6 +755,7 @@ CONFIG_FEATURE_DC_LIBM=y
753# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set 755# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
754# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set 756# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
755# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set 757# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set
758# CONFIG_HEXEDIT is not set
756# CONFIG_I2CGET is not set 759# CONFIG_I2CGET is not set
757# CONFIG_I2CSET is not set 760# CONFIG_I2CSET is not set
758# CONFIG_I2CDUMP is not set 761# CONFIG_I2CDUMP is not set
@@ -784,6 +787,7 @@ CONFIG_MAN=y
784# CONFIG_RFKILL is not set 787# CONFIG_RFKILL is not set
785# CONFIG_RUNLEVEL is not set 788# CONFIG_RUNLEVEL is not set
786# CONFIG_RX is not set 789# CONFIG_RX is not set
790# CONFIG_SETFATTR is not set
787# CONFIG_SETSERIAL is not set 791# CONFIG_SETSERIAL is not set
788CONFIG_STRINGS=y 792CONFIG_STRINGS=y
789# CONFIG_TIME is not set 793# CONFIG_TIME is not set
@@ -879,6 +883,7 @@ CONFIG_FEATURE_IPCALC_FANCY=y
879# CONFIG_FEATURE_NAMEIF_EXTENDED is not set 883# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
880# CONFIG_NBDCLIENT is not set 884# CONFIG_NBDCLIENT is not set
881CONFIG_NC=y 885CONFIG_NC=y
886# CONFIG_NETCAT is not set
882CONFIG_NC_SERVER=y 887CONFIG_NC_SERVER=y
883# CONFIG_NC_EXTRA is not set 888# CONFIG_NC_EXTRA is not set
884# CONFIG_NC_110_COMPAT is not set 889# CONFIG_NC_110_COMPAT is not set
diff --git a/configs/mingw64_defconfig b/configs/mingw64_defconfig
index c474c13ee..cc845c3f2 100644
--- a/configs/mingw64_defconfig
+++ b/configs/mingw64_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Busybox version: 1.28.0.git 3# Busybox version: 1.28.0.git
4# Tue Aug 22 15:08:16 2017 4# Wed Sep 27 10:21:20 2017
5# 5#
6CONFIG_HAVE_DOT_CONFIG=y 6CONFIG_HAVE_DOT_CONFIG=y
7# CONFIG_PLATFORM_POSIX is not set 7# CONFIG_PLATFORM_POSIX is not set
@@ -465,6 +465,8 @@ CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y
465CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y 465CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y
466CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y 466CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
467CONFIG_FEATURE_XARGS_SUPPORT_REPL_STR=y 467CONFIG_FEATURE_XARGS_SUPPORT_REPL_STR=y
468# CONFIG_FEATURE_XARGS_SUPPORT_PARALLEL is not set
469CONFIG_FEATURE_XARGS_SUPPORT_ARGS_FILE=y
468 470
469# 471#
470# Init Utilities 472# Init Utilities
@@ -753,6 +755,7 @@ CONFIG_FEATURE_DC_LIBM=y
753# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set 755# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
754# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set 756# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
755# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set 757# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set
758# CONFIG_HEXEDIT is not set
756# CONFIG_I2CGET is not set 759# CONFIG_I2CGET is not set
757# CONFIG_I2CSET is not set 760# CONFIG_I2CSET is not set
758# CONFIG_I2CDUMP is not set 761# CONFIG_I2CDUMP is not set
@@ -784,6 +787,7 @@ CONFIG_MAN=y
784# CONFIG_RFKILL is not set 787# CONFIG_RFKILL is not set
785# CONFIG_RUNLEVEL is not set 788# CONFIG_RUNLEVEL is not set
786# CONFIG_RX is not set 789# CONFIG_RX is not set
790# CONFIG_SETFATTR is not set
787# CONFIG_SETSERIAL is not set 791# CONFIG_SETSERIAL is not set
788CONFIG_STRINGS=y 792CONFIG_STRINGS=y
789# CONFIG_TIME is not set 793# CONFIG_TIME is not set
@@ -879,6 +883,7 @@ CONFIG_FEATURE_IPCALC_FANCY=y
879# CONFIG_FEATURE_NAMEIF_EXTENDED is not set 883# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
880# CONFIG_NBDCLIENT is not set 884# CONFIG_NBDCLIENT is not set
881CONFIG_NC=y 885CONFIG_NC=y
886# CONFIG_NETCAT is not set
882CONFIG_NC_SERVER=y 887CONFIG_NC_SERVER=y
883# CONFIG_NC_EXTRA is not set 888# CONFIG_NC_EXTRA is not set
884# CONFIG_NC_110_COMPAT is not set 889# CONFIG_NC_110_COMPAT is not set
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-22 09:17:36 +0000