[OpenWrt-Devel] [PATCH] [package] busybox: add another upstream fix

John Szakmeister john at szakmeister.net
Sat Dec 20 08:49:27 EST 2014


Without this, modprobe doesn't work with uncompressed kernel modules.

Signed-off-by: John Szakmeister <john at szakmeister.net>
---
 .../008-upstream_no_fail_uncompressed.patch        | 31 ++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 package/utils/busybox/patches/008-upstream_no_fail_uncompressed.patch

diff --git a/package/utils/busybox/patches/008-upstream_no_fail_uncompressed.patch b/package/utils/busybox/patches/008-upstream_no_fail_uncompressed.patch
new file mode 100644
index 0000000..46df028
--- /dev/null
+++ b/package/utils/busybox/patches/008-upstream_no_fail_uncompressed.patch
@@ -0,0 +1,31 @@
+From b664f740d90880560ce46b11f766625341342e80 Mon Sep 17 00:00:00 2001
+From: Denys Vlasenko <vda.linux at googlemail.com>
+Date: Mon, 27 Jan 2014 12:02:18 +0000
+Subject: libbb: open_zipped() should not fail on non-compressed files
+
+Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
+---
+diff --git a/archival/libarchive/open_transformer.c b/archival/libarchive/open_transformer.c
+index 1aeba13..27854af 100644
+--- a/archival/libarchive/open_transformer.c
++++ b/archival/libarchive/open_transformer.c
+@@ -200,7 +200,16 @@ int FAST_FUNC open_zipped(const char *fname)
+ 	 || (ENABLE_FEATURE_SEAMLESS_BZ2)
+ 	 || (ENABLE_FEATURE_SEAMLESS_XZ)
+ 	) {
+-		setup_unzip_on_fd(fd, /*fail_if_not_detected:*/ 1);
++		/*
++		 * Do we want to fail_if_not_detected?
++		 * In most cases, no: think "insmod non_compressed_module".
++		 * A case which would like to fail is "zcat uncompressed_file":
++		 * otherwise, it happily outputs uncompressed_file as-is,
++		 * which is, strictly speaking, not what is expected.
++		 * If this ever becomes a problem, we can add
++		 * fail_if_not_detected bool argument to open_zipped().
++		 */
++		setup_unzip_on_fd(fd, /*fail_if_not_detected:*/ 0);
+ 	}
+ 
+ 	return fd;
+--
+cgit v0.9.1
-- 
2.1.1
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel



More information about the openwrt-devel mailing list