From 5356e90d85eadb7dc6edba7d3c6b9000bab6717f Mon Sep 17 00:00:00 2001 From: Ron Yorston Date: Sun, 29 Apr 2012 16:13:27 +0100 Subject: win32: remove seamless compression from default config --- archival/rpm2cpio.c | 2 -- archival/tar.c | 2 -- configs/mingw32_defconfig | 16 ++++++++-------- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/archival/rpm2cpio.c b/archival/rpm2cpio.c index 898d4aca4..f3dfa5159 100644 --- a/archival/rpm2cpio.c +++ b/archival/rpm2cpio.c @@ -79,11 +79,9 @@ int rpm2cpio_main(int argc UNUSED_PARAM, char **argv) close(rpm_fd); } -#if !ENABLE_PLATFORM_MINGW32 if (SEAMLESS_COMPRESSION) { check_errors_in_children(0); return bb_got_signal; } -#endif return EXIT_SUCCESS; } diff --git a/archival/tar.c b/archival/tar.c index fcd128a91..9fa5a0f44 100644 --- a/archival/tar.c +++ b/archival/tar.c @@ -1096,11 +1096,9 @@ int tar_main(int argc UNUSED_PARAM, char **argv) if (ENABLE_FEATURE_CLEAN_UP /* && tar_handle->src_fd != STDIN_FILENO */) close(tar_handle->src_fd); -#if !ENABLE_PLATFORM_MINGW32 if (SEAMLESS_COMPRESSION || OPT_COMPRESS) { check_errors_in_children(0); return bb_got_signal; } -#endif return EXIT_SUCCESS; } diff --git a/configs/mingw32_defconfig b/configs/mingw32_defconfig index aeb07276f..17f3bf571 100644 --- a/configs/mingw32_defconfig +++ b/configs/mingw32_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.20.0 -# Mon Apr 23 14:39:03 2012 +# Sun Apr 29 14:47:50 2012 # CONFIG_HAVE_DOT_CONFIG=y # CONFIG_PLATFORM_POSIX is not set @@ -128,11 +128,11 @@ CONFIG_IOCTL_HEX2STR_ERROR=y # # Archival Utilities # -CONFIG_FEATURE_SEAMLESS_XZ=y -CONFIG_FEATURE_SEAMLESS_LZMA=y -CONFIG_FEATURE_SEAMLESS_BZ2=y -CONFIG_FEATURE_SEAMLESS_GZ=y -CONFIG_FEATURE_SEAMLESS_Z=y +# CONFIG_FEATURE_SEAMLESS_XZ is not set +# CONFIG_FEATURE_SEAMLESS_LZMA is not set +# CONFIG_FEATURE_SEAMLESS_BZ2 is not set +# CONFIG_FEATURE_SEAMLESS_GZ is not set +# CONFIG_FEATURE_SEAMLESS_Z is not set CONFIG_AR=y CONFIG_FEATURE_AR_LONG_FILENAMES=y CONFIG_FEATURE_AR_CREATE=y @@ -150,11 +150,11 @@ CONFIG_FEATURE_GZIP_LONG_OPTIONS=y CONFIG_GZIP_FAST=2 CONFIG_LZOP=y # CONFIG_LZOP_COMPR_HIGH is not set -CONFIG_RPM2CPIO=y +# CONFIG_RPM2CPIO is not set # CONFIG_RPM is not set CONFIG_TAR=y CONFIG_FEATURE_TAR_CREATE=y -CONFIG_FEATURE_TAR_AUTODETECT=y +# CONFIG_FEATURE_TAR_AUTODETECT is not set # CONFIG_FEATURE_TAR_FROM is not set CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y # CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set -- cgit v1.2.3-55-g6feb