7c87b67c0

Glenn L McGrath

2004-01-13

FAILED Duration: 91s

Subject

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.

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

include/busybox.h +4 -0 scripts/config/confdata.c +7 -2

include/busybox.h+4 -0

@@ -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>

scripts/config/confdata.c+7 -2

@@ -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();