diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/adk-test-tools/Makefile | 2 | ||||
| -rwxr-xr-x | package/adk-test-tools/files/test.init | 5 | ||||
| -rwxr-xr-x | package/base-files/src/etc/init.d/rcK | 11 | ||||
| -rwxr-xr-x | package/base-files/src/etc/init.d/rcS | 3 | ||||
| -rw-r--r-- | package/cfgfs/Makefile | 2 |
5 files changed, 7 insertions, 16 deletions
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 |