diff mbox

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

Message ID 1419083368-32054-1-git-send-email-john@szakmeister.net
State Rejected
Headers show

Commit Message

John Szakmeister Dec. 20, 2014, 1:49 p.m. UTC 
Without this, modprobe doesn't work with uncompressed kernel modules.

Signed-off-by: John Szakmeister <john@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

Comments

Felix Fietkau Dec. 20, 2014, 2:32 p.m. UTC | #1 
On 2014-12-20 14:49, John Szakmeister wrote:
> Without this, modprobe doesn't work with uncompressed kernel modules.
> 
> Signed-off-by: John Szakmeister <john@szakmeister.net>
Why do we need this patch in OpenWrt? We're not using busybox modprobe.

- Felix
John Szakmeister Dec. 20, 2014, 7:01 p.m. UTC | #2 
On Sat, Dec 20, 2014 at 9:32 AM, Felix Fietkau <nbd@openwrt.org> wrote:
> On 2014-12-20 14:49, John Szakmeister wrote:
>> Without this, modprobe doesn't work with uncompressed kernel modules.
>>
>> Signed-off-by: John Szakmeister <john@szakmeister.net>
> Why do we need this patch in OpenWrt? We're not using busybox modprobe.

I had it configured as being on and available in my configuration.  If
you don't feel you guys need it, then sorry for the noise.

-John
diff mbox

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@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@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