diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-28 20:25:12 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-28 20:25:12 +0100 |
| commit | 10f2e320f18b3738010128799dc095994d45cc38 (patch) | |
| tree | 89b93f412ec03392e739ae1cc3c1b3d084ce3517 /mk | |
| parent | e94873e62decc77342e99b9c2712a84cbbc431e8 (diff) | |
| parent | 0fffaa4447d5eef09390b4b8931308f736aa3807 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/build.mk b/mk/build.mk index 790a59360..f386468f0 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -504,7 +504,7 @@ test-framework: ( \ mkdir -p $(TOPDIR)/firmware/; \ for arch in $$(grep -v m68k target/tarch.lst|xargs);do \ - tarch=$$(echo $$arch|sed -e "s#el##" -e "s#eb##" -e "s#mips64.*#mips#" -e "s#i686#x86#" -e "s#sh4#sh#" -e "s#hf##"); \ + tarch=$$(echo $$arch|sed -e "s#el##" -e "s#eb##" -e "s#mips64.*#mips#" -e "s#i686#x86#" -e "s#sh4#sh#" -e "s#hf##" -e "s#x86_64.*#x86_64#"); \ arch=$$(echo $$arch|sed -e 's#x86$$#i686#'); \ echo === building qemu-$$arch for $$libc with $$tarch on $$(date); \ $(GMAKE) prereq && \ @@ -512,7 +512,7 @@ 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; \ + qarch=$$(echo $$arch|sed -e "s#armhf#arm#" -e 's#mips64n.*$$#mips64#' -e 's#mips64eln.*$$#mips64el#'); \ cp -a root_qemu_$${qarch}_$${libc}$${abi} root; \ mkdir -p $(TOPDIR)/firmware/qemu/$$arch; \ tar cJvf $(TOPDIR)/firmware/qemu/$$arch/root.tar.xz root; \ |