From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 18 Jun 2012 23:59:57 +0000 (+0000)
Subject: zlib fix for btrfs
X-Git-Tag: attitude_adjustment_12.09~1065
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=231f5ebb2892c2b0f82edac6d2ae302d012b709a;p=openwrt%2Fsvn-archive%2Fopenwrt.git

zlib fix for btrfs

Hi,

yes, it is true...

In the standard, unpatched trunk is zlib_inflate.ko compiled, but not included
in any package... So, my previous version was functional, but with system bug.

Here is fixed patch.

On Wed, Jun 13, 2012 at 05:00:02PM +0200, Jo-Philipp Wich wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> - -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Hi.
>
> Shouldn't you also add CONFIG_ZLIB_DEFLATE to KCONFIG then?
>
> ~ Jow
> - -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.12 (GNU/Linux)
> Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
>
> iEYEARECAAYFAk/YqrcACgkQdputYINPTPM6dgCfYDgzK1XHiKDJNSdc/+HgIoRp
> HSgAoKdUxcqXzHqTLiyEkiQqCnDuuVmu
> =0DUX
> - -----END PGP SIGNATURE-----
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.12 (GNU/Linux)
> Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
>
> iEYEARECAAYFAk/YqvIACgkQdputYINPTPNMagCePNwPSYHfoCd5eXywQ+sTATqQ
> 2CQAoJW/Fez+DqflHlJVcvng/LvsfrCm
> =s6B0
> -----END PGP SIGNATURE-----
> _______________________________________________
> openwrt-devel mailing list
> openwrt-devel@lists.openwrt.org
> https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Signed-off-by: Michal Heppler <mhepp@ics.muni.cz>

SVN-Revision: 32444
---

diff --git a/package/kernel/modules/lib.mk b/package/kernel/modules/lib.mk
index 6029f79302..2875fb2379 100644
--- a/package/kernel/modules/lib.mk
+++ b/package/kernel/modules/lib.mk
@@ -139,9 +139,13 @@ $(eval $(call KernelPackage,lib-textsearch))
 define KernelPackage/lib-zlib
   SUBMENU:=$(LIB_MENU)
   TITLE:=Zlib support
-  KCONFIG:=CONFIG_ZLIB_DEFLATE
-  FILES:=$(LINUX_DIR)/lib/zlib_deflate/zlib_deflate.ko
-  AUTOLOAD:=$(call AutoLoad,08,zlib_deflate,1)
+  KCONFIG:= \
+    CONFIG_ZLIB_DEFLATE \
+    CONFIG_ZLIB_INFLATE
+  FILES:= \
+    $(LINUX_DIR)/lib/zlib_deflate/zlib_deflate.ko \
+    $(LINUX_DIR)/lib/zlib_inflate/zlib_inflate.ko
+  AUTOLOAD:=$(call AutoLoad,08,zlib_deflate zlib_inflate,1)
 endef
 
 $(eval $(call KernelPackage,lib-zlib))