summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Config.h22
-rw-r--r--Makefile4
-rw-r--r--TODO8
-rw-r--r--busybox.spec2
-rw-r--r--examples/busybox.spec2
5 files changed, 17 insertions, 21 deletions
diff --git a/Config.h b/Config.h
index cc02a5e..59a605a 100644
--- a/Config.h
+++ b/Config.h
@@ -147,12 +147,12 @@
// If you enabled BB_SH above, you may select one of the following shells.
// You can only select ONE of the following shells. Sorry.
//
-// lash is the very smallest shell (adds just 10k) and it is quite usable as a
-// command prompt, but it is not suitable for any but the most trivial scripting
-// (such as an initrd that calls insmod a few times) since it does not
-// understand Bourne shell grammer. It does handle pipes, redirects, and job
-// control though. Adding in command editing makes it very nice lightweight
-// command prompt.
+// lash is the very smallest shell (adds just 10k) and it is quite usable as
+// a command prompt, but it is not suitable for any but the most trivial
+// scripting (such as an initrd that calls insmod a few times) since it does
+// not understand Bourne shell grammer. It does handle pipes, redirects, and
+// job control though. Adding in command editing makes it very nice
+// lightweight command prompt.
//#define BB_FEATURE_LASH
//
// hush is also quite small (just 18k) and it has very complete Bourne shell
@@ -164,10 +164,10 @@
// msh: The minix shell (adds just 30k) is quite complete and handles things
// like for/do/done, case/esac and all the things you expect a Bourne shell to
// do. It is not always pedantically correct about Bourne shell grammer (try
-// running the shell testscript "tests/sh.testcases" on it and compare vs
-// bash) but for most things it works quite well. It also uses only vfork, so
-// it can be used on uClinux systems. This was only recently added, so there is
-// still room to shrink it further...
+// running the shell testscript "tests/sh.testcases" on it and compare vs bash)
+// but for most things it works quite well. It also uses only vfork, so it can
+// be used on uClinux systems. This was only recently added, so there is still
+// room to shrink it further...
#define BB_FEATURE_MSH
//
// ash: This adds about 60k in the default configuration and is the most
@@ -354,7 +354,7 @@
// Enable busybox --install [-s]
// to create links (or symlinks) for all the commands that are
// compiled into the binary. (needs /proc filesystem)
-// #define BB_FEATURE_INSTALLER
+//#define BB_FEATURE_INSTALLER
//
// Enable a nifty progress meter in wget (adds just under 2k)
#define BB_FEATURE_WGET_STATUSBAR
diff --git a/Makefile b/Makefile
index 0a76b1f..13e89ec 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@
#
PROG := busybox
-VERSION := 0.52pre
+VERSION := 0.52
BUILDTIME := $(shell TZ=UTC date -u "+%Y.%m.%d-%H:%M%z")
export VERSION
@@ -377,6 +377,8 @@ libbb.a: $(LIBBB_MOBJ) $(LIBBB_AROBJS) $(LIBBB_OBJS)
usage.o: usage.h
+sh.o: sh.c lash.c hush.c msh.c ash.c
+
libbb/loop.o: libbb/loop.h
libbb/loop.h: mk_loop_h.sh
diff --git a/TODO b/TODO
index 7237ab7..3d9af20 100644
--- a/TODO
+++ b/TODO
@@ -10,13 +10,6 @@ around to it some time. If you have any good ideas, please let me know.
netkit-tiny. Per discussions on the mailing list, this isn't going
to happen. False alarm. Sorry about the confusion.
-* The default busybox shell, lash, is really too weak for serious use,
- although it is possible to run many simple systems with it. BusyBox
- 0.52 now contains a rewritten shell, hush, which understands most
- Bourne grammar, with only about a 4 Kbyte binary size penalty. You can
- engage hush at pre-compile time by "ln -sf hush.c sh.c; touch hush.c".
- Hush is young, and has plenty of bugs to shake out, so think twice before
- using it for production systems. We welcome bug reports and patches.
-Erik
@@ -25,6 +18,7 @@ around to it some time. If you have any good ideas, please let me know.
Possible apps to include some time:
* hwclock
+* start-stop-daemon
* group/commonize strings, remove dups (for i18n, l10n)
-----------
diff --git a/busybox.spec b/busybox.spec
index 645dfea..d1aea5f 100644
--- a/busybox.spec
+++ b/busybox.spec
@@ -1,5 +1,5 @@
Name: busybox
-Version: 0.52pre
+Version: 0.52
Release: 1
Group: System/Utilities
Summary: BusyBox is a tiny suite of Unix utilities in a multi-call binary.
diff --git a/examples/busybox.spec b/examples/busybox.spec
index 645dfea..d1aea5f 100644
--- a/examples/busybox.spec
+++ b/examples/busybox.spec
@@ -1,5 +1,5 @@
Name: busybox
-Version: 0.52pre
+Version: 0.52
Release: 1
Group: System/Utilities
Summary: BusyBox is a tiny suite of Unix utilities in a multi-call binary.