From: Denys Vlasenko Date: Sun, 27 Nov 2016 02:57:08 +0000 (+0100) Subject: dpkg-deb: remove unused FEATURE_DPKG_DEB_EXTRACT_ONLY config option X-Git-Tag: 1_26_0~28 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6747bdac88d44d1b3729f56760ae7f6829c85d9f;p=oweals%2Fbusybox.git dpkg-deb: remove unused FEATURE_DPKG_DEB_EXTRACT_ONLY config option Its usage in C code was removed in 2004. Signed-off-by: Denys Vlasenko --- diff --git a/archival/dpkg_deb.c b/archival/dpkg_deb.c index 0285273fe..d34de254a 100644 --- a/archival/dpkg_deb.c +++ b/archival/dpkg_deb.c @@ -16,18 +16,9 @@ //config: //config: Unless you have a specific application which requires dpkg-deb, //config: say N here. -//config: -//config:config FEATURE_DPKG_DEB_EXTRACT_ONLY -//config: bool "Extract only (-x)" -//config: default n -//config: depends on DPKG_DEB -//config: help -//config: This reduces dpkg-deb to the equivalent of -//config: "ar -p data.tar.gz | tar -zx". However it saves space as none -//config: of the extra dpkg-deb, ar or tar options are needed, they are linked -//config: to internally. //applet:IF_DPKG_DEB(APPLET_ODDNAME(dpkg-deb, dpkg_deb, BB_DIR_USR_BIN, BB_SUID_DROP, dpkg_deb)) + //kbuild:lib-$(CONFIG_DPKG_DEB) += dpkg_deb.o //usage:#define dpkg_deb_trivial_usage diff --git a/configs/TEST_nommu_defconfig b/configs/TEST_nommu_defconfig index 20c2e1550..08351a294 100644 --- a/configs/TEST_nommu_defconfig +++ b/configs/TEST_nommu_defconfig @@ -118,7 +118,6 @@ CONFIG_FEATURE_CPIO_O=y CONFIG_FEATURE_CPIO_P=y CONFIG_DPKG=y CONFIG_DPKG_DEB=y -CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY=y CONFIG_GUNZIP=y CONFIG_GZIP=y CONFIG_FEATURE_GZIP_LONG_OPTIONS=y diff --git a/configs/TEST_noprintf_defconfig b/configs/TEST_noprintf_defconfig index 845032ea1..70dacece0 100644 --- a/configs/TEST_noprintf_defconfig +++ b/configs/TEST_noprintf_defconfig @@ -130,7 +130,6 @@ CONFIG_FEATURE_SEAMLESS_Z=y # CONFIG_FEATURE_CPIO_P is not set # CONFIG_DPKG is not set # CONFIG_DPKG_DEB is not set -# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set # CONFIG_GUNZIP is not set # CONFIG_GZIP is not set # CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set diff --git a/configs/TEST_rh9_defconfig b/configs/TEST_rh9_defconfig index d8c5af4f7..4a5fad324 100644 --- a/configs/TEST_rh9_defconfig +++ b/configs/TEST_rh9_defconfig @@ -128,7 +128,6 @@ CONFIG_FEATURE_CPIO_O=y CONFIG_FEATURE_CPIO_P=y # CONFIG_DPKG is not set # CONFIG_DPKG_DEB is not set -# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set CONFIG_GUNZIP=y CONFIG_GZIP=y CONFIG_FEATURE_GZIP_LONG_OPTIONS=y diff --git a/configs/android2_defconfig b/configs/android2_defconfig index 857f9f5df..754f612c6 100644 --- a/configs/android2_defconfig +++ b/configs/android2_defconfig @@ -134,7 +134,6 @@ CONFIG_FEATURE_CPIO_O=y CONFIG_FEATURE_CPIO_P=y CONFIG_DPKG=y CONFIG_DPKG_DEB=y -# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set CONFIG_GUNZIP=y CONFIG_GZIP=y # CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set diff --git a/configs/android_502_defconfig b/configs/android_502_defconfig index cd06affab..8ea6c295d 100644 --- a/configs/android_502_defconfig +++ b/configs/android_502_defconfig @@ -224,7 +224,6 @@ CONFIG_FEATURE_CPIO_O=y CONFIG_FEATURE_CPIO_P=y # CONFIG_DPKG is not set # CONFIG_DPKG_DEB is not set -# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set CONFIG_GZIP=y CONFIG_FEATURE_GZIP_LONG_OPTIONS=y CONFIG_GZIP_FAST=0 diff --git a/configs/android_defconfig b/configs/android_defconfig index f1ddc45d4..30e888ac7 100644 --- a/configs/android_defconfig +++ b/configs/android_defconfig @@ -154,7 +154,6 @@ CONFIG_FEATURE_CPIO_O=y CONFIG_FEATURE_CPIO_P=y CONFIG_DPKG=y CONFIG_DPKG_DEB=y -# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set CONFIG_GUNZIP=y CONFIG_GZIP=y # CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set diff --git a/configs/android_ndk_defconfig b/configs/android_ndk_defconfig index 18651fd7c..716ec9a5d 100644 --- a/configs/android_ndk_defconfig +++ b/configs/android_ndk_defconfig @@ -151,7 +151,6 @@ CONFIG_FEATURE_CPIO_O=y CONFIG_FEATURE_CPIO_P=y CONFIG_DPKG=y CONFIG_DPKG_DEB=y -# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set CONFIG_GZIP=y # CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set CONFIG_GZIP_FAST=0 diff --git a/configs/cygwin_defconfig b/configs/cygwin_defconfig index dd7c21edb..b856482f6 100644 --- a/configs/cygwin_defconfig +++ b/configs/cygwin_defconfig @@ -134,7 +134,6 @@ CONFIG_FEATURE_CPIO_O=y CONFIG_FEATURE_CPIO_P=y # CONFIG_DPKG is not set # CONFIG_DPKG_DEB is not set -# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set CONFIG_GUNZIP=y CONFIG_GZIP=y CONFIG_FEATURE_GZIP_LONG_OPTIONS=y diff --git a/configs/freebsd_defconfig b/configs/freebsd_defconfig index 265ab1307..4f14d3be9 100644 --- a/configs/freebsd_defconfig +++ b/configs/freebsd_defconfig @@ -132,7 +132,6 @@ CONFIG_CPIO=y # CONFIG_FEATURE_CPIO_P is not set # CONFIG_DPKG is not set # CONFIG_DPKG_DEB is not set -# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set CONFIG_GUNZIP=y CONFIG_GZIP=y CONFIG_FEATURE_GZIP_LONG_OPTIONS=y