From 550d6fcb12647b11e947ed909d5a4f31361f8692 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 19 Jul 2010 21:01:01 +0200
Subject: fix IPCOMP kernel support, packaging issue

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

(limited to 'mk')

diff --git a/mk/modules.mk b/mk/modules.mk
index 032f0a85c..49233d6cb 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -292,6 +292,7 @@ $(eval $(call KMOD_template,INET_ESP,inet-esp,\
 ,65))
 
 $(eval $(call KMOD_template,INET_IPCOMP,inet-ipcomp,\
+	$(MODULES_DIR)/kernel/net/ipv4/xfrm4_tunnel \
 	$(MODULES_DIR)/kernel/net/xfrm/xfrm_ipcomp \
 	$(MODULES_DIR)/kernel/net/ipv4/ipcomp \
 ,70))
-- 
cgit v1.2.3


From d9ab4fecc47e7597ae42e95aabaef3e01d91c732 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 20 Jul 2010 10:58:42 +0200
Subject: fix minimal style

---
 mk/package.mk | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'mk')

diff --git a/mk/package.mk b/mk/package.mk
index acc387a48..0393a06bd 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -37,6 +37,10 @@ endif
 ifeq ($(ADK_DEBUG),)
 TCPPFLAGS+=		-DNDEBUG
 endif
+
+# does not change CONFIGURE_ARGS in minimal mode
+ifneq ($(filter minimal,${CONFIG_STYLE}),)
+
 ifneq ($(ADK_DEBUG),)
 CONFIGURE_ARGS+=	--enable-debug
 else
@@ -47,6 +51,8 @@ ifeq ($(ADK_ENABLE_IPV6),y)
 CONFIGURE_ARGS+=	--enable-ipv6
 endif
 
+endif
+
 CONFIGURE_ENV+=		CONFIG_SHELL='$(strip ${SHELL})' \
 			CFLAGS='$(strip ${TCFLAGS})' \
 			CXXFLAGS='$(strip ${TCXXFLAGS})' \
-- 
cgit v1.2.3