diff options
| author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2015-03-04 22:03:40 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2015-03-04 22:03:40 +0100 |
| commit | a2c7fc5c3bf86996e9c30ce2a692dbf7a65d60de (patch) | |
| tree | a0b6522f136e050ae50c304d7ed2a37982664abb /mk | |
| parent | 1b8b4b1839bb012877b8e98cc8932b4cf0349440 (diff) | |
| parent | f8a2963c529bd811e49693a0eaf3b1f19e90f1be (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/modules.mk | 14 | ||||
| -rw-r--r-- | mk/vars.mk | 8 |
2 files changed, 17 insertions, 5 deletions
diff --git a/mk/modules.mk b/mk/modules.mk index ccb48ba3e..3bf580ec1 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -473,13 +473,13 @@ $(eval $(call KMOD_template,NF_CONNTRACK,nf-conntrack,\ $(MODULES_DIR)/kernel/net/netfilter/xt_conntrack \ ,41)) -$(eval $(call KMOD_template,NETFILTER_XT_NAT,netfilter-xt-nat,\ - $(MODULES_DIR)/kernel/net/netfilter/xt_nat \ -,40)) - $(eval $(call KMOD_template,NF_NAT,nf-nat,\ $(MODULES_DIR)/kernel/net/netfilter/nf_nat \ -,45)) +,42)) + +$(eval $(call KMOD_template,NETFILTER_XT_NAT,netfilter-xt-nat,\ + $(MODULES_DIR)/kernel/net/netfilter/xt_nat \ +,43)) $(eval $(call KMOD_template,NF_CONNTRACK_IPV4,nf-conntrack-ipv4,\ $(MODULES_DIR)/kernel/net/ipv4/netfilter/nf_defrag_ipv4 \ @@ -488,6 +488,7 @@ $(eval $(call KMOD_template,NF_CONNTRACK_IPV4,nf-conntrack-ipv4,\ $(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 \ ,50)) $(eval $(call KMOD_template,IP_NF_NAT,ip-nf-nat,\ @@ -588,6 +589,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 \ ,60)) @@ -677,6 +679,7 @@ $(eval $(call KMOD_template,IP6_NF_FILTER,ip6-nf-filter,\ ,55)) $(eval $(call KMOD_template,IP6_NF_TARGET_REJECT,ip6-nf-target-reject,\ + $(MODULES_DIR)/kernel/net/ipv6/netfilter/nf_reject_ipv6 \ $(MODULES_DIR)/kernel/net/ipv6/netfilter/ip6t_REJECT \ ,60)) @@ -1099,6 +1102,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 \ ,27)) diff --git a/mk/vars.mk b/mk/vars.mk index 82173db00..9dd7e8735 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -11,9 +11,16 @@ BUILD_USER= $(shell id -un) BUILD_GROUP= $(shell id -gn) ifeq ($(ADK_TARGET_ABI),) ADK_SUFFIX:= _${ADK_TARGET_SYSTEM}_${ADK_TARGET_LIBC}_${ADK_TARGET_CPU_ARCH} +ifeq ($(ADK_TARGET_WITH_MMU),) +ADK_SUFFIX:= _${ADK_TARGET_SYSTEM}_${ADK_TARGET_LIBC}_${ADK_TARGET_CPU_ARCH}_nommu +endif +else +ifeq ($(ADK_TARGET_WITH_MMU),) +ADK_SUFFIX:= _${ADK_TARGET_SYSTEM}_${ADK_TARGET_LIBC}_${ADK_TARGET_CPU_ARCH}_${ADK_TARGET_ABI}_nommu else ADK_SUFFIX:= _${ADK_TARGET_SYSTEM}_${ADK_TARGET_LIBC}_${ADK_TARGET_CPU_ARCH}_${ADK_TARGET_ABI} endif +endif # some global dirs BASE_DIR:= $(ADK_TOPDIR) @@ -148,6 +155,7 @@ endif ifeq ($(ADK_TARGET_ARCH_ARM),y) ifeq ($(ADK_TARGET_BINFMT_FLAT),y) TARGET_CFLAGS+= -Wl,-elf2flt +TARGET_CXXFLAGS+= -Wl,-elf2flt endif endif |