diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-15 21:08:13 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-15 21:08:13 +0100 |
| commit | 5ab73932ee0b48cee835aecf6434bd32ec1ea599 (patch) | |
| tree | 117ddc4e66b8c00d470e7fc8e21dcd1b951316f7 /mk | |
| parent | e17608e28f2929f5f194170ed9e76fb66effb39c (diff) | |
| parent | c080998e2d9468b09a4d386384ec4e2ff2416358 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mk/build.mk b/mk/build.mk index 0c2360bc4..e35f29d22 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -510,11 +510,12 @@ test-framework: $(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; exit 1;fi; \ tabi=$$(grep ^ADK_TARGET_ABI= .config|cut -d \" -f 2);\ if [ -z $$tabi ];then abi="";else abi=_$$tabi;fi; \ + if [ $$arch = "armhf" ];then qarch=arm; else qarch=$$arch;fi; \ if [ -d root ];then rm -rf root;fi; \ - cp -a root_qemu_$${arch}_$${libc}$${abi} root; \ + cp -a root_qemu_$${qarch}_$${libc}$${abi} root; \ mkdir -p $(TOPDIR)/firmware/qemu/$$arch; \ tar cJvf $(TOPDIR)/firmware/qemu/$$arch/root.tar.xz root; \ - cp $(TOPDIR)/firmware/qemu_$${arch}_$${libc}$${abi}/qemu-$${arch}-archive-kernel \ + cp $(TOPDIR)/firmware/qemu_$${qarch}_$${libc}$${abi}/qemu-$${qarch}-archive-kernel \ $(TOPDIR)/firmware/qemu/$$arch/kernel; \ rm .config; \ done; \ |