Migrate to iPXE.

diff --git a/.gitmodules b/.gitmodules
index 8c5adb407ed3b0fd996f996d635149f9fa7cc59c..0ea444d543ffedb0ae7122c2adc10fd3a9b7caeb 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "gpxe"]
-       path = gpxe
-       url = git://git.etherboot.org/scm/gpxe.git
+[submodule "ipxe"]
+       path = ipxe
+       url = git://git.ipxe.org/ipxe.git

diff --git a/Makefile b/Makefile
index a0af61d66455e9115fb6f0c1fa9d450a78d88387..3d75cdd6498edbc153cf1a149aae9000363a5c49 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,22 +1,23 @@
 
-SCRIPTS = $(CURDIR)/ipfireboot.gpxe
+SCRIPTS = $(CURDIR)/ipfireboot.ipxe
 
-TARGETS = bin/gpxe.iso bin/gpxe.kpxe bin/undionly.kpxe bin/gpxe.dsk \
-       bin/gpxe.usb bin/gpxe.lkrn
+TARGETS = bin/ipxe.iso bin/ipxe.kpxe bin/undionly.kpxe bin/ipxe.dsk \
+       bin/ipxe.usb bin/ipxe.lkrn
 
 all: $(TARGETS)
 
 clean:
        rm -rfv $(TARGETS)
-       make -C gpxe/src clean
+       make -C ipxe/src clean veryclean
 
 $(TARGETS):
        # Copy our configuration to the gPXE submodule
-       cp -uvf config/* gpxe/src/config/local/
+       cp -vf config/* ipxe/src/config/local/
 
        # Build the image
-       make -C gpxe/src EMBEDDED_IMAGE=$(SCRIPTS) $@
+       make -C ipxe/src EMBED=$(SCRIPTS) NO_WERROR=1 \
+               ISOLINUX_BIN=/usr/share/syslinux/isolinux.bin $@
 
        # Copy the image to bin/
        -mkdir -pv $$(dirname $@)
-       cp -vf gpxe/src/$@ $@
+       cp -vf ipxe/src/$@ $@

diff --git a/config/console.h b/config/console.h
index c0de779ff2013dc2b179a5ab0b91bffc5aa5823e..5b68014c586aa179c29381f31957103421796f6d 100644 (file)
--- a/config/console.h
+++ b/config/console.h
@@ -1,3 +1,2 @@
 
-// Disable serial console
-#undef CONSOLE_SERIAL
+//#define CONSOLE_DIRECT_VGA

diff --git a/config/general.h b/config/general.h
index e60a0e2e780643152fe81246a0afd7e9f026ea57..142c99db36e46537a8aad9ceabeb416d4684a0a6 100644 (file)
--- a/config/general.h
+++ b/config/general.h
@@ -2,15 +2,15 @@
 #undef PRODUCT_NAME
 #define PRODUCT_NAME "IPFire Boot Server (boot.ipfire.org)"
 
-// Enable FTP protocol
-#define DOWNLOAD_PROTO_FTP
-
-// Disable SAN stuff
-#undef SANBOOT_CMD
+// Enable support for syslinux's com32 images.
+#define IMAGE_COMBOOT
 
-// Disable wireless stuff
-#undef IWMGMT_CMD
-#undef CRYPTO_80211_WEP
-#undef CRYPTO_80211_WPA
-#undef CRYPTO_80211_WPA2
+// Enable support for FTP and HTTPS downloads.
+#define DOWNLOAD_PROTO_FTP
+#define DOWNLOAD_PROTO_HTTPS
 
+// Disable iSCSI, AoE, Infiniband SCSI RDMA protocol and FibreChannel
+#undef SANBOOT_PROTO_ISCSI
+#undef SANBOOT_PROTO_AOE
+#undef SANBOOT_PROTO_IB_SRP
+#undef SANBOOT_PROTO_FCP

diff --git a/gpxe b/gpxe
deleted file mode 160000 (submodule)
index ed89393..0000000
--- a/gpxe
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ed893934d6de3698eb10413e9cf7227276e83fee

diff --git a/ipfireboot.gpxe b/ipfireboot.ipxe
similarity index 91%
rename from ipfireboot.gpxe
rename to ipfireboot.ipxe
index 0494d4759591870370ec902be39b2d34b2a7b84f..0f6a146ba6bfaac4991ba7d8d6d71c94efc13f22 100644 (file)
--- a/ipfireboot.gpxe
+++ b/ipfireboot.ipxe
@@ -1,4 +1,4 @@
-#!gpxe
+#!ipxe
 
 # Try to boot from DHCP.
 dhcp net0

diff --git a/ipxe b/ipxe
new file mode 160000 (submodule)
index 0000000..c4bce43
--- /dev/null
+++ b/ipxe
@@ -0,0 +1 @@
+Subproject commit c4bce43c3c4d3c5ebb2d926b58ad16dc9642c19d