summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-03-14 19:46:58 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-03-14 19:46:58 +0100
commitec47c602c27ceef10f38afdf8e2e2adb953b9ed8 (patch)
tree31a7ce023bd70237a7bc6103d22981d001d769c3 /mk
parentbe224b00592655208580afc6164961eea47c5a49 (diff)
a bunch of adk-test-framework fixes.
Diffstat (limited to 'mk')
-rw-r--r--mk/build.mk13
-rw-r--r--mk/rootfs.mk3
2 files changed, 6 insertions, 10 deletions
diff --git a/mk/build.mk b/mk/build.mk
index 0da34de85..66472657a 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -507,15 +507,15 @@ bulktoolchain:
done
test-framework:
- if [ -z "$(LIBC)" ];then \
+ @if [ -z "$(LIBC)" ];then \
libc="glibc uclibc musl"; \
else \
libc="$(LIBC)"; \
fi; \
for libc in $$libc;do \
( \
- for arch in arm microblaze microblazeel mips mipsel mips64 mips64el ppc ppc64 sh4 sh4eb sparc sparc64 i686 x86_64;do \
- tarch=$$(echo $$arch|sed -e "s#el##" -e "s#eb##" -e "s#mips64.*#mips#" -e "s#i686#x86#" -e "s#sh4#sh#"); \
+ for arch in arm armhf microblaze microblazeel mips mipsel mips64 mips64el ppc ppc64 sh4 sh4eb sparc sparc64 i686 x86_64;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##"); \
echo === building qemu-$$arch for $$libc with $$tarch on $$(date); \
$(GMAKE) prereq && \
$(GMAKE) ARCH=$$tarch SYSTEM=qemu-$$arch LIBC=$$libc FS=archive COLLECTION=test defconfig; \
@@ -523,12 +523,11 @@ test-framework:
tabi=$$(grep ^ADK_TARGET_ABI= .config|cut -d \" -f 2);\
if [ -z $$tabi ];then abi="";else abi=_$$tabi;fi; \
if [ -d root ];then rm -rf root;fi; \
- echo cp -a root_qemu_$${arch}_$${libc}$${abi} root; \
cp -a root_qemu_$${arch}_$${libc}$${abi} root; \
- mkdir -p $(TOPDIR)/firmware/qemu/$$tarch; \
- tar cJvf $(TOPDIR)/firmware/qemu/$$tarch/root.tar.xz 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 \
- $(TOPDIR)/firmware/qemu/$$tarch/kernel; \
+ $(TOPDIR)/firmware/qemu/$$arch/kernel; \
rm .config; \
done; \
) 2>&1 | tee $(TOPDIR)/firmware/test-framework-build.log; \
diff --git a/mk/rootfs.mk b/mk/rootfs.mk
index 55830b23c..812c90680 100644
--- a/mk/rootfs.mk
+++ b/mk/rootfs.mk
@@ -10,9 +10,6 @@ endef
ifeq ($(ADK_HARDWARE_QEMU),y)
MTDDEV:= root=/dev/mtdblock0
-ifeq ($(ADK_TARGET_ROOTFS_ARCHIVE),y)
-ROOTFS:= root=/dev/sda1
-endif
ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y)
ROOTFS:= root=/dev/vda1
endif