diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-02-26 23:48:00 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-02-26 23:48:00 +0100 |
| commit | 09381f08db60bd52ab7135bd084fa2bb197a98c2 (patch) | |
| tree | 24fccce5f78fc4129d5b26d0adf07cda138d8188 /mk | |
| parent | 890c35ac59300679b63cc3f94409143dd7020ebe (diff) | |
| parent | a4137f916eed4e87434e5382573008c89c8f1652 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/modules.mk | 2 | ||||
| -rw-r--r-- | mk/vars.mk | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/mk/modules.mk b/mk/modules.mk index 89e8d0053..0be466b1f 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -926,7 +926,9 @@ $(eval $(call KMOD_template,CRYPTO_FCRYPT,crypto-fcrypt,\ ,11)) ZLIB:=lib/zlib_deflate/zlib_deflate +ifneq (${ADK_LINUX_NATIVE},y) ZLIB+=lib/zlib_inflate/zlib_inflate +endif $(eval $(call KMOD_template,CRYPTO_DEFLATE,crypto-deflate,\ $(foreach mod, $(ZLIB),$(MODULES_DIR)/kernel/$(mod)) \ diff --git a/mk/vars.mk b/mk/vars.mk index d83f7eca8..0e40ab3c6 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -117,7 +117,7 @@ FLAGS_FOR_BUILD= ${CPPFLAGS_FOR_BUILD} ${CFLAGS_FOR_BUILD} ${LDFLAGS_FOR_BUILD} PATCH= ${BASH} $(SCRIPT_DIR)/patch.sh SED:= sed -i -e LINUX_DIR:= $(BUILD_DIR)/linux -LINUX_HEADER_DIR:= $(STAGING_TARGET_DIR)/linux-header +LINUX_HEADER_DIR:= $(STAGING_DIR)/linux-header KERNEL_MODULE_FLAGS:= ARCH=${ARCH} KERNELVERSION="2.6" \ KERNEL_PATH=${LINUX_DIR} KERNELDIR=${LINUX_DIR} KERNEL_DIR=${LINUX_DIR} \ PREFIX=/usr CROSS_COMPILE="${TARGET_CROSS}" \ |