changeset 1769:cb94b575c2d2

Switch from ash (which #errors building nommu) to hush.
author Rob Landley <rob@landley.net>
date Wed, 10 Jun 2015 11:24:42 -0500
parents 8fc7542bc770
children b6916761867a
files host-tools.sh sources/baseconfig-busybox sources/root-filesystem/sbin/init.sh
diffstat 3 files changed, 21 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/host-tools.sh	Mon Jun 08 09:08:59 2015 -0500
+++ b/host-tools.sh	Wed Jun 10 11:24:42 2015 -0500
@@ -93,7 +93,7 @@
 # instance of these tools that occurs in the $PATH, in order, each in its
 # own fallback directory.
 
-for i in ar as nm cc make ld gcc objdump $HOST_EXTRA
+for i in ar as nm cc make ld gcc objdump sh $HOST_EXTRA
 do
   if [ ! -f "$STAGE_DIR/$i" ]
   then
--- a/sources/baseconfig-busybox	Mon Jun 08 09:08:59 2015 -0500
+++ b/sources/baseconfig-busybox	Wed Jun 10 11:24:42 2015 -0500
@@ -45,16 +45,25 @@
 
 # shell
 
-CONFIG_ASH=y
-CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
-CONFIG_FEATURE_TEST_64=y
-CONFIG_ASH_BASH_COMPAT=y
-CONFIG_ASH_BUILTIN_TEST=y
-CONFIG_ASH_EXPAND_PRMT=y
-CONFIG_ASH_RANDOM_SUPPORT=y
-CONFIG_ASH_CMDCMD=y
-CONFIG_ASH_ALIAS=y
-CONFIG_ASH_JOB_CONTROL=y
+CONFIG_HUSH=y
+CONFIG_HUSH_BASH_COMPAT=y
+CONFIG_HUSH_BRACE_EXPANSION=y
+CONFIG_HUSH_HELP=y
+CONFIG_HUSH_INTERACTIVE=y
+CONFIG_HUSH_SAVEHISTORY=y
+CONFIG_HUSH_JOB=y
+CONFIG_HUSH_TICK=y
+CONFIG_HUSH_IF=y
+CONFIG_HUSH_LOOPS=y
+CONFIG_HUSH_CASE=y
+CONFIG_HUSH_FUNCTIONS=y
+CONFIG_HUSH_LOCAL=y
+CONFIG_HUSH_RANDOM_SUPPORT=y
+CONFIG_HUSH_EXPORT_N=y
+CONFIG_HUSH_MODE_X=y
+CONFIG_FEATURE_SH_IS_NONE=y
+CONFIG_FEATURE_BASH_IS_NONE=y
+
 CONFIG_SH_MATH_SUPPORT=y
 CONFIG_SH_MATH_SUPPORT_64=y
 CONFIG_FEATURE_SH_EXTRA_QUIET=y
--- a/sources/root-filesystem/sbin/init.sh	Mon Jun 08 09:08:59 2015 -0500
+++ b/sources/root-filesystem/sbin/init.sh	Wed Jun 10 11:24:42 2015 -0500
@@ -1,4 +1,4 @@
-#!/bin/ash
+#!/bin/hush
 
 export HOME=/home
 export PATH=/bin:/sbin