[syslinux:firmware] efi/: Fix displayed version; add DATE
syslinux-bot for Gene Cumm
gene.cumm at gmail.com
Wed Dec 11 02:09:05 PST 2013
Commit-ID: be90b8cc0c2267f42b863fdae2e35fdf76d1206a
Gitweb: http://www.syslinux.org/commit/be90b8cc0c2267f42b863fdae2e35fdf76d1206a
Author: Gene Cumm <gene.cumm at gmail.com>
AuthorDate: Sun, 20 Oct 2013 10:45:53 -0400
Committer: Gene Cumm <gene.cumm at gmail.com>
CommitDate: Thu, 31 Oct 2013 21:03:05 -0400
efi/: Fix displayed version; add DATE
Version string appeared to be a temporary generic string; complete out in the
standard fashion
Signed-off-by: Gene Cumm <gene.cumm at gmail.com>
---
efi/Makefile | 11 +++++++++++
efi/main.c | 5 +++--
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/efi/Makefile b/efi/Makefile
index a818abe..4bf5a22 100644
--- a/efi/Makefile
+++ b/efi/Makefile
@@ -48,6 +48,17 @@ OBJS = $(subst $(SRC)/,,$(filter-out %wrapper.o, $(patsubst %.c,%.o,$(CSRC))))
OBJS += $(objdir)/core/codepage.o $(ARCH)/linux.o
+# The DATE is set on the make command line when building binaries for
+# official release. Otherwise, substitute a hex string that is pretty much
+# guaranteed to be unique to be unique from build to build.
+ifndef HEXDATE
+HEXDATE := $(shell $(PERL) $(SRC)/../now.pl $(SRCS))
+endif
+ifndef DATE
+DATE := $(shell sh $(SRC)/../gen-id.sh $(VERSION) $(HEXDATE))
+endif
+CFLAGS += -DDATE_STR='"$(DATE)"'
+
.PHONY: subdirs
subdirs:
mkdir -p $(ARCH)
diff --git a/efi/main.c b/efi/main.c
index 2eeeba3..d37a57b 100644
--- a/efi/main.c
+++ b/efi/main.c
@@ -10,11 +10,12 @@
#include "efi.h"
#include "fio.h"
+#include "version.h"
__export uint16_t PXERetry;
-__export char copyright_str[] = "Copyright (C) 2011\n";
+__export char copyright_str[] = "Copyright (C) 2011-" YEAR_STR "\n";
uint8_t SerialNotice = 1;
-__export char syslinux_banner[] = "Syslinux 5.x (EFI)\n";
+__export char syslinux_banner[] = "Syslinux " VERSION_STR " (EFI; " DATE_STR ")\n";
char CurrentDirName[CURRENTDIR_MAX];
struct com32_sys_args __com32;
More information about the Syslinux-commits
mailing list