summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Kraai2001-04-12 20:11:55 +0000
committerMatt Kraai2001-04-12 20:11:55 +0000
commit6ba1a80c260b671ae7b6b5be13e0b74857058c63 (patch)
tree9b4f388c414879a9f4507a8feef6e45886b186d5
parent5a65413c042e2538eda94b2efebd1bf4680ca986 (diff)
downloadbusybox-6ba1a80c260b671ae7b6b5be13e0b74857058c63.zip
busybox-6ba1a80c260b671ae7b6b5be13e0b74857058c63.tar.gz
Use date -u instead of date --utc and consolidate version string.
Patch by Larry Doolittle <ldoolitt@recycle.lbl.gov>.
-rw-r--r--Makefile2
-rw-r--r--busybox.h2
-rw-r--r--include/busybox.h2
-rw-r--r--klogd.c2
-rw-r--r--messages.c3
-rw-r--r--sysklogd/klogd.c2
-rw-r--r--sysklogd/syslogd.c2
-rw-r--r--syslogd.c2
8 files changed, 10 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 3141191..f659413 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@
PROG := busybox
VERSION := 0.51
-BUILDTIME := $(shell TZ=UTC date --utc "+%Y.%m.%d-%H:%M%z")
+BUILDTIME := $(shell TZ=UTC date -u "+%Y.%m.%d-%H:%M%z")
export VERSION
# With a modern GNU make(1) (highly recommended, that's what all the
diff --git a/busybox.h b/busybox.h
index d4a5773..ebbe759 100644
--- a/busybox.h
+++ b/busybox.h
@@ -31,6 +31,8 @@
#include <sys/stat.h>
#include <sys/types.h>
+#define BB_BANNER "BusyBox v" BB_VER " (" BB_BT ")"
+
#ifdef DMALLOC
#include "dmalloc.h"
#endif
diff --git a/include/busybox.h b/include/busybox.h
index d4a5773..ebbe759 100644
--- a/include/busybox.h
+++ b/include/busybox.h
@@ -31,6 +31,8 @@
#include <sys/stat.h>
#include <sys/types.h>
+#define BB_BANNER "BusyBox v" BB_VER " (" BB_BT ")"
+
#ifdef DMALLOC
#include "dmalloc.h"
#endif
diff --git a/klogd.c b/klogd.c
index 241a991..d7b54e9 100644
--- a/klogd.c
+++ b/klogd.c
@@ -76,7 +76,7 @@ static void doKlogd (void)
/* "Open the log. Currently a NOP." */
klogctl(1, NULL, 0);
- syslog_msg(LOG_DAEMON, 0, "klogd started: BusyBox v" BB_VER " (" BB_BT ")");
+ syslog_msg(LOG_DAEMON, 0, "klogd started: " BB_BANNER);
while (1) {
/* Use kernel syscalls */
diff --git a/messages.c b/messages.c
index 65f3875..57630a8 100644
--- a/messages.c
+++ b/messages.c
@@ -48,8 +48,7 @@
#if defined bb_need_full_version || ! defined BB_DECLARE_EXTERN
- BB_DEF_MESSAGE(full_version,
- "BusyBox v" BB_VER " (" BB_BT ") multi-call binary")
+ BB_DEF_MESSAGE(full_version, BB_BANNER " multi-call binary")
#endif
#if defined bb_need_name_too_long || ! defined BB_DECLARE_EXTERN
BB_DEF_MESSAGE(name_too_long, "file name too long")
diff --git a/sysklogd/klogd.c b/sysklogd/klogd.c
index 241a991..d7b54e9 100644
--- a/sysklogd/klogd.c
+++ b/sysklogd/klogd.c
@@ -76,7 +76,7 @@ static void doKlogd (void)
/* "Open the log. Currently a NOP." */
klogctl(1, NULL, 0);
- syslog_msg(LOG_DAEMON, 0, "klogd started: BusyBox v" BB_VER " (" BB_BT ")");
+ syslog_msg(LOG_DAEMON, 0, "klogd started: " BB_BANNER);
while (1) {
/* Use kernel syscalls */
diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c
index 6aec78b..9f5fc93 100644
--- a/sysklogd/syslogd.c
+++ b/sysklogd/syslogd.c
@@ -528,7 +528,7 @@ static void doSyslogd (void)
}
#endif
- logMessage (0, "syslogd started: BusyBox v" BB_VER " (" BB_BT ")");
+ logMessage (0, "syslogd started: " BB_BANNER);
for (;;) {
diff --git a/syslogd.c b/syslogd.c
index 6aec78b..9f5fc93 100644
--- a/syslogd.c
+++ b/syslogd.c
@@ -528,7 +528,7 @@ static void doSyslogd (void)
}
#endif
- logMessage (0, "syslogd started: BusyBox v" BB_VER " (" BB_BT ")");
+ logMessage (0, "syslogd started: " BB_BANNER);
for (;;) {