X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fsyslinux;h=1670da27e6862b771353366ed76ce0488f057013;hb=82b405615f47bb1dc34f4a3b488cb282058e9be3;hp=ba739ea752610d50658fca90e1ccf2834318703d;hpb=846e756e16f9f08e0d797473e40d836d747923f1;p=ipfire-2.x.git

diff --git a/lfs/syslinux b/lfs/syslinux
index ba739ea752..1670da27e6 100644
--- a/lfs/syslinux
+++ b/lfs/syslinux
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# 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,14 +24,17 @@
 
 include Config
 
-VER        = 4.02
+VER        = 6.04-pre1
 
 THISAPP    = syslinux-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
-SUP_ARCH   = i586
+SUP_ARCH   = x86_64 i586
+
+# Clear compiler flags (mainly hardening)
+CFLAGS     =
 
 ###############################################################################
 # Top-level Rules
@@ -41,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 52912c03f5c275d6c0ac09180ebab81f
+$(DL_FILE)_MD5 = f9c956fde0de29be297402ecbc8ff4d0
 
 install : $(TARGET)
 
@@ -70,7 +73,22 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && make install
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+
+	# Apply patches
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/syslinux-6.03-sysmacros.patch
+
+	# Build
+	cd $(DIR_APP) && make bios $(MAKETUNING)
+ifeq "$(BUILD_ARCH)" "x86_64"
+	cd $(DIR_APP) && make efi64 $(MAKETUNING)
+endif
+
+	# Install
+	cd $(DIR_APP) && make bios install
+ifeq "$(BUILD_ARCH)" "x86_64"
+	cd $(DIR_APP) && make efi64 install
+endif
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)