aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2012-04-29 16:13:27 +0100
committerRon Yorston <rmy@pobox.com>2012-04-29 16:13:27 +0100
commit5356e90d85eadb7dc6edba7d3c6b9000bab6717f (patch)
treeae8cd4a5712ee67478bde3e49f8961ab96908a22
parentca64a1b573213fcbd89d5a5996c2f3442231c778 (diff)
downloadbusybox-w32-5356e90d85eadb7dc6edba7d3c6b9000bab6717f.tar.gz
busybox-w32-5356e90d85eadb7dc6edba7d3c6b9000bab6717f.tar.bz2
busybox-w32-5356e90d85eadb7dc6edba7d3c6b9000bab6717f.zip
win32: remove seamless compression from default config
-rw-r--r--archival/rpm2cpio.c2
-rw-r--r--archival/tar.c2
-rw-r--r--configs/mingw32_defconfig16
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)
79 close(rpm_fd); 79 close(rpm_fd);
80 } 80 }
81 81
82#if !ENABLE_PLATFORM_MINGW32
83 if (SEAMLESS_COMPRESSION) { 82 if (SEAMLESS_COMPRESSION) {
84 check_errors_in_children(0); 83 check_errors_in_children(0);
85 return bb_got_signal; 84 return bb_got_signal;
86 } 85 }
87#endif
88 return EXIT_SUCCESS; 86 return EXIT_SUCCESS;
89} 87}
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)
1096 if (ENABLE_FEATURE_CLEAN_UP /* && tar_handle->src_fd != STDIN_FILENO */) 1096 if (ENABLE_FEATURE_CLEAN_UP /* && tar_handle->src_fd != STDIN_FILENO */)
1097 close(tar_handle->src_fd); 1097 close(tar_handle->src_fd);
1098 1098
1099#if !ENABLE_PLATFORM_MINGW32
1100 if (SEAMLESS_COMPRESSION || OPT_COMPRESS) { 1099 if (SEAMLESS_COMPRESSION || OPT_COMPRESS) {
1101 check_errors_in_children(0); 1100 check_errors_in_children(0);
1102 return bb_got_signal; 1101 return bb_got_signal;
1103 } 1102 }
1104#endif
1105 return EXIT_SUCCESS; 1103 return EXIT_SUCCESS;
1106} 1104}
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 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Busybox version: 1.20.0 3# Busybox version: 1.20.0
4# Mon Apr 23 14:39:03 2012 4# Sun Apr 29 14:47:50 2012
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
@@ -128,11 +128,11 @@ CONFIG_IOCTL_HEX2STR_ERROR=y
128# 128#
129# Archival Utilities 129# Archival Utilities
130# 130#
131CONFIG_FEATURE_SEAMLESS_XZ=y 131# CONFIG_FEATURE_SEAMLESS_XZ is not set
132CONFIG_FEATURE_SEAMLESS_LZMA=y 132# CONFIG_FEATURE_SEAMLESS_LZMA is not set
133CONFIG_FEATURE_SEAMLESS_BZ2=y 133# CONFIG_FEATURE_SEAMLESS_BZ2 is not set
134CONFIG_FEATURE_SEAMLESS_GZ=y 134# CONFIG_FEATURE_SEAMLESS_GZ is not set
135CONFIG_FEATURE_SEAMLESS_Z=y 135# CONFIG_FEATURE_SEAMLESS_Z is not set
136CONFIG_AR=y 136CONFIG_AR=y
137CONFIG_FEATURE_AR_LONG_FILENAMES=y 137CONFIG_FEATURE_AR_LONG_FILENAMES=y
138CONFIG_FEATURE_AR_CREATE=y 138CONFIG_FEATURE_AR_CREATE=y
@@ -150,11 +150,11 @@ CONFIG_FEATURE_GZIP_LONG_OPTIONS=y
150CONFIG_GZIP_FAST=2 150CONFIG_GZIP_FAST=2
151CONFIG_LZOP=y 151CONFIG_LZOP=y
152# CONFIG_LZOP_COMPR_HIGH is not set 152# CONFIG_LZOP_COMPR_HIGH is not set
153CONFIG_RPM2CPIO=y 153# CONFIG_RPM2CPIO is not set
154# CONFIG_RPM is not set 154# CONFIG_RPM is not set
155CONFIG_TAR=y 155CONFIG_TAR=y
156CONFIG_FEATURE_TAR_CREATE=y 156CONFIG_FEATURE_TAR_CREATE=y
157CONFIG_FEATURE_TAR_AUTODETECT=y 157# CONFIG_FEATURE_TAR_AUTODETECT is not set
158# CONFIG_FEATURE_TAR_FROM is not set 158# CONFIG_FEATURE_TAR_FROM is not set
159CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y 159CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y
160# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set 160# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set