Ver código fonte

busybox: disable bzip2

bzip2 adds about 8kb of size. For tiny builds it's often disabled.
It's not directly used by stock OpenWrt programs.
Kernel images compressed with bzip2 are also not fully supported.

Signed-off-by: Sergey Ponomarev <[email protected]>
[fix \ indention]
Signed-off-by: Paul Spooren <[email protected]>
Sergey Ponomarev 4 anos atrás
pai
commit
bffee5ea19

+ 0 - 1
package/base-files/files/lib/upgrade/common.sh

@@ -96,7 +96,6 @@ get_image() { # <source> [ <command> ]
 		local magic="$(dd if="$from" bs=2 count=1 2>/dev/null | hexdump -n 2 -e '1/1 "%02x"')"
 		case "$magic" in
 			1f8b) cmd="zcat";;
-			425a) cmd="bzcat";;
 			*) cmd="cat";;
 		esac
 	fi

+ 1 - 1
package/base-files/files/lib/upgrade/stage2

@@ -39,7 +39,7 @@ switch_to_ramfs() {
 	for binary in \
 		/bin/busybox /bin/ash /bin/sh /bin/mount /bin/umount	\
 		pivot_root mount_root reboot sync kill sleep		\
-		md5sum hexdump cat zcat bzcat dd tar			\
+		md5sum hexdump cat zcat dd tar				\
 		ls basename find cp mv rm mkdir rmdir mknod touch chmod \
 		'[' printf wc grep awk sed cut				\
 		mtd partx losetup mkfs.ext4 nandwrite flash_erase	\

+ 2 - 2
package/utils/busybox/Config-defaults.in

@@ -351,10 +351,10 @@ config BUSYBOX_DEFAULT_FEATURE_GUNZIP_LONG_OPTIONS
 	default n
 config BUSYBOX_DEFAULT_BUNZIP2
 	bool
-	default y
+	default n
 config BUSYBOX_DEFAULT_BZCAT
 	bool
-	default y
+	default n
 config BUSYBOX_DEFAULT_UNLZMA
 	bool
 	default n