5.4.3pre2 version increment
[etherboot.git] / src / Makefile.main
index 451dc60..158fe2e 100644 (file)
@@ -102,8 +102,8 @@ BOBJS:=
 MAKEROM=       $(PERL) ./util/makerom.pl
 VERSION_MAJOR= 5
 VERSION_MINOR= 4
-VERSION_PATCH= 0
-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) \
@@ -142,6 +142,7 @@ E1000FLAGS= -DINCLUDE_E1000
 EPIC100FLAGS=  -DINCLUDE_EPIC100
 EXOS205FLAGS=  -DINCLUDE_EXOS205
 LANCEFLAGS=    -DINCLUDE_LANCE         # Lance/PCI!
+MYRI10GEFLAGS=  -DINCLUDE_MYRI10GE
 NE2100FLAGS=   -DINCLUDE_NE2100
 NEFLAGS=       -DINCLUDE_NE -DNE_SCAN=0x300,0x280,0x320,0x340,0x380
 NS8390FLAGS=   -DINCLUDE_NS8390        # NE2000/PCI!
@@ -230,7 +231,7 @@ noargs:     $(BIN)/toolcheck
        @echo
        @echo '    $(MAKE) bin/<rom-name>.<output-format> '
        @echo
-       @echo 'where <output-format> is one of {zdsk, zrom, iso, liso, zlilo, zpxe, elf, com}'
+       @echo 'where <output-format> is one of {zdsk, zhd, zrom, iso, liso, zlilo, zpxe, elf, com}'
        @echo
        @echo 'or: '
        @echo
@@ -395,10 +396,61 @@ clean:
 
 tarball: ../index.html ../index-berlios.html
        (echo -n $(VERSION) ''; date -u +'%Y-%m-%d') > ../VERSION
-       (cd ../..; tar cf /tmp/etherboot-$(VERSION).tar --exclude CVS --exclude doc etherboot-$(VERSION))
+       (cd ../..; tar cf /tmp/etherboot-$(VERSION).tar --exclude CVS --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
 
+cvs-tarball: ../index.html ../index-berlios.html
+       (echo -n $(VERSION) ''; date -u +'%Y-%m-%d') > ../VERSION
+       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
 # target, or a target of the form "all*".  Enable via -DBUILD_SERIAL