diff options
| author | Ron Yorston <rmy@pobox.com> | 2021-03-24 11:55:30 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2021-03-24 12:43:15 +0000 |
| commit | 355a7a6c1e9626b7afe8758a6095f3cf275c52e1 (patch) | |
| tree | 6dab679c15b049cab97212e0b43077132eec1fbe /configs | |
| parent | 71ecc8033e6989996057b32577e71148fd544596 (diff) | |
| parent | 889425812b5cda8b3394d73253cbde7355fb1115 (diff) | |
| download | busybox-w32-w32_1_26_2.tar.gz busybox-w32-w32_1_26_2.tar.bz2 busybox-w32-w32_1_26_2.zip | |
Merge tag '1_26_2' into w32_1_26_2w32_1_26_2
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/mingw32_defconfig | 1 | ||||
| -rw-r--r-- | configs/mingw64_defconfig | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/configs/mingw32_defconfig b/configs/mingw32_defconfig index 35e7b1297..5801e26a2 100644 --- a/configs/mingw32_defconfig +++ b/configs/mingw32_defconfig | |||
| @@ -997,6 +997,7 @@ CONFIG_PS=y | |||
| 997 | # CONFIG_FEATURE_RUNSVDIR_LOG is not set | 997 | # CONFIG_FEATURE_RUNSVDIR_LOG is not set |
| 998 | # CONFIG_SV is not set | 998 | # CONFIG_SV is not set |
| 999 | CONFIG_SV_DEFAULT_SERVICE_DIR="" | 999 | CONFIG_SV_DEFAULT_SERVICE_DIR="" |
| 1000 | # CONFIG_SVC is not set | ||
| 1000 | # CONFIG_SVLOGD is not set | 1001 | # CONFIG_SVLOGD is not set |
| 1001 | # CONFIG_CHCON is not set | 1002 | # CONFIG_CHCON is not set |
| 1002 | # CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set | 1003 | # CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set |
diff --git a/configs/mingw64_defconfig b/configs/mingw64_defconfig index a5051285b..558c07d56 100644 --- a/configs/mingw64_defconfig +++ b/configs/mingw64_defconfig | |||
| @@ -997,6 +997,7 @@ CONFIG_PS=y | |||
| 997 | # CONFIG_FEATURE_RUNSVDIR_LOG is not set | 997 | # CONFIG_FEATURE_RUNSVDIR_LOG is not set |
| 998 | # CONFIG_SV is not set | 998 | # CONFIG_SV is not set |
| 999 | CONFIG_SV_DEFAULT_SERVICE_DIR="" | 999 | CONFIG_SV_DEFAULT_SERVICE_DIR="" |
| 1000 | # CONFIG_SVC is not set | ||
| 1000 | # CONFIG_SVLOGD is not set | 1001 | # CONFIG_SVLOGD is not set |
| 1001 | # CONFIG_CHCON is not set | 1002 | # CONFIG_CHCON is not set |
| 1002 | # CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set | 1003 | # CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set |