domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel: split kmod-lib-zlib into two packages to keep it in sync with kernel dependencies

Browse Source 
Fixes build error on default config + selecting kmod-fs-isofs

Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau
2016-12-26 11:11:18 +01:00
parent 2e41b2c37a
commit d109d03198
3 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package/kernel/linux/modules/crypto.mk
View File

@@ -394,7 +394,7 @@ $(eval $(call KernelPackage,crypto-des))
define KernelPackage/crypto-deflate define KernelPackage/crypto-deflate
TITLE:=Deflate compression CryptoAPI module TITLE:=Deflate compression CryptoAPI module
DEPENDS:=+kmod-lib-zlib DEPENDS:=+kmod-lib-zlib-inflate +kmod-lib-zlib-deflate
KCONFIG:=CONFIG_CRYPTO_DEFLATE KCONFIG:=CONFIG_CRYPTO_DEFLATE
FILES:=$(LINUX_DIR)/crypto/deflate.ko FILES:=$(LINUX_DIR)/crypto/deflate.ko
AUTOLOAD:=$(call AutoLoad,09,deflate) AUTOLOAD:=$(call AutoLoad,09,deflate)

6
package/kernel/linux/modules/fs.mk
View File

@@ -82,7 +82,7 @@ $(eval $(call KernelPackage,fs-autofs4))
define KernelPackage/fs-btrfs define KernelPackage/fs-btrfs
SUBMENU:=$(FS_MENU) SUBMENU:=$(FS_MENU)
TITLE:=BTRFS filesystem support 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:=\ KCONFIG:=\
CONFIG_BTRFS_FS \ CONFIG_BTRFS_FS \
CONFIG_BTRFS_FS_POSIX_ACL=n \ CONFIG_BTRFS_FS_POSIX_ACL=n \
@@ -144,7 +144,7 @@ $(eval $(call KernelPackage,fs-configfs))
define KernelPackage/fs-cramfs define KernelPackage/fs-cramfs
SUBMENU:=$(FS_MENU) SUBMENU:=$(FS_MENU)
TITLE:=Compressed RAM/ROM filesystem support TITLE:=Compressed RAM/ROM filesystem support
DEPENDS:=+kmod-lib-zlib DEPENDS:=+kmod-lib-zlib-inflate
KCONFIG:= \ KCONFIG:= \
CONFIG_CRAMFS CONFIG_CRAMFS
FILES:=$(LINUX_DIR)/fs/cramfs/cramfs.ko FILES:=$(LINUX_DIR)/fs/cramfs/cramfs.ko
@@ -268,7 +268,7 @@ $(eval $(call KernelPackage,fs-hfsplus))
define KernelPackage/fs-isofs define KernelPackage/fs-isofs
SUBMENU:=$(FS_MENU) SUBMENU:=$(FS_MENU)
TITLE:=ISO9660 filesystem support TITLE:=ISO9660 filesystem support
DEPENDS:=+kmod-lib-zlib DEPENDS:=+kmod-lib-zlib-inflate
KCONFIG:=CONFIG_ISO9660_FS CONFIG_JOLIET=y CONFIG_ZISOFS=n KCONFIG:=CONFIG_ISO9660_FS CONFIG_JOLIET=y CONFIG_ZISOFS=n
FILES:=$(LINUX_DIR)/fs/isofs/isofs.ko FILES:=$(LINUX_DIR)/fs/isofs/isofs.ko
AUTOLOAD:=$(call AutoLoad,30,isofs) AUTOLOAD:=$(call AutoLoad,30,isofs)

26
package/kernel/linux/modules/lib.mk
View File

@@ -195,20 +195,28 @@ endef
$(eval $(call KernelPackage,lib-textsearch)) $(eval $(call KernelPackage,lib-textsearch))
define KernelPackage/lib-zlib define KernelPackage/lib-zlib-inflate
SUBMENU:=$(LIB_MENU) SUBMENU:=$(LIB_MENU)
TITLE:=Zlib support TITLE:=Zlib support
HIDDEN:=1 HIDDEN:=1
KCONFIG:= \ KCONFIG:=CONFIG_ZLIB_INFLATE
CONFIG_ZLIB_DEFLATE \ FILES:=$(LINUX_DIR)/lib/zlib_inflate/zlib_inflate.ko
CONFIG_ZLIB_INFLATE AUTOLOAD:=$(call AutoProbe,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)
endef endef
$(eval $(call KernelPackage,lib-zlib)) $(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-deflate))
define KernelPackage/lib-cordic define KernelPackage/lib-cordic