Use our own versioning field to make upgrades easier

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/.gitignore b/.gitignore
index 04a0ff7339a1558f1efa8b5df173a35c42143115..1d9eb74ad1d2edc6ce1c509113a8837f566db02a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /bin
 /bin-x86_64-efi
+/ipfireboot.ipxe

diff --git a/Makefile b/Makefile
index 1c6e8c0a73cf9a381a9e807940258a6c7ce3f8b3..cfc3d1849fbf1e04bd00842cfbde23d1e32e487c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,6 @@
 
+VERSION = 2.0
+
 SCRIPTS = $(CURDIR)/ipfireboot.ipxe
 MACHINE = $(shell uname -m)
 
@@ -13,10 +15,14 @@ endif
 all: $(TARGETS)
 
 clean:
-       rm -rfv $(TARGETS)
+       rm -rfv $(SCRIPTS) $(TARGETS)
        make -C ipxe/src clean veryclean
 
-$(TARGETS): config/branding.h config/general.h
+%: %.in
+       sed -e "s/@VERSION@/$(VERSION)/g" \
+               < $< > $@
+
+$(TARGETS): $(SCRIPTS) config/branding.h config/general.h
        # Copy our configuration to the gPXE submodule
        cp -vf config/* ipxe/src/config/local/
 

diff --git a/ipfireboot.ipxe b/ipfireboot.ipxe.in
similarity index 70%
rename from ipfireboot.ipxe
rename to ipfireboot.ipxe.in
index e61e92da72783873c6928b6a633c04d653ef89ba..9483d03ab10c4155663b3b005a1b46a476030db5 100644 (file)
--- a/ipfireboot.ipxe
+++ b/ipfireboot.ipxe.in
@@ -9,4 +9,4 @@ cpuid --ext 29 && set arch x86_64 || set arch i386
 # Try to boot from DHCP.
 dhcp net0
 
-chain http://boot.ipfire.org/menu.gpxe?arch=${arch}&platform=${platform}
+chain http://boot.ipfire.org/menu.gpxe?version=@VERSION@&arch=${arch}&platform=${platform}