aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277>2001-07-07 00:03:00 +0000
committerandersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277>2001-07-07 00:03:00 +0000
commit42cb7c8d4e193d803a15549757c0b905dbe1ce1a (patch)
tree02d2e30e4e9d727a1cef29abc9bdf0939e1949b8
parentda828fceb47464285c31e9e81af3d9a61358b068 (diff)
downloadbusybox-w32-42cb7c8d4e193d803a15549757c0b905dbe1ce1a.tar.gz
busybox-w32-42cb7c8d4e193d803a15549757c0b905dbe1ce1a.tar.bz2
busybox-w32-42cb7c8d4e193d803a15549757c0b905dbe1ce1a.zip
Some minor updates. Bump version number in preparation for release.
-Erik git-svn-id: svn://busybox.net/trunk/busybox@3024 69ca8d6d-28ef-0310-b511-8ec308f3f277
-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 cc02a5ec6..59a605ac1 100644
--- a/Config.h
+++ b/Config.h
@@ -147,12 +147,12 @@
147// If you enabled BB_SH above, you may select one of the following shells. 147// If you enabled BB_SH above, you may select one of the following shells.
148// You can only select ONE of the following shells. Sorry. 148// You can only select ONE of the following shells. Sorry.
149// 149//
150// lash is the very smallest shell (adds just 10k) and it is quite usable as a 150// lash is the very smallest shell (adds just 10k) and it is quite usable as
151// command prompt, but it is not suitable for any but the most trivial scripting 151// a command prompt, but it is not suitable for any but the most trivial
152// (such as an initrd that calls insmod a few times) since it does not 152// scripting (such as an initrd that calls insmod a few times) since it does
153// understand Bourne shell grammer. It does handle pipes, redirects, and job 153// not understand Bourne shell grammer. It does handle pipes, redirects, and
154// control though. Adding in command editing makes it very nice lightweight 154// job control though. Adding in command editing makes it very nice
155// command prompt. 155// lightweight command prompt.
156//#define BB_FEATURE_LASH 156//#define BB_FEATURE_LASH
157// 157//
158// hush is also quite small (just 18k) and it has very complete Bourne shell 158// hush is also quite small (just 18k) and it has very complete Bourne shell
@@ -164,10 +164,10 @@
164// msh: The minix shell (adds just 30k) is quite complete and handles things 164// msh: The minix shell (adds just 30k) is quite complete and handles things
165// like for/do/done, case/esac and all the things you expect a Bourne shell to 165// like for/do/done, case/esac and all the things you expect a Bourne shell to
166// do. It is not always pedantically correct about Bourne shell grammer (try 166// do. It is not always pedantically correct about Bourne shell grammer (try
167// running the shell testscript "tests/sh.testcases" on it and compare vs 167// running the shell testscript "tests/sh.testcases" on it and compare vs bash)
168// bash) but for most things it works quite well. It also uses only vfork, so 168// but for most things it works quite well. It also uses only vfork, so it can
169// it can be used on uClinux systems. This was only recently added, so there is 169// be used on uClinux systems. This was only recently added, so there is still
170// still room to shrink it further... 170// room to shrink it further...
171#define BB_FEATURE_MSH 171#define BB_FEATURE_MSH
172// 172//
173// ash: This adds about 60k in the default configuration and is the most 173// ash: This adds about 60k in the default configuration and is the most
@@ -354,7 +354,7 @@
354// Enable busybox --install [-s] 354// Enable busybox --install [-s]
355// to create links (or symlinks) for all the commands that are 355// to create links (or symlinks) for all the commands that are
356// compiled into the binary. (needs /proc filesystem) 356// compiled into the binary. (needs /proc filesystem)
357// #define BB_FEATURE_INSTALLER 357//#define BB_FEATURE_INSTALLER
358// 358//
359// Enable a nifty progress meter in wget (adds just under 2k) 359// Enable a nifty progress meter in wget (adds just under 2k)
360#define BB_FEATURE_WGET_STATUSBAR 360#define BB_FEATURE_WGET_STATUSBAR
diff --git a/Makefile b/Makefile
index 0a76b1f2a..13e89eca1 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@
18# 18#
19 19
20PROG := busybox 20PROG := busybox
21VERSION := 0.52pre 21VERSION := 0.52
22BUILDTIME := $(shell TZ=UTC date -u "+%Y.%m.%d-%H:%M%z") 22BUILDTIME := $(shell TZ=UTC date -u "+%Y.%m.%d-%H:%M%z")
23export VERSION 23export VERSION
24 24
@@ -377,6 +377,8 @@ libbb.a: $(LIBBB_MOBJ) $(LIBBB_AROBJS) $(LIBBB_OBJS)
377 377
378usage.o: usage.h 378usage.o: usage.h
379 379
380sh.o: sh.c lash.c hush.c msh.c ash.c
381
380libbb/loop.o: libbb/loop.h 382libbb/loop.o: libbb/loop.h
381 383
382libbb/loop.h: mk_loop_h.sh 384libbb/loop.h: mk_loop_h.sh
diff --git a/TODO b/TODO
index 7237ab736..3d9af20a7 100644
--- a/TODO
+++ b/TODO
@@ -10,13 +10,6 @@ around to it some time. If you have any good ideas, please let me know.
10 netkit-tiny. Per discussions on the mailing list, this isn't going 10 netkit-tiny. Per discussions on the mailing list, this isn't going
11 to happen. False alarm. Sorry about the confusion. 11 to happen. False alarm. Sorry about the confusion.
12 12
13* The default busybox shell, lash, is really too weak for serious use,
14 although it is possible to run many simple systems with it. BusyBox
15 0.52 now contains a rewritten shell, hush, which understands most
16 Bourne grammar, with only about a 4 Kbyte binary size penalty. You can
17 engage hush at pre-compile time by "ln -sf hush.c sh.c; touch hush.c".
18 Hush is young, and has plenty of bugs to shake out, so think twice before
19 using it for production systems. We welcome bug reports and patches.
20 13
21 -Erik 14 -Erik
22 15
@@ -25,6 +18,7 @@ around to it some time. If you have any good ideas, please let me know.
25Possible apps to include some time: 18Possible apps to include some time:
26 19
27* hwclock 20* hwclock
21* start-stop-daemon
28* group/commonize strings, remove dups (for i18n, l10n) 22* group/commonize strings, remove dups (for i18n, l10n)
29 23
30----------- 24-----------
diff --git a/busybox.spec b/busybox.spec
index 645dfea4b..d1aea5f8c 100644
--- a/busybox.spec
+++ b/busybox.spec
@@ -1,5 +1,5 @@
1Name: busybox 1Name: busybox
2Version: 0.52pre 2Version: 0.52
3Release: 1 3Release: 1
4Group: System/Utilities 4Group: System/Utilities
5Summary: BusyBox is a tiny suite of Unix utilities in a multi-call binary. 5Summary: BusyBox is a tiny suite of Unix utilities in a multi-call binary.
diff --git a/examples/busybox.spec b/examples/busybox.spec
index 645dfea4b..d1aea5f8c 100644
--- a/examples/busybox.spec
+++ b/examples/busybox.spec
@@ -1,5 +1,5 @@
1Name: busybox 1Name: busybox
2Version: 0.52pre 2Version: 0.52
3Release: 1 3Release: 1
4Group: System/Utilities 4Group: System/Utilities
5Summary: BusyBox is a tiny suite of Unix utilities in a multi-call binary. 5Summary: BusyBox is a tiny suite of Unix utilities in a multi-call binary.