diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-01 09:18:56 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-01 09:18:56 +0100 |
commit | 256a81b3b12fceef1676d6114d9ff0568b645bca (patch) | |
tree | 80776c7bb719a3f29a64305ff6ff5f9c2445a186 /mk | |
parent | 8441e81773371fa37c9d7774436f357e97f4db99 (diff) | |
parent | d7af52ccd4cab1fcffaec5706a8a6eba96502b89 (diff) |
merge conflict
Diffstat (limited to 'mk')
-rw-r--r-- | mk/build.mk | 2 | ||||
-rw-r--r-- | mk/kernel-ver.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mk/build.mk b/mk/build.mk index eadccdcb3..9be651dd0 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -535,7 +535,7 @@ bulktoolchain: $(GMAKE) prereq && \ $(GMAKE) ARCH=$$tarch SYSTEM=toolchain-$$arch LIBC=$$libc defconfig; \ $(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit;fi; \ - tar -cJf ${TOPDIR}/firmware/toolchain_$${arch}_$${libc}.tar.xz host_$${arch}_*_$${libc} target_$${arch}_*_$${libc}; \ + tar -cvJf ${TOPDIR}/firmware/toolchain_$${arch}_$${libc}.tar.xz host_$${arch}_*_$${libc} target_$${arch}_*_$${libc}; \ rm .config; \ ) 2>&1 | tee $(TOPDIR)/firmware/toolchain_$${arch}_$${libc}/build.log; \ if [ -f .exit ];then break;fi \ diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk index 17f189d04..09362fbae 100644 --- a/mk/kernel-ver.mk +++ b/mk/kernel-ver.mk @@ -2,7 +2,7 @@ ifeq ($(ADK_KERNEL_VERSION_TOOLCHAIN),y) KERNEL_VERSION:= 3.12.13 KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= c5b0775d187bc79992bae17ae781de1e +KERNEL_MD5SUM:= 345f5883cfb906dac4aef87e303d3a2d endif ifeq ($(ADK_KERNEL_VERSION_3_13_5),y) KERNEL_VERSION:= 3.13.5 |