diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-07-10 16:28:06 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-07-10 16:28:06 +0200 |
| commit | d4ae4b9c31f562aa4cd39b51d6d44ec07ac36f26 (patch) | |
| tree | 504566a72f7f3426b920ed0542a1ecebcb344795 /mk | |
| parent | 0a7cdf013e1a9aaeef82eb4809a0674330960b8e (diff) | |
update kernel 3.4.x, fix netfilter nat modules
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/kernel-ver.mk | 6 | ||||
| -rw-r--r-- | mk/modules.mk | 13 |
2 files changed, 15 insertions, 4 deletions
diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk index e80460f9c..157dcd059 100644 --- a/mk/kernel-ver.mk +++ b/mk/kernel-ver.mk @@ -10,9 +10,9 @@ KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 KERNEL_MD5SUM:= 70504d1685140e3ee355b9f860284d85 endif -ifeq ($(ADK_KERNEL_VERSION_3_4_51),y) -KERNEL_VERSION:= 3.4.51 +ifeq ($(ADK_KERNEL_VERSION_3_4_52),y) +KERNEL_VERSION:= 3.4.52 KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= f028dc67e2e8a782debc3207d47b33a0 +KERNEL_MD5SUM:= 97411d754781f6bae5c0a6e48849b3c9 endif diff --git a/mk/modules.mk b/mk/modules.mk index 4e247d98d..e3f8b1289 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -443,11 +443,22 @@ $(eval $(call KMOD_template,NF_CONNTRACK_IPV4,nf-conntrack-ipv4,\ $(MODULES_DIR)/kernel/net/ipv4/netfilter/nf_conntrack_ipv4 \ ,50)) -$(eval $(call KMOD_template,NF_NAT_IPV4,nf-nat-ipv4,\ +NAT:=NF_NAT_IPV4 +ifeq ($(KERNEL_BASE),3) +ifeq ($(KERNEL_MAJ),4) +NAT:=NF_NAT +$(eval $(call KMOD_template,$(NAT),full-nat,\ + $(MODULES_DIR)/kernel/net/ipv4/netfilter/nf_nat \ + $(MODULES_DIR)/kernel/net/ipv4/netfilter/iptable_nat \ +,50)) +else +$(eval $(call KMOD_template,$(NAT),full-nat,\ $(MODULES_DIR)/kernel/net/netfilter/nf_nat \ $(MODULES_DIR)/kernel/net/ipv4/netfilter/nf_nat_ipv4 \ $(MODULES_DIR)/kernel/net/ipv4/netfilter/iptable_nat \ ,50)) +endif +endif $(eval $(call KMOD_template,NF_CONNTRACK_FTP,nf-conntrack-ftp,\ $(MODULES_DIR)/kernel/net/netfilter/nf_conntrack_ftp \ |