From e12f9f2abbe7054f005c8c28b2eb416c6b0eb086 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 8 Jul 2014 17:27:32 +0200 Subject: fix update-rcconf, rename adk-test package --- package/adk-test-tools/Makefile | 28 ------------------ .../adk-test-tools/files/adk-test-tools.postinst | 3 -- package/adk-test-tools/files/test.init | 34 ---------------------- package/adk-test-tools/src/qmp | 4 --- package/adk-test-tools/src/quit | 2 -- package/adktest/Makefile | 28 ++++++++++++++++++ package/adktest/files/adktest.init | 32 ++++++++++++++++++++ package/adktest/files/adktest.postinst | 3 ++ package/adktest/src/qmp | 4 +++ package/adktest/src/quit | 2 ++ scripts/update-rcconf | 8 +++-- target/collections/test | 4 +-- 12 files changed, 77 insertions(+), 75 deletions(-) delete mode 100644 package/adk-test-tools/Makefile delete mode 100644 package/adk-test-tools/files/adk-test-tools.postinst delete mode 100755 package/adk-test-tools/files/test.init delete mode 100755 package/adk-test-tools/src/qmp delete mode 100755 package/adk-test-tools/src/quit create mode 100644 package/adktest/Makefile create mode 100755 package/adktest/files/adktest.init create mode 100644 package/adktest/files/adktest.postinst create mode 100755 package/adktest/src/qmp create mode 100755 package/adktest/src/quit diff --git a/package/adk-test-tools/Makefile b/package/adk-test-tools/Makefile deleted file mode 100644 index f24a14378..000000000 --- a/package/adk-test-tools/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -include $(ADK_TOPDIR)/rules.mk - -PKG_NAME:= adk-test-tools -PKG_VERSION:= 0.1 -PKG_RELEASE:= 7 -PKG_DESCR:= helper tools and scripts for adk-test-framework -PKG_SECTION:= base/misc -PKG_URL:= http://openadk.org/ - -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})) - -CONFIG_STYLE:= manual -BUILD_STYLE:= manual -INSTALL_STYLE:= manual - -adk-test-tools-install: - $(INSTALL_DIR) $(IDIR_ADK_TEST_TOOLS)/usr/bin - $(INSTALL_BIN) $(WRKBUILD)/{qmp,quit} \ - $(IDIR_ADK_TEST_TOOLS)/usr/bin - -include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/adk-test-tools/files/adk-test-tools.postinst b/package/adk-test-tools/files/adk-test-tools.postinst deleted file mode 100644 index f193b2823..000000000 --- a/package/adk-test-tools/files/adk-test-tools.postinst +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -. $IPKG_INSTROOT/etc/functions.sh -add_rcconf test NO diff --git a/package/adk-test-tools/files/test.init b/package/adk-test-tools/files/test.init deleted file mode 100755 index 203a8c973..000000000 --- a/package/adk-test-tools/files/test.init +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -#PKG adk-test-tools -#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 - 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 - fi - echo "Starting test script ..." - if [ -x /run.sh ];then - /run.sh - quit - else - echo "no run.sh found" - quit - fi - ;; -*) - echo "Usage: $0 {start}" - exit 1 - ;; -esac -exit $? diff --git a/package/adk-test-tools/src/qmp b/package/adk-test-tools/src/qmp deleted file mode 100755 index 8f9912222..000000000 --- a/package/adk-test-tools/src/qmp +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -echo '{ "execute": "qmp_capabilities" }' -sleep 1 -echo '{ "execute": "quit" }' diff --git a/package/adk-test-tools/src/quit b/package/adk-test-tools/src/quit deleted file mode 100755 index a625553e2..000000000 --- a/package/adk-test-tools/src/quit +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -socat exec:/usr/bin/qmp tcp:10.0.2.2:4444 diff --git a/package/adktest/Makefile b/package/adktest/Makefile new file mode 100644 index 000000000..9a47f7909 --- /dev/null +++ b/package/adktest/Makefile @@ -0,0 +1,28 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(ADK_TOPDIR)/rules.mk + +PKG_NAME:= adktest +PKG_VERSION:= 0.1 +PKG_RELEASE:= 7 +PKG_DESCR:= helper tools and scripts for adk-test-framework +PKG_SECTION:= base/misc +PKG_URL:= http://openadk.org/ + +NO_DISTFILES:= 1 + +include $(ADK_TOPDIR)/mk/package.mk + +$(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 + +adktest-install: + $(INSTALL_DIR) $(IDIR_ADKTEST)/usr/bin + $(INSTALL_BIN) $(WRKBUILD)/{qmp,quit} \ + $(IDIR_ADKTEST)/usr/bin + +include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/adktest/files/adktest.init b/package/adktest/files/adktest.init new file mode 100755 index 000000000..ac1a047aa --- /dev/null +++ b/package/adktest/files/adktest.init @@ -0,0 +1,32 @@ +#!/bin/sh +#PKG adktest +#INIT 90 +. /etc/rc.conf + +case $1 in +autostop) ;; +autostart) + 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) + grep shell /proc/cmdline > /dev/null 2&>1 + if [ $? -eq 0 ];then + exit 0 + fi + echo "Starting test script ..." + if [ -x /run.sh ];then + /run.sh + quit + else + echo "no run.sh found" + quit + fi + ;; +*) + echo "Usage: $0 {start}" + exit 1 + ;; +esac +exit $? diff --git a/package/adktest/files/adktest.postinst b/package/adktest/files/adktest.postinst new file mode 100644 index 000000000..f8c53d562 --- /dev/null +++ b/package/adktest/files/adktest.postinst @@ -0,0 +1,3 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf adktest NO diff --git a/package/adktest/src/qmp b/package/adktest/src/qmp new file mode 100755 index 000000000..8f9912222 --- /dev/null +++ b/package/adktest/src/qmp @@ -0,0 +1,4 @@ +#!/bin/sh +echo '{ "execute": "qmp_capabilities" }' +sleep 1 +echo '{ "execute": "quit" }' diff --git a/package/adktest/src/quit b/package/adktest/src/quit new file mode 100755 index 000000000..a625553e2 --- /dev/null +++ b/package/adktest/src/quit @@ -0,0 +1,2 @@ +#!/bin/sh +socat exec:/usr/bin/qmp tcp:10.0.2.2:4444 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 -- cgit v1.2.3