diff options
| author | Felix Fietkau <nbd@nbd.name> | 2016-12-26 11:11:18 +0100 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2016-12-26 11:11:49 +0100 |
| commit | d109d03198b4ff31d2e4259228a49fa1b3f10390 (patch) | |
| tree | f29fe95ccb87845f7f7e60e5486f9335e2db8299 /package/kernel | |
| parent | 2e41b2c37a0e3efbc43c2d73dface331c5e35b4f (diff) | |
| download | upstream-d109d03198b4ff31d2e4259228a49fa1b3f10390.tar.gz upstream-d109d03198b4ff31d2e4259228a49fa1b3f10390.tar.bz2 upstream-d109d03198b4ff31d2e4259228a49fa1b3f10390.zip | |
kernel: split kmod-lib-zlib into two packages to keep it in sync with kernel dependencies
Fixes build error on default config + selecting kmod-fs-isofs
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'package/kernel')
| -rw-r--r-- | package/kernel/linux/modules/crypto.mk | 2 | ||||
| -rw-r--r-- | package/kernel/linux/modules/fs.mk | 6 | ||||
| -rw-r--r-- | package/kernel/linux/modules/lib.mk | 26 |
3 files changed, 21 insertions, 13 deletions
diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk index 36fb1c31dc..6a076d762e 100644 --- a/package/kernel/linux/modules/crypto.mk +++ b/package/kernel/linux/modules/crypto.mk @@ -394,7 +394,7 @@ $(eval $(call KernelPackage,crypto-des)) define KernelPackage/crypto-deflate TITLE:=Deflate compression CryptoAPI module - DEPENDS:=+kmod-lib-zlib + DEPENDS:=+kmod-lib-zlib-inflate +kmod-lib-zlib-deflate KCONFIG:=CONFIG_CRYPTO_DEFLATE FILES:=$(LINUX_DIR)/crypto/deflate.ko AUTOLOAD:=$(call AutoLoad,09,deflate) diff --git a/package/kernel/linux/modules/fs.mk b/package/kernel/linux/modules/fs.mk index ce2408cdc4..4d69d9b140 100644 --- a/package/kernel/linux/modules/fs.mk +++ b/package/kernel/linux/modules/fs.mk @@ -82,7 +82,7 @@ $(eval $(call KernelPackage,fs-autofs4)) define KernelPackage/fs-btrfs SUBMENU:=$(FS_MENU) TITLE:=BTRFS filesystem support - DEPENDS:=+kmod-lib-crc32c +kmod-lib-lzo +kmod-lib-zlib +kmod-lib-raid6 +kmod-lib-xor + DEPENDS:=+kmod-lib-crc32c +kmod-lib-lzo +kmod-lib-zlib-inflate +kmod-lib-zlib-deflate +kmod-lib-raid6 +kmod-lib-xor KCONFIG:=\ CONFIG_BTRFS_FS \ CONFIG_BTRFS_FS_POSIX_ACL=n \ @@ -144,7 +144,7 @@ $(eval $(call KernelPackage,fs-configfs)) define KernelPackage/fs-cramfs SUBMENU:=$(FS_MENU) TITLE:=Compressed RAM/ROM filesystem support - DEPENDS:=+kmod-lib-zlib + DEPENDS:=+kmod-lib-zlib-inflate KCONFIG:= \ CONFIG_CRAMFS FILES:=$(LINUX_DIR)/fs/cramfs/cramfs.ko @@ -268,7 +268,7 @@ $(eval $(call KernelPackage,fs-hfsplus)) define KernelPackage/fs-isofs SUBMENU:=$(FS_MENU) TITLE:=ISO9660 filesystem support - DEPENDS:=+kmod-lib-zlib + DEPENDS:=+kmod-lib-zlib-inflate KCONFIG:=CONFIG_ISO9660_FS CONFIG_JOLIET=y CONFIG_ZISOFS=n FILES:=$(LINUX_DIR)/fs/isofs/isofs.ko AUTOLOAD:=$(call AutoLoad,30,isofs) diff --git a/package/kernel/linux/modules/lib.mk b/package/kernel/linux/modules/lib.mk index c5148ce487..72c5eff69c 100644 --- a/package/kernel/linux/modules/lib.mk +++ b/package/kernel/linux/modules/lib.mk @@ -195,20 +195,28 @@ endef $(eval $(call KernelPackage,lib-textsearch)) -define KernelPackage/lib-zlib +define KernelPackage/lib-zlib-inflate SUBMENU:=$(LIB_MENU) TITLE:=Zlib support HIDDEN:=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 AutoProbe,zlib_deflate zlib_inflate) + KCONFIG:=CONFIG_ZLIB_INFLATE + FILES:=$(LINUX_DIR)/lib/zlib_inflate/zlib_inflate.ko + AUTOLOAD:=$(call AutoProbe,zlib_inflate) +endef + +$(eval $(call KernelPackage,lib-zlib-inflate)) + + +define KernelPackage/lib-zlib-deflate + SUBMENU:=$(LIB_MENU) + TITLE:=Zlib support + HIDDEN:=1 + KCONFIG:=CONFIG_ZLIB_DEFLATE + FILES:=$(LINUX_DIR)/lib/zlib_deflate/zlib_deflate.ko + AUTOLOAD:=$(call AutoProbe,zlib_deflate) endef -$(eval $(call KernelPackage,lib-zlib)) +$(eval $(call KernelPackage,lib-zlib-deflate)) define KernelPackage/lib-cordic |