From 153748cce9b637e082f869d17197bc3ff5b24756 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Fri, 6 Dec 2013 20:11:36 +0000 Subject: [PATCH] [lkrnprefix] Include iPXE version string in image header Originally-implemented-by: Christian Hesse Signed-off-by: Michael Brown --- src/arch/i386/Makefile | 4 ++++ src/arch/i386/prefix/lkrnprefix.S | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/arch/i386/Makefile b/src/arch/i386/Makefile index 3ee40014e..d1b885c87 100644 --- a/src/arch/i386/Makefile +++ b/src/arch/i386/Makefile @@ -69,6 +69,10 @@ CFLAGS += -fshort-wchar # CFLAGS += -Ui386 +# Define version string for lkrnprefix.S +# +CFLAGS_lkrnprefix += -DVERSION="\"$(VERSION)\"" + # Locations of utilities # ISOLINUX_BIN_LIST := \ diff --git a/src/arch/i386/prefix/lkrnprefix.S b/src/arch/i386/prefix/lkrnprefix.S index 690031f0d..624f9b0ad 100644 --- a/src/arch/i386/prefix/lkrnprefix.S +++ b/src/arch/i386/prefix/lkrnprefix.S @@ -127,7 +127,7 @@ realmode_swtch: start_sys: .word 0 kernel_version: - .word 0 + .word version_string - 0x200 type_of_loader: .byte 0 loadflags: @@ -166,6 +166,9 @@ hardware_subarch: hardware_subarch_data: .byte 0, 0, 0, 0, 0, 0, 0, 0 +version_string: + .asciz VERSION + /* We don't need to do too much setup.