diff options
| author | Glenn L McGrath <bug1@ihug.co.nz> | 2004-01-13 10:57:32 +0000 |
|---|---|---|
| committer | Glenn L McGrath <bug1@ihug.co.nz> | 2004-01-13 10:57:32 +0000 |
| commit | 7c87b67c08b7fe379f203ecdfff6bb7d604719a5 (patch) | |
| tree | 193fac3f25479000e32bbf2cecb00a1c667649fb | |
| parent | 76620620ecbf2e8d456e00592bd7d5f8e31a33d2 (diff) | |
Patch from Bastian Blank, allow the buildtime to be overriden with a
different string, used by the debian busybox-cvs to specify the debian
date based version number.
| -rw-r--r-- | include/busybox.h | 4 | ||||
| -rw-r--r-- | scripts/config/confdata.c | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/include/busybox.h b/include/busybox.h index aaa844f43..28ea2530f 100644 --- a/include/busybox.h +++ b/include/busybox.h @@ -37,7 +37,11 @@ #endif #endif +#ifndef BB_EXTRA_VERSION #define BB_BANNER "BusyBox v" BB_VER " (" BB_BT ")" +#else +#define BB_BANNER "BusyBox v" BB_VER " (" BB_EXTRA_VERSION ")" +#endif #ifdef DMALLOC #include <dmalloc.h> diff --git a/scripts/config/confdata.c b/scripts/config/confdata.c index 768f771d0..aca6864cc 100644 --- a/scripts/config/confdata.c +++ b/scripts/config/confdata.c @@ -292,16 +292,21 @@ int conf_write(const char *name) fprintf(out, "#\n" "# Automatically generated make config: don't edit\n" "#\n"); - if (out_h) + if (out_h) { fprintf(out_h, "/*\n" " * Automatically generated header file: don't edit\n" " */\n\n" "#define AUTOCONF_INCLUDED\n\n" "/* Version Number */\n" "#define BB_VER \"%s\"\n" - "#define BB_BT \"%s\"\n\n", + "#define BB_BT \"%s\"\n", getenv("VERSION"), getenv("BUILDTIME")); + if (getenv("EXTRA_VERSION")) + fprintf(out_h, "#define BB_EXTRA_VERSION \"%s\"\n", + getenv("EXTRA_VERSION")); + fprintf(out_h, "\n"); + } if (!sym_change_count) sym_clear_all_valid(); |