From e8583149d4dd16b7cedc135d63a46138dffcef85 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 2 Mar 2015 11:53:35 -0600
Subject: update elf2flt, so that arm-nommu binaries are linkable.

---
 mk/vars.mk | 1 +
 1 file changed, 1 insertion(+)

(limited to 'mk')

diff --git a/mk/vars.mk b/mk/vars.mk
index 82173db00..605248a37 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -148,6 +148,7 @@ endif
 ifeq ($(ADK_TARGET_ARCH_ARM),y)
 ifeq ($(ADK_TARGET_BINFMT_FLAT),y)
 TARGET_CFLAGS+=		-Wl,-elf2flt
+TARGET_CXXFLAGS+=	-Wl,-elf2flt
 endif
 endif
 
-- 
cgit v1.2.3


From 4876df8cb79b2bac3ba9ae02b3609f8d63309c16 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 2 Mar 2015 18:53:11 +0100
Subject: update some kernel mod dependencies. need better backward
 compatibility

---
 mk/modules.mk | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'mk')

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))
 
-- 
cgit v1.2.3


From f8a2963c529bd811e49693a0eaf3b1f19e90f1be Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 4 Mar 2015 13:32:52 -0600
Subject: use separate directories for nommu setup

---
 mk/vars.mk | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'mk')

diff --git a/mk/vars.mk b/mk/vars.mk
index 605248a37..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)
-- 
cgit v1.2.3