diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-20 16:58:02 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-20 16:58:02 +0200 |
| commit | 126fb42bf9e5eee309fc3dcb889e49e6c88da15a (patch) | |
| tree | 501912dc0d34f0ec6baa38bb99b71d3c8f8655b5 /mk | |
| parent | 7907e3ee7302ac3fd428989a07b0df74f0c52853 (diff) | |
| parent | d9ab4fecc47e7597ae42e95aabaef3e01d91c732 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/modules.mk | 1 | ||||
| -rw-r--r-- | mk/package.mk | 6 |
2 files changed, 7 insertions, 0 deletions
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)) 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})' \ |