diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-03-07 21:10:25 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-03-07 21:10:25 +0100 |
| commit | cd75563acd2459f874b50b396a312bb9638a1e9c (patch) | |
| tree | ac2499819a75b165940527efaf5cc39fc2612001 /mk | |
| parent | d4204be3a519a34049d53c9805a22c8241acc77f (diff) | |
| parent | 3dbe2178faba87f159ae33fce62717dfd93d3488 (diff) | |
Merge branch 'master' of git+ssh://wbx@openadk.org/git/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 1 | ||||
| -rw-r--r-- | mk/modules.mk | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/mk/build.mk b/mk/build.mk index 881acca62..a8ba19c72 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -16,7 +16,6 @@ DEFCONFIG= ADK_DEVELSYSTEM=n \ ADK_MAKE_PARALLEL=n \ ADK_FORCE_PARALLEL=n \ ADK_PACKAGE_GRUB=n \ - ADK_PACKAGE_GCC=n \ ADK_PACKAGE_AUFS2_UTIL=n \ ADK_PACKAGE_BASE_FILES=y \ ADK_COMPILE_HEIMDAL=n \ diff --git a/mk/modules.mk b/mk/modules.mk index 5ba6ab1e6..4747a4e16 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -608,6 +608,8 @@ $(eval $(call KMOD_template,MD_RAID456,md-raid456,\ $(MODULES_DIR)/kernel/crypto/async_tx/async_tx \ $(MODULES_DIR)/kernel/crypto/async_tx/async_xor \ $(MODULES_DIR)/kernel/crypto/async_tx/async_memcpy \ + $(MODULES_DIR)/kernel/drivers/md/raid6_pq \ + $(MODULES_DIR)/kernel/crypto/async_tx/async_raid6_recov \ $(MODULES_DIR)/kernel/drivers/md/raid456 \ ,35)) @@ -776,6 +778,7 @@ $(eval $(call KMOD_template,CRYPTO_FCRYPT,crypto-fcrypt,\ ,11)) $(eval $(call KMOD_template,CRYPTO_DEFLATE,crypto-deflate,\ + $(MODULES_DIR)/kernel/lib/zlib_inflate/zlib_inflate \ $(MODULES_DIR)/kernel/lib/zlib_deflate/zlib_deflate \ $(MODULES_DIR)/kernel/crypto/deflate \ ,10)) |