5.4.3pre2 version increment
[etherboot.git] / src / Makefile.main
index fabd044..158fe2e 100644 (file)
@@ -102,8 +102,8 @@ BOBJS:=
 MAKEROM=       $(PERL) ./util/makerom.pl
 VERSION_MAJOR= 5
 VERSION_MINOR= 4
 MAKEROM=       $(PERL) ./util/makerom.pl
 VERSION_MAJOR= 5
 VERSION_MINOR= 4
-VERSION_PATCH= 1
-EXTRAVERSION=  
+VERSION_PATCH= 3
+EXTRAVERSION=  pre2
 VERSION=       $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH)$(EXTRAVERSION)
 MM_VERSION=    $(VERSION_MAJOR).$(VERSION_MINOR)
 CFLAGS+=       -DVERSION_MAJOR=$(VERSION_MAJOR) \
 VERSION=       $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH)$(EXTRAVERSION)
 MM_VERSION=    $(VERSION_MAJOR).$(VERSION_MINOR)
 CFLAGS+=       -DVERSION_MAJOR=$(VERSION_MAJOR) \
@@ -402,13 +402,54 @@ tarball: ../index.html ../index-berlios.html
 
 cvs-tarball: ../index.html ../index-berlios.html
        (echo -n $(VERSION) ''; date -u +'%Y-%m-%d') > ../VERSION
 
 cvs-tarball: ../index.html ../index-berlios.html
        (echo -n $(VERSION) ''; date -u +'%Y-%m-%d') > ../VERSION
-       rm -rf /tmp/etherboot-$(MM_VERSION)cvs
-       mkdir /tmp/etherboot-$(MM_VERSION)cvs
-       cp -rP .. /tmp/etherboot-$(MM_VERSION)cvs
-       ( cd /tmp; tar cf /tmp/etherboot-$(MM_VERSION)cvs.tar --exclude CVS --exclude "#*" \
-            --exclude "*~" etherboot-$(MM_VERSION)cvs )
-       bzip2 -9 < /tmp/etherboot-$(MM_VERSION)cvs.tar > /tmp/etherboot-$(MM_VERSION)cvs.tar.bz2
-       gzip -9 < /tmp/etherboot-$(MM_VERSION)cvs.tar > /tmp/etherboot-$(MM_VERSION)cvs.tar.gz
+       rm -rf /tmp/etherboot-$(VERSION)
+       mkdir /tmp/etherboot-$(VERSION)
+       cp -rP .. /tmp/etherboot-$(VERSION)
+       ( cd /tmp; tar cf /tmp/etherboot-$(VERSION).tar --exclude CVS --exclude "#*" \
+            --exclude "*~" etherboot-$(VERSION) )
+       bzip2 -9 < /tmp/etherboot-$(VERSION).tar > /tmp/etherboot-$(VERSION).tar.bz2
+       gzip -9 < /tmp/etherboot-$(VERSION).tar > /tmp/etherboot-$(VERSION).tar.gz
+       ( cd /tmp; rm -rf /tmp/etherboot-$(VERSION) ; rm /tmp/etherboot-$(VERSION).tar ; \
+       tar -zxf /tmp/etherboot-$(VERSION).tar.gz )
+
+# If static boot info is used, all static values must be supplied
+
+ifneq ($(findstring -DUSE_STATIC_BOOT_INFO, $(CFLAGS)),)
+
+ifeq ($(findstring -DSTATIC_CLIENT_IP, $(CFLAGS)),)
+$(error "-DUSE_STATIC_BOOT_INFO defined, but -DSTATIC_CLIENT_IP not defined!")
+endif
+
+ifeq ($(findstring -DSTATIC_SUBNET_MASK, $(CFLAGS)),)
+$(error "-DUSE_STATIC_BOOT_INFO defined, but -DSTATIC_SUBNET_MASK not defined!")
+endif
+
+ifeq ($(findstring -DSTATIC_SERVER_IP, $(CFLAGS)),)
+$(error "-DUSE_STATIC_BOOT_INFO defined, but -DSTATIC_SERVER_IP not defined!")
+endif
+
+ifeq ($(findstring -DSTATIC_GATEWAY_IP, $(CFLAGS)),)
+$(error "-DUSE_STATIC_BOOT_INFO defined, but -DSTATIC_GATEWAY_IP not defined!")
+endif
+
+ifeq ($(findstring -DSTATIC_BOOTFILE, $(CFLAGS)),)
+$(error "-DUSE_STATIC_BOOT_INFO defined, but -DSTATIC_BOOTFILE not defined!")
+endif
+
+endif
+
+# PXE Support requires TFTP protocol
+ifeq ($(findstring -DDOWNLOAD_PROTO_TFTP, $(CFLAGS)),)
+
+ifneq ($(findstring -DPXE_IMAGE,  $(CFLAGS)),)
+$(error "-DPXE_IMAGE support requires TFTP support (-DDOWNLOAD_PROTO_TFTP)")
+endif
+
+ifneq ($(findstring -DPXE_EXPORT, $(CFLAGS)),)
+$(error "-DPXE_EXPORT support requires TFTP support (-DDOWNLOAD_PROTO_TFTP)")
+endif
+
+endif
 
 # Auto-incrementing build serial number.  Is auto-incremented for each
 # make run that specifies a final image file (e.g. bin/undi.zpxe) as a
 
 # Auto-incrementing build serial number.  Is auto-incremented for each
 # make run that specifies a final image file (e.g. bin/undi.zpxe) as a