7 files changed, 17 insertions, 15 deletions
diff --git a/package/adk-test-tools/Makefile b/package/adktest/Makefile
index f24a14378..9a47f7909 100644
--- a/package/adk-test-tools/Makefile
+++ b/package/adktest/Makefile
@@ -3,7 +3,7 @@
 
 include $(ADK_TOPDIR)/rules.mk
 
-PKG_NAME:=		adk-test-tools
+PKG_NAME:=		adktest
 PKG_VERSION:=		0.1
 PKG_RELEASE:=		7
 PKG_DESCR:=		helper tools and scripts for adk-test-framework
@@ -14,15 +14,15 @@ NO_DISTFILES:=		1
 
 include $(ADK_TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,ADK_TEST_TOOLS,adk-test-tools,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,ADKTEST,adktest,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
-adk-test-tools-install:
-	$(INSTALL_DIR) $(IDIR_ADK_TEST_TOOLS)/usr/bin
+adktest-install:
+	$(INSTALL_DIR) $(IDIR_ADKTEST)/usr/bin
 	$(INSTALL_BIN) $(WRKBUILD)/{qmp,quit} \
-		$(IDIR_ADK_TEST_TOOLS)/usr/bin
+		$(IDIR_ADKTEST)/usr/bin
 
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/adk-test-tools/files/test.init b/package/adktest/files/adktest.init
index 203a8c973..ac1a047aa 100755
--- a/package/adk-test-tools/files/test.init
+++ b/package/adktest/files/adktest.init
@@ -1,18 +1,16 @@
 #!/bin/sh
-#PKG adk-test-tools
+#PKG adktest
 #INIT 90
 . /etc/rc.conf
 
 case $1 in
 autostop) ;;
 autostart)
-	test x"${test:-NO}" = x"NO" && exit 0
-	test x"$test" = x"DAEMON" && test -x /bin/mksh && exec mksh -T- $0 start
+	test x"${adktest:-NO}" = x"NO" && exit 0
+	test x"$adktest" = x"DAEMON" && test -x /bin/mksh && exec mksh -T- $0 start
 	exec sh $0 start
 	;;
 start)
-	echo "Setting time via network ..."
-	rdate -nv pool.ntp.org
 	grep shell /proc/cmdline > /dev/null 2&>1
 	if [ $? -eq 0 ];then
 		exit 0
diff --git a/package/adk-test-tools/files/adk-test-tools.postinst b/package/adktest/files/adktest.postinst
index f193b2823..f8c53d562 100644
--- a/package/adk-test-tools/files/adk-test-tools.postinst
+++ b/package/adktest/files/adktest.postinst
@@ -1,3 +1,3 @@
 #!/bin/sh
 . $IPKG_INSTROOT/etc/functions.sh
-add_rcconf test NO
+add_rcconf adktest NO
diff --git a/package/adk-test-tools/src/qmp b/package/adktest/src/qmp
index 8f9912222..8f9912222 100755
--- a/package/adk-test-tools/src/qmp
+++ b/package/adktest/src/qmp
diff --git a/package/adk-test-tools/src/quit b/package/adktest/src/quit
index a625553e2..a625553e2 100755
--- a/package/adk-test-tools/src/quit
+++ b/package/adktest/src/quit
diff --git a/scripts/update-rcconf b/scripts/update-rcconf
index 046f4b582..162c33bc6 100755
--- a/scripts/update-rcconf
+++ b/scripts/update-rcconf
@@ -5,9 +5,13 @@
 topdir=$(readlink -nf $(dirname $0)/.. 2>/dev/null || (cd $(dirname $0)/..; pwd -P))
 . $topdir/.config
 
-rcconf=$topdir/root_${ADK_TARGET_SYSTEM}_${ADK_TARGET_LIBC}/etc/rc.conf
+if [ -z ${ADK_TARGET_ABI} ];then
+	rcconf=$topdir/root_${ADK_TARGET_SYSTEM}_${ADK_TARGET_LIBC}_${ADK_TARGET_CPU_ARCH}/etc/rc.conf
+else
+	rcconf=$topdir/root_${ADK_TARGET_SYSTEM}_${ADK_TARGET_LIBC}_${ADK_TARGET_CPU_ARCH}_${ADK_TARGET_ABI}/etc/rc.conf
+fi
 
-if [ ! -f $topdir/root_${ADK_TARGET_SYSTEM}_${ADK_TARGET_LIBC}/etc/rc.conf ];then
+if [ ! -f $rcconf ];then
 	exit 0
 fi
 
diff --git a/target/collections/test b/target/collections/test
index ac643addc..d020a6281 100644
--- a/target/collections/test
+++ b/target/collections/test
@@ -1,12 +1,12 @@
 config ADK_PKG_TEST
 	bool "Compile a ADK test framework system"
-	select ADK_PACKAGE_ADK_TEST_TOOLS
+	select ADK_PACKAGE_ADKTEST
 	select ADK_PACKAGE_SOCAT
 	select ADK_PACKAGE_RDATE
 	select ADK_PACKAGE_BINUTILS
 	select ADK_TARGET_PACKAGE_TXZ
 	select ADK_RUNTIME_START_SERVICES
-	select ADK_RUNTIME_START_ADK_TEST_TOOLS
+	select ADK_RUNTIME_START_ADKTEST
 	select ADK_KERNEL_BLK_DEV_INITRD
 	select ADK_KERNEL_COMP_XZ
 	select ADK_KERNEL_INITRAMFS_COMPRESSION_XZ