diff options
| author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2015-05-22 20:25:07 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2015-05-22 20:25:07 +0200 |
| commit | 2ac4acec69505a6bc7100a842a082e320163fd02 (patch) | |
| tree | 7111f4ac408d68ed52695315b34294ba39b99a2c /mk | |
| parent | 3f77267eefa441fd95dd797e6978c025f7870069 (diff) | |
| parent | 7347729c19f83d11137932681282f80004e4dd6a (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/modules-3.14.mk | 3 | ||||
| -rw-r--r-- | mk/modules-3.18.mk | 3 | ||||
| -rw-r--r-- | mk/modules.mk | 9 |
3 files changed, 9 insertions, 6 deletions
diff --git a/mk/modules-3.14.mk b/mk/modules-3.14.mk index 2e3f99027..7a901ca5d 100644 --- a/mk/modules-3.14.mk +++ b/mk/modules-3.14.mk @@ -3,3 +3,6 @@ USBMODULES:=drivers/usb/usb-common drivers/usb/core/usbcore USBUDC:=gadget +NF_NAT_MASQ:=net/ipv4/netfilter/nf_nat_ipv4 +NF_REJECT:=net/ipv4/netfilter/ipt_REJECT +LOCKD:=fs/lockd/lockd diff --git a/mk/modules-3.18.mk b/mk/modules-3.18.mk index a4f7f84b3..46da18a74 100644 --- a/mk/modules-3.18.mk +++ b/mk/modules-3.18.mk @@ -3,3 +3,6 @@ USBMODULES:=drivers/usb/common/usb-common drivers/usb/core/usbcore USBUDC:=gadget/udc +NF_NAT_MASQ:=net/ipv4/netfilter/nf_nat_ipv4 net/ipv4/netfilter/nf_nat_masquerade_ipv4 +NF_REJECT:=net/ipv4/netfilter/ipt_REJECT net/ipv4/netfilter/nf_reject_ipv4 +LOCKD:=fs/nfs_common/grace fs/lockd/lockd diff --git a/mk/modules.mk b/mk/modules.mk index 764dbb01d..91b31f0dd 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -499,8 +499,7 @@ $(eval $(call KMOD_template,NF_CONNTRACK_IPV4,nf-conntrack-ipv4,\ ,46)) $(eval $(call KMOD_template,NF_NAT_IPV4,nf-nat-ipv4,\ - $(MODULES_DIR)/kernel/net/ipv4/netfilter/nf_nat_ipv4 \ - $(MODULES_DIR)/kernel/net/ipv4/netfilter/nf_nat_masquerade_ipv4 \ + $(foreach mod, $(NF_NAT_MASQ),$(MODULES_DIR)/kernel/$(mod)) \ ,50)) $(eval $(call KMOD_template,IP_NF_NAT,ip-nf-nat,\ @@ -601,8 +600,7 @@ $(eval $(call KMOD_template,IP_NF_FILTER,ip-nf-filter,\ ,55)) $(eval $(call KMOD_template,IP_NF_TARGET_REJECT,ip-nf-target-reject,\ - $(MODULES_DIR)/kernel/net/ipv4/netfilter/nf_reject_ipv4 \ - $(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_REJECT \ + $(foreach mod, $(NF_REJECT),$(MODULES_DIR)/kernel/$(mod)) \ ,60)) $(eval $(call KMOD_template,IP_NF_TARGET_TCPMSS,ip-nf-target-tcpmss,\ @@ -1114,8 +1112,7 @@ $(eval $(call KMOD_template,RPCSEC_GSS_KRB5,rpcsec-gss-krb5,\ ,26)) $(eval $(call KMOD_template,LOCKD,lockd,\ - $(MODULES_DIR)/kernel/fs/nfs_common/grace \ - $(MODULES_DIR)/kernel/fs/lockd/lockd \ + $(foreach mod, $(LOCKD),$(MODULES_DIR)/kernel/$(mod)) \ ,27)) ifneq ($(ADK_KERNEL_NFS_FS),y) |