X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fipfire-netboot;h=af9ef8e926770a3a9f2d87f7d8362c85f1cc36ff;hb=9e245967d21883c6b921c0f1d9101a526ef9b084;hp=984c044c0429fe617d139e9b419e82302a714ce5;hpb=8b690bda0b2c29dee117fed2460e9dc1cfab2e60;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/ipfire-netboot b/lfs/ipfire-netboot
index 984c044c04..af9ef8e926 100644
--- a/lfs/ipfire-netboot
+++ b/lfs/ipfire-netboot
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2013  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,12 +24,12 @@
 
 include Config
 
-VER        = v1.1
-PXE_VER    = 300a371
+VER        = v2.0
+PXE_VER    = 1b67a05
 
 THISAPP    = ipfire-netboot-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = http://source.ipfire.org/releases/ipfire-netboot/
+DL_FROM    = https://source.ipfire.org/releases/ipfire-netboot/
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 SUP_ARCH   = x86_64 i586
@@ -43,8 +43,8 @@ objects = $(DL_FILE) ipxe-$(PXE_VER).tar.gz
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 ipxe-$(PXE_VER).tar.gz = $(URL_IPFIRE)/ipxe-$(PXE_VER).tar.gz
 
-$(DL_FILE)_MD5 = 0dccbcfbc1eafb9d510bd15935b87ef6
-ipxe-$(PXE_VER).tar.gz_MD5 = 8a17fb4d6866214feb28cca55630b85f
+$(DL_FILE)_MD5 = a1f78e4b92457ecefb97d557b1b7a48e
+ipxe-$(PXE_VER).tar.gz_MD5 = 300fe0e096e58bfb4318bc39b63f9a88
 
 install : $(TARGET)
 
@@ -77,12 +77,22 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
 	# Extract iPXE source
 	cd $(DIR_APP) && tar axf $(DIR_DL)/ipxe-$(PXE_VER).tar.gz
+	cd $(DIR_APP)/ipxe-$(PXE_VER) && patch -Np1 < $(DIR_SRC)/src/patches/ipxe-fix-stringop-truncation-warning-with-gcc-8-x.patch
+	cd $(DIR_APP)/ipxe-$(PXE_VER) && patch -Np1 < $(DIR_SRC)/src/patches/ipxe-handle-R_X86_64_PLT32.patch
+	cd $(DIR_APP)/ipxe-$(PXE_VER) && patch -Np1 < $(DIR_SRC)/src/patches/ipxe-1b67a05-be-explicit-about-fcommon-compiler-directive.patch
 	cd $(DIR_APP) && rm -rfv ipxe && ln -s ipxe-$(PXE_VER) ipxe
-	cd $(DIR_APP) && make bin/ipxe.lkrn
+	cd $(DIR_APP) && make $(MAKETUNING) bin/ipxe.lkrn
+ifeq "$(BUILD_ARCH)" "x86_64"
+	cd $(DIR_APP) && make $(MAKETUNING) bin-x86_64-efi/ipxe.efi
+endif
 
 	# Installation
 	-mkdir -pv /usr/share/ipfire-netboot
 	cd $(DIR_APP) && install -m 644 bin/ipxe.lkrn /usr/share/ipfire-netboot
+ifeq "$(BUILD_ARCH)" "x86_64"
+	cd $(DIR_APP) && install -m 644 bin-x86_64-efi/ipxe.efi \
+		/usr/share/ipfire-netboot
+endif
 
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)