a bunch of adk-test-framework fixes.

13 files changed, 46 insertions, 33 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
diff --git a/package/adk-test-tools/Makefile b/package/adk-test-tools/Makefile
index bc2624fe9..0a60c5056 100644
--- a/package/adk-test-tools/Makefile
+++ b/package/adk-test-tools/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		adk-test-tools
 PKG_VERSION:=		0.1
-PKG_RELEASE:=		1
+PKG_RELEASE:=		3
 PKG_DESCR:=		helper tools and scripts for adk-test-framework
 PKG_SECTION:=		misc
 PKG_URL:=		http://openadk.org/
diff --git a/package/adk-test-tools/files/test.init b/package/adk-test-tools/files/test.init
index 81095fa39..bb8fca527 100755
--- a/package/adk-test-tools/files/test.init
+++ b/package/adk-test-tools/files/test.init
@@ -4,8 +4,9 @@
 [[ $1 = autostart ]] || exit 0
 echo "Starting test script ..."
 if [ -x /run.sh ];then
-	exec /run.sh
+	/run.sh
+	quit
 else
 	echo "no run.sh found"
+	quit
 fi
-quit
diff --git a/package/base-files/src/etc/init.d/rcK b/package/base-files/src/etc/init.d/rcK
index 9d0e06440..938882ae5 100755
--- a/package/base-files/src/etc/init.d/rcK
+++ b/package/base-files/src/etc/init.d/rcK
@@ -4,15 +4,6 @@ export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 	grep '^#INIT ' /etc/init.d/* | \
 	    sort -rnk2 | \
 	    while read line; do
-		shebang=$(sed -n '1s/^#![	 ]*//p' ${line%%:*})
-		case $shebang in
-		*[\	\ ]*) shebang=\'$(echo X"$shebang" | sed \
-		    -e 's/^X//' -e "s/'/'\\\\''/g" \
-		    -e 's/^\([^	 ][^	 ]*\)[	 ]*$/\1/' \
-		    -e 's/^\([^	 ][^	 ]*\)[	 ][	 ]*\(..*\)$/\1 \2/' \
-		    -e 's/^\([^ ][^ ]*\) /\1'\'' '\''/')\' ;;
-		esac
-		${shebang:-/bin/sh} ${line%%:*} autostop 2>&1
+		sh ${line%%:*} autostop
 	done
-	test -e /etc/rc.shutdown && (/bin/sh /etc/rc.shutdown) 2>&1
 } | logger -s -p 6 -t ''
diff --git a/package/base-files/src/etc/init.d/rcS b/package/base-files/src/etc/init.d/rcS
index 9daa8f5cd..ef3a52a31 100755
--- a/package/base-files/src/etc/init.d/rcS
+++ b/package/base-files/src/etc/init.d/rcS
@@ -5,11 +5,10 @@ if [ -f /proc/sys/kernel/printk ];then
 fi
 echo "System initialization ..."
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin
-ln -s /proc/self/fd/2 /dev/stderr
 {
 	grep '^#INIT ' /etc/init.d/* | \
 	    sort -nk2 | \
 	    while read line; do
 		sh ${line%%:*} autostart
 	    done
-} | tee /dev/stderr |logger -p 6 -t ''
+} | logger -s -p 6 -t ''
diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile
index a79bd73ca..70b323a76 100644
--- a/package/cfgfs/Makefile
+++ b/package/cfgfs/Makefile
@@ -16,7 +16,7 @@ PKG_CFLINE_CFGFS+=	select BUSYBOX_MD5SUM@
 PKG_CFLINE_CFGFS+=	select BUSYBOX_XARGS@
 PKG_CFLINE_CFGFS+=	select BUSYBOX_FEATURE_SORT_BIG@
 PKG_CFLINE_CFGFS+=	depends on !ADK_TARGET_ROOTFS_NFSROOT && !ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK && !ADK_TARGET_ROOTFS_INITRAMFS && !ADK_TARGET_ROOTFS_JFFS2 && !ADK_TARGET_ROOTFS_SQUASHFS
-PKG_DFLT_CFGFS:=	y if !(ADK_TOOLCHAIN_ONLY || ADK_TOOLCHAIN_ARCHIVE)
+PKG_DFLT_CFGFS:=	y if !(ADK_TOOLCHAIN_ONLY || ADK_TOOLCHAIN_ARCHIVE || ADK_PKG_TEST)
 
 WRKDIST=		${WRKDIR}/${PKG_NAME}-${PKG_VERSION}
 NO_DISTFILES:=		1
diff --git a/target/Makefile b/target/Makefile
index f2ae18b60..1e091d3dc 100644
--- a/target/Makefile
+++ b/target/Makefile
@@ -53,6 +53,8 @@ config-prepare: $(TOPDIR)/.config
 	    while IFS='=' read symbol value; do \
 		sed -i -e "/^# $$symbol/d" ${BUILD_DIR}/.kernelconfig.board; \
 	done;)
+	@sed -i -e 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 init=/sbin/init"#' \
+		${BUILD_DIR}/.kernelconfig.board
 	@sed -i -e 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 ${FS_CMDLINE}"#' \
 		${BUILD_DIR}/.kernelconfig.board
 ifneq ($(ADK_TARGET_CMDLINE),)
diff --git a/target/arm/kernel/qemu-arm-versatilepb b/target/arm/kernel/qemu-arm-versatilepb
index ead723621..ce52647be 100644
--- a/target/arm/kernel/qemu-arm-versatilepb
+++ b/target/arm/kernel/qemu-arm-versatilepb
@@ -18,7 +18,6 @@ CONFIG_DTC=y
 CONFIG_OF=y
 CONFIG_SCSI=y
 CONFIG_SCSI_DMA=y
-CONFIG_SCSI_PROC_FS=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_SCSI_SPI_ATTRS=y
 CONFIG_SCSI_LOWLEVEL=y
diff --git a/target/arm/sys-available/qemu-armhf b/target/arm/sys-available/qemu-armhf
new file mode 100644
index 000000000..07059a8f3
--- /dev/null
+++ b/target/arm/sys-available/qemu-armhf
@@ -0,0 +1,9 @@
+config ADK_TARGET_SYSTEM_QEMU_ARMHF
+	bool "Qemu Emulator (hard-float)"
+	select ADK_arm
+	select ADK_qemu_arm
+	select ADK_little
+	select ADK_HARDWARE_QEMU
+	select ADK_TARGET_KERNEL_ZIMAGE
+	help
+	 Support for Qemu Emulator (armhf).
diff --git a/target/config/Config.in b/target/config/Config.in
index 88059fb60..dfe87bae6 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -279,21 +279,33 @@ config ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800
 endchoice
 
 choice
+prompt "Qemu ARM Emulation (hard-float)"
+depends on ADK_TARGET_SYSTEM_QEMU_ARMHF
+
+config ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9
+	boolean "ARM Ltd. Versatile Express for Cortex-A9"
+	select ADK_hard_float
+	select ADK_eabihf
+	select ADK_CPU_CORTEX_A9
+
+endchoice
+
+choice
 prompt "Qemu ARM Emulation"
 depends on ADK_TARGET_SYSTEM_QEMU_ARM
 
+config ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9
+	boolean "ARM Ltd. Versatile Express for Cortex-A9"
+	select ADK_soft_float
+	select ADK_eabi
+	select ADK_CPU_CORTEX_A9
+
 config ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB
 	boolean "ARM Ltd. Versatile/PB"
 	select ADK_soft_float
 	select ADK_eabi
 	select ADK_CPU_ARM926EJ_S
 
-config ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9
-	boolean "ARM Ltd. Versatile Express for Cortex-A9"
-	select ADK_hard_float
-	select ADK_eabihf
-	select ADK_CPU_CORTEX_A9
-
 config ADK_TARGET_QEMU_ARM_MODEL_SPITZ
 	boolean "Xscale PXA270 Spitz PDA"
 	select ADK_soft_float
diff --git a/target/linux/kernel.config b/target/linux/kernel.config
index d69b28908..3afd5bdf5 100644
--- a/target/linux/kernel.config
+++ b/target/linux/kernel.config
@@ -15,6 +15,7 @@ CONFIG_INET=y
 CONFIG_PROC_FS=y
 CONFIG_PROC_SYSCTL=y
 CONFIG_BLOCK=y
+CONFIG_BLK_DEV=y
 CONFIG_FILE_LOCKING=y
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y
diff --git a/target/packages/pkg-available/test b/target/packages/pkg-available/test
index 6560dc8a1..074ce8246 100644
--- a/target/packages/pkg-available/test
+++ b/target/packages/pkg-available/test
@@ -5,6 +5,9 @@ config ADK_PKG_TEST
 	select ADK_PACKAGE_STRACE
 	select ADK_PACKAGE_SOCAT
 	select ADK_PACKAGE_MAKE
+	select ADK_KERNEL_BLK_DEV_INITRD
+	select ADK_KERNEL_COMP_XZ
+	select ADK_KERNEL_INITRAMFS_COMPRESSION_XZ
 	help
 	  Package collection used to build adk-test-framework root
 	  filesystem.