aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2018-11-02 19:25:06 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2018-12-15 14:28:49 +0100
commit35e0f600d8c1304e25a3996efdef905c1387295c (patch)
treecec61c78a1ba5bc5a5f7ec279af12b032a89d9ba
parent36bf45ff4a05834bacb56968b1efe8e1d94ae007 (diff)
downloadupstream-35e0f600d8c1304e25a3996efdef905c1387295c.tar.gz
upstream-35e0f600d8c1304e25a3996efdef905c1387295c.tar.bz2
upstream-35e0f600d8c1304e25a3996efdef905c1387295c.zip
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 <hauke@hauke-m.de>
-rw-r--r--package/kernel/linux/modules/crypto.mk3
-rw-r--r--package/kernel/linux/modules/lib.mk11
-rw-r--r--package/kernel/linux/modules/netfilter.mk2
3 files changed, 13 insertions, 3 deletions
diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk
index 08eaa003e8..4892f14932 100644
--- a/package/kernel/linux/modules/crypto.mk
+++ b/package/kernel/linux/modules/crypto.mk
@@ -570,11 +570,10 @@ $(eval $(call KernelPackage,crypto-pcompress))
define KernelPackage/crypto-rsa
TITLE:=RSA algorithm
- DEPENDS:=@!LINUX_3_18 +kmod-crypto-manager
+ DEPENDS:=@!LINUX_3_18 +kmod-crypto-manager +kmod-asn1-decoder
KCONFIG:= CONFIG_CRYPTO_RSA
HIDDEN:=1
FILES:= \
- $(LINUX_DIR)/lib/asn1_decoder.ko \
$(LINUX_DIR)/lib/mpi/mpi.ko \
$(LINUX_DIR)/crypto/akcipher.ko \
$(LINUX_DIR)/crypto/rsa_generic.ko
diff --git a/package/kernel/linux/modules/lib.mk b/package/kernel/linux/modules/lib.mk
index 4f2f7b88e6..b0d19ff8bd 100644
--- a/package/kernel/linux/modules/lib.mk
+++ b/package/kernel/linux/modules/lib.mk
@@ -260,3 +260,14 @@ define KernelPackage/lib-cordic/description
endef
$(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))
diff --git a/package/kernel/linux/modules/netfilter.mk b/package/kernel/linux/modules/netfilter.mk
index 63a535eee7..6daab752f7 100644
--- a/package/kernel/linux/modules/netfilter.mk
+++ b/package/kernel/linux/modules/netfilter.mk
@@ -539,7 +539,7 @@ define KernelPackage/nf-nathelper-extra
KCONFIG:=$(KCONFIG_NF_NATHELPER_EXTRA)
FILES:=$(foreach mod,$(NF_NATHELPER_EXTRA-m),$(LINUX_DIR)/net/$(mod).ko)
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
define KernelPackage/nf-nathelper-extra/description