summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
Diffstat (limited to 'mk')
-rw-r--r--mk/build.mk7
-rw-r--r--mk/rootfs.mk5
2 files changed, 9 insertions, 3 deletions
diff --git a/mk/build.mk b/mk/build.mk
index 079af1e30..32dc9166d 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -499,20 +499,21 @@ test-framework:
fi; \
for libc in $$libc;do \
( \
+ mkdir -p $(TOPDIR)/firmware/; \
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; \
+ $(GMAKE) ARCH=$$tarch SYSTEM=qemu-$$arch LIBC=$$libc FS=initramfsarchive COLLECTION=test defconfig; \
$(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_$${qarch}_$${libc}$${abi} root; \
mkdir -p $(TOPDIR)/firmware/qemu/$$arch; \
tar cJvf $(TOPDIR)/firmware/qemu/$$arch/root.tar.xz root; \
- cp $(TOPDIR)/firmware/qemu_$${qarch}_$${libc}$${abi}/qemu-$${qarch}-archive-kernel \
+ if [ -d root ];then rm -rf root;fi; \
+ cp $(TOPDIR)/firmware/qemu_$${qarch}_$${libc}$${abi}/qemu-$${qarch}-initramfsarchive-kernel \
$(TOPDIR)/firmware/qemu/$$arch/kernel; \
rm .config; \
done; \
diff --git a/mk/rootfs.mk b/mk/rootfs.mk
index 812c90680..43cfaa821 100644
--- a/mk/rootfs.mk
+++ b/mk/rootfs.mk
@@ -10,8 +10,12 @@ endef
ifeq ($(ADK_HARDWARE_QEMU),y)
MTDDEV:= root=/dev/mtdblock0
+ifeq ($(ADK_TARGET_ROOTFS_ARCHIVE),y)
ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y)
ROOTFS:= root=/dev/vda1
+else
+ROOTFS:= root=/dev/sda1
+endif
endif
endif
@@ -43,6 +47,7 @@ $(eval $(call rootfs_template,cf,CF,$(ROOTFS)))
$(eval $(call rootfs_template,mmc,MMC,$(ROOTFS)))
$(eval $(call rootfs_template,usb,USB,$(USB)))
$(eval $(call rootfs_template,archive,ARCHIVE,$(ROOTFS)))
+$(eval $(call rootfs_template,initramfsarchive,INITRAMFSARCHIVE))
$(eval $(call rootfs_template,initramfs,INITRAMFS))
$(eval $(call rootfs_template,initramfs-piggyback,INITRAMFS_PIGGYBACK))
$(eval $(call rootfs_template,squashfs,SQUASHFS,$(ROOTFS)))