diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-06 17:05:09 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-06 17:05:09 +0200 |
| commit | 208807cc63754f699107bbad24687b3ae1d326fe (patch) | |
| tree | 749ada25a27d3659f1b24ae245fe6a416eeb7dae /mk | |
| parent | f0b814dddb1b74c91fd54af412ad356fc68be4a2 (diff) | |
| parent | b03ac31608c2ee5349a5d098980105957a4a6bca (diff) | |
fix conflict
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 6 | ||||
| -rw-r--r-- | mk/modules.mk | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/mk/build.mk b/mk/build.mk index 78c858f17..f788012ef 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -14,7 +14,7 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_STATIC=n \ ADK_LOCALES=n \ ADK_MAKE_PARALLEL=y \ - ADK_MAKE_JOBS=1 \ + ADK_MAKE_JOBS=4 \ ADK_USE_CCACHE=n \ ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER=n \ ADK_PACKAGE_GRUB=n \ @@ -555,11 +555,11 @@ bulkallmod: echo === building $$arch $$system $$libc on $$(date); \ $(GMAKE) prereq && \ $(GMAKE) ARCH=$$arch SYSTEM=$$system LIBC=$$libc FS=archive allmodconfig; \ - $(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit;fi; \ + $(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then echo $$system >.exit; exit 1;fi; \ rm .config; \ ) 2>&1 | tee $(TOPDIR)/bin/$${system}_$${arch}_$$libc/build.log; \ done; \ - if [ -f .exit ];then echo "Bulk build failed!"; rm .exit; exit 1;fi \ + if [ -f .exit ];then echo "Bulk build failed!"; cat .exit;rm .exit; exit 1;fi \ done <${TOPDIR}/target/arch.lst ;\ done diff --git a/mk/modules.mk b/mk/modules.mk index c429f114e..c9819c697 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -940,8 +940,6 @@ $(eval $(call KMOD_template,CRYPTO_DEFLATE,crypto-deflate,\ ,10)) $(eval $(call KMOD_template,CRYPTO_LZO,crypto-lzo,\ - $(MODULES_DIR)/kernel/lib/lzo/lzo_compress \ - $(MODULES_DIR)/kernel/lib/lzo/lzo_decompress \ $(MODULES_DIR)/kernel/crypto/lzo \ ,10)) |