From 2826acfb9da3f85743ba3f8c2d34568109ab3c22 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 24 Jan 2016 22:47:27 +0100 Subject: reduce mksh testsuite failure to 1 --- package/base-files/src/etc/init.d/rcS | 2 ++ package/ed/Makefile | 6 +++--- package/mksh/Makefile | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/base-files/src/etc/init.d/rcS b/package/base-files/src/etc/init.d/rcS index 4ca17abbc..bc27ed29c 100755 --- a/package/base-files/src/etc/init.d/rcS +++ b/package/base-files/src/etc/init.d/rcS @@ -4,6 +4,8 @@ export PATH=/bin:/sbin:/usr/bin:/usr/sbin if [ -f /proc/sys/kernel/printk ];then echo 0 > /proc/sys/kernel/printk fi +ln -s /proc/self/fd/0 /dev/stdin +ln -s /proc/self/fd/1 /dev/stdout ln -s /proc/self/fd/2 /dev/stderr : ${rcquiet=0} if [ $rcquiet -ne 1 ];then diff --git a/package/ed/Makefile b/package/ed/Makefile index 20e0d428c..a2c037a34 100644 --- a/package/ed/Makefile +++ b/package/ed/Makefile @@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= ed PKG_VERSION:= 1.5 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_HASH:= 97dd34a49ebc9c97e414b90a087d63eafc41377a340848c97e75a9cba187fba1 PKG_DESCR:= unix editor PKG_SECTION:= app/editor @@ -20,8 +20,8 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,ED,ed,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) ed-install: - $(INSTALL_DIR) $(IDIR_ED)/usr/bin + $(INSTALL_DIR) $(IDIR_ED)/bin $(INSTALL_BIN) $(WRKINST)/usr/bin/ed \ - $(IDIR_ED)/usr/bin + $(IDIR_ED)/bin include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/mksh/Makefile b/package/mksh/Makefile index 96a270e30..72928129e 100644 --- a/package/mksh/Makefile +++ b/package/mksh/Makefile @@ -17,7 +17,7 @@ PKG_DFLT_MKSH:= y if !ADK_TOOLCHAIN_ONLY && !ADK_TARGET_WITHOUT_MMU PKG_SUBPKGS:= MKSH MKSH_TEST PKGSD_MKSH_TEST:= install testsuite PKGSC_MKSH_TEST:= base/tests -PKGSS_MKSH_TEST:= ed +PKGSS_MKSH_TEST:= perl ed DISTFILES:= $(PKG_NAME)-R$(PKG_VERSION).tgz WRKDIST= $(WRKDIR)/$(PKG_NAME) -- cgit v1.2.3