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.
This commit is contained in:
parent
76620620ec
commit
7c87b67c08
@ -37,7 +37,11 @@
|
|||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef BB_EXTRA_VERSION
|
||||||
#define BB_BANNER "BusyBox v" BB_VER " (" BB_BT ")"
|
#define BB_BANNER "BusyBox v" BB_VER " (" BB_BT ")"
|
||||||
|
#else
|
||||||
|
#define BB_BANNER "BusyBox v" BB_VER " (" BB_EXTRA_VERSION ")"
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef DMALLOC
|
#ifdef DMALLOC
|
||||||
#include <dmalloc.h>
|
#include <dmalloc.h>
|
||||||
|
@ -292,16 +292,21 @@ int conf_write(const char *name)
|
|||||||
fprintf(out, "#\n"
|
fprintf(out, "#\n"
|
||||||
"# Automatically generated make config: don't edit\n"
|
"# Automatically generated make config: don't edit\n"
|
||||||
"#\n");
|
"#\n");
|
||||||
if (out_h)
|
if (out_h) {
|
||||||
fprintf(out_h, "/*\n"
|
fprintf(out_h, "/*\n"
|
||||||
" * Automatically generated header file: don't edit\n"
|
" * Automatically generated header file: don't edit\n"
|
||||||
" */\n\n"
|
" */\n\n"
|
||||||
"#define AUTOCONF_INCLUDED\n\n"
|
"#define AUTOCONF_INCLUDED\n\n"
|
||||||
"/* Version Number */\n"
|
"/* Version Number */\n"
|
||||||
"#define BB_VER \"%s\"\n"
|
"#define BB_VER \"%s\"\n"
|
||||||
"#define BB_BT \"%s\"\n\n",
|
"#define BB_BT \"%s\"\n",
|
||||||
getenv("VERSION"),
|
getenv("VERSION"),
|
||||||
getenv("BUILDTIME"));
|
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)
|
if (!sym_change_count)
|
||||||
sym_clear_all_valid();
|
sym_clear_all_valid();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user