From cda64efca568ec61c064b44f494f58f7a08bd4e7 Mon Sep 17 00:00:00 2001
From: Phil Sutter <phil@nwl.cc>
Date: Sun, 2 Aug 2009 15:01:15 +0200
Subject: force entering the config/ subdir in ANY case

This is a general thing: when depending on binaries in subdirs AND
dependency checking for those binaries is done from within the subdir
Makefile (i.e. the decision about whether to recompile or not), we
always have to force entering the subdir or otherwise no check is
performed if the upper level dependency ("does the subdir binary
exist?") is met.
---
 mk/build.mk | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'mk')

diff --git a/mk/build.mk b/mk/build.mk
index c74e16045..399d57216 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -158,6 +158,9 @@ all: menuconfig
 # configuration
 # ---------------------------------------------------------------------------
 
+# force entering the subdir, as dependency checking is done there
+.PHONY: $(CONFIG)/conf $(CONFIG)/mconf
+
 $(CONFIG)/conf:
 	@$(MAKE) -C $(CONFIG) conf
 
-- 
cgit v1.2.3


From 48b4e0eac16a23713698ea4cd088cd8c857e4c33 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 12 Aug 2009 21:52:58 +0200
Subject: update gcc, kernel and uclibc Makefile

- bring rb532 in shape, make it bootable
---
 mk/modules.mk | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

(limited to 'mk')

diff --git a/mk/modules.mk b/mk/modules.mk
index 1c02e711f..225daca21 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -205,6 +205,38 @@ $(eval $(call KMOD_template,NET_ACT_PEDIT,net-act-pedit,\
 	$(MODULES_DIR)/kernel/net/sched/act_pedit \
 ,45))
 
+#
+# IPsec 
+#
+$(eval $(call KMOD_template,NET_KEY,net-ipsec-netkey,\
+	$(MODULES_DIR)/kernel/net/key/af_key \
+,60))
+
+$(eval $(call KMOD_template,INET_AH,net-ipsec-ah,\
+	$(MODULES_DIR)/kernel/net/ipv4/ah4 \
+,65))
+
+$(eval $(call KMOD_template,INET_ESP,net-ipsec-esp,\
+	$(MODULES_DIR)/kernel/net/ipv4/esp4 \
+,65))
+
+$(eval $(call KMOD_template,INET_IPCOMP,net-ipsec-comp,\
+	$(MODULES_DIR)/kernel/net/ipv4/ipcomp \
+	$(MODULES_DIR)/kernel/net/xfrm/xfrm_ipcomp \
+,70))
+
+$(eval $(call KMOD_template,INET_XFRM_MODE_TRANSPORT,net-ipsec-transport,\
+	$(MODULES_DIR)/kernel/net/ipv4/xfrm4_mode_transport \
+,75))
+
+$(eval $(call KMOD_template,INET_XFRM_MODE_TUNNEL,net-ipsec-tunnel,\
+	$(MODULES_DIR)/kernel/net/ipv4/xfrm4_mode_tunnel \
+,75))
+
+$(eval $(call KMOD_template,INET_XFRM_MODE_BEET,net-ipsec-beet,\
+	$(MODULES_DIR)/kernel/net/ipv4/xfrm4_mode_beet \
+,75))
+
 ##
 ## Filtering / Firewalling
 ##
-- 
cgit v1.2.3


From a206070dd67744e3be5c54c80ed9dc00f55c28cb Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 12 Aug 2009 23:19:38 +0200
Subject: fix openswan

- avoid busybox IP when openswan is selected
- fix crypto dependencies for esp
---
 mk/build.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'mk')

diff --git a/mk/build.mk b/mk/build.mk
index 399d57216..b9e6b5d56 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -33,8 +33,8 @@ POSTCONFIG=		-@\
 	done; \
 	fi; \
 	if [ "$$(grep ^BUSYBOX .config|md5sum)" != "$$(grep ^BUSYBOX .config.old|md5sum)" ];then \
-		if [ -f build_$(CPU_ARCH)/w-busybox*/busybox*/.configure_done ];then \
-			rm build_$(CPU_ARCH)/w-busybox*/busybox*/.configure_done; \
+		if [ -f build_*/w-busybox*/busybox*/.configure_done ];then \
+			rm build_*/w-busybox*/busybox*/.configure_done; \
 		fi; \
 	fi; \
 	fi
-- 
cgit v1.2.3