aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2013-12-11 09:57:15 +0000
committerMatt Fleming <matt.fleming@intel.com>2013-12-11 09:57:47 +0000
commit1ecdb80cea0f58d3ceea24a4e6c2ffc7359debea (patch)
treed7327a48ae3edf56946c2006951500bfc22f8000
parent98a8760069e9f2d83bf45f2ed8c2feb5610342a7 (diff)
parentbe90b8cc0c2267f42b863fdae2e35fdf76d1206a (diff)
downloadhdt-1ecdb80cea0f58d3ceea24a4e6c2ffc7359debea.tar.gz
hdt-1ecdb80cea0f58d3ceea24a4e6c2ffc7359debea.tar.xz
hdt-1ecdb80cea0f58d3ceea24a4e6c2ffc7359debea.zip
Merge branch 'efi-date-for-mfleming' of git://github.com/geneC/syslinux into firmware
Pull date fix for EFI from Gene Cumm, * 'efi-date-for-mfleming' of git://github.com/geneC/syslinux: efi/: Fix displayed version; add DATE
-rw-r--r--efi/Makefile11
-rw-r--r--efi/main.c5
2 files changed, 14 insertions, 2 deletions
diff --git a/efi/Makefile b/efi/Makefile
index a818abe0..4bf5a229 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 2eeeba32..d37a57b5 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;