瀏覽代碼

kernel: extract asn1_decoder.ko

The asn1_decoder.ko module is needed by the kmod-nf-nathelper-extra
package in kernel 4.19, extract it and add the missing dependencies.

Signed-off-by: Hauke Mehrtens <[email protected]>
Hauke Mehrtens 7 年之前
父節點
當前提交
35e0f600d8

+ 1 - 2
package/kernel/linux/modules/crypto.mk

@@ -570,11 +570,10 @@ $(eval $(call KernelPackage,crypto-pcompress))
 
 
 define KernelPackage/crypto-rsa
 define KernelPackage/crypto-rsa
   TITLE:=RSA algorithm
   TITLE:=RSA algorithm
-  DEPENDS:=@!LINUX_3_18 +kmod-crypto-manager
+  DEPENDS:=@!LINUX_3_18 +kmod-crypto-manager +kmod-asn1-decoder
   KCONFIG:= CONFIG_CRYPTO_RSA
   KCONFIG:= CONFIG_CRYPTO_RSA
   HIDDEN:=1
   HIDDEN:=1
   FILES:= \
   FILES:= \
-	$(LINUX_DIR)/lib/asn1_decoder.ko \
 	$(LINUX_DIR)/lib/mpi/mpi.ko \
 	$(LINUX_DIR)/lib/mpi/mpi.ko \
 	$(LINUX_DIR)/crypto/akcipher.ko \
 	$(LINUX_DIR)/crypto/akcipher.ko \
 	$(LINUX_DIR)/crypto/rsa_generic.ko
 	$(LINUX_DIR)/crypto/rsa_generic.ko

+ 11 - 0
package/kernel/linux/modules/lib.mk

@@ -260,3 +260,14 @@ define KernelPackage/lib-cordic/description
 endef
 endef
 
 
 $(eval $(call KernelPackage,lib-cordic))
 $(eval $(call KernelPackage,lib-cordic))
+
+
+define KernelPackage/asn1-decoder
+  SUBMENU:=$(LIB_MENU)
+  TITLE:=Simple ASN1 decoder
+  KCONFIG:= CONFIG_ASN1
+  HIDDEN:=1
+  FILES:=$(LINUX_DIR)/lib/asn1_decoder.ko
+endef
+
+$(eval $(call KernelPackage,asn1-decoder))

+ 1 - 1
package/kernel/linux/modules/netfilter.mk

@@ -539,7 +539,7 @@ define KernelPackage/nf-nathelper-extra
   KCONFIG:=$(KCONFIG_NF_NATHELPER_EXTRA)
   KCONFIG:=$(KCONFIG_NF_NATHELPER_EXTRA)
   FILES:=$(foreach mod,$(NF_NATHELPER_EXTRA-m),$(LINUX_DIR)/net/$(mod).ko)
   FILES:=$(foreach mod,$(NF_NATHELPER_EXTRA-m),$(LINUX_DIR)/net/$(mod).ko)
   AUTOLOAD:=$(call AutoProbe,$(notdir $(NF_NATHELPER_EXTRA-m)))
   AUTOLOAD:=$(call AutoProbe,$(notdir $(NF_NATHELPER_EXTRA-m)))
-  DEPENDS:=+kmod-nf-nat +kmod-lib-textsearch +kmod-ipt-raw
+  DEPENDS:=+kmod-nf-nat +kmod-lib-textsearch +kmod-ipt-raw +LINUX_4_19:kmod-asn1-decoder
 endef
 endef
 
 
 define KernelPackage/nf-nathelper-extra/description
 define KernelPackage/nf-nathelper-extra/description