socsvn commit: r286609 - soc2015/kczekirda/ipxe/files

[kczekirda at FreeBSD.org]

Author: kczekirda
Date: Wed Jun  3 19:23:47 2015
New Revision: 286609
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=286609

Log:
  patches

Added:
  soc2015/kczekirda/ipxe/files/
  soc2015/kczekirda/ipxe/files/patch-Makefile
  soc2015/kczekirda/ipxe/files/patch-arch_i386_Makefile
  soc2015/kczekirda/ipxe/files/patch-util_geniso

Added: soc2015/kczekirda/ipxe/files/patch-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ soc2015/kczekirda/ipxe/files/patch-Makefile	Wed Jun  3 19:23:47 2015	(r286609)
@@ -0,0 +1,20 @@
+--- Makefile.orig	2015-06-03 19:17:57 UTC
++++ Makefile
+@@ -14,7 +14,7 @@ MAKEDEPS	:= Makefile
+ #
+ # Locations of tools
+ #
+-HOST_CC		:= gcc
++HOST_CC		:= gcc48
+ RM		:= rm -f
+ TOUCH		:= touch
+ MKDIR		:= mkdir
+@@ -23,7 +23,7 @@ ECHO		:= echo
+ PRINTF		:= printf
+ PERL		:= perl
+ TRUE		:= true
+-CC		:= $(CROSS_COMPILE)gcc
++CC		:= $(CROSS_COMPILE)gcc48
+ CPP		:= $(CC) -E
+ AS		:= $(CROSS_COMPILE)as
+ LD		:= $(CROSS_COMPILE)ld

Added: soc2015/kczekirda/ipxe/files/patch-arch_i386_Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ soc2015/kczekirda/ipxe/files/patch-arch_i386_Makefile	Wed Jun  3 19:23:47 2015	(r286609)
@@ -0,0 +1,12 @@
+--- arch/i386/Makefile.orig	2015-06-03 19:18:27 UTC
++++ arch/i386/Makefile
+@@ -94,7 +94,8 @@ ISOLINUX_BIN_LIST	:= \
+ 	/usr/share/syslinux/bios/isolinux.bin \
+ 	/usr/local/share/syslinux/isolinux.bin \
+ 	/usr/local/share/syslinux/bios/isolinux.bin \
+-	/usr/lib/ISOLINUX/isolinux.bin
++	/usr/local/share/syslinux/bios/core/isolinux.bin \
++/usr/lib/ISOLINUX/isolinux.bin
+ ISOLINUX_BIN	= $(firstword $(wildcard $(ISOLINUX_BIN_LIST)))
+ 
+ # i386-specific directories containing source files

Added: soc2015/kczekirda/ipxe/files/patch-util_geniso
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ soc2015/kczekirda/ipxe/files/patch-util_geniso	Wed Jun  3 19:23:47 2015	(r286609)
@@ -0,0 +1,11 @@
+--- util/geniso.orig	2015-06-03 19:19:11 UTC
++++ util/geniso
+@@ -123,7 +123,7 @@ case "${LEGACY}" in
+ 		cp ${ISOLINUX_BIN} ${dir}
+ 
+ 		# syslinux 6.x needs a file called ldlinux.c32
+-		LDLINUX_C32=$(dirname ${ISOLINUX_BIN})/ldlinux.c32
++		LDLINUX_C32=/usr/local/share/syslinux/bios/com32/elflink/ldlinux/ldlinux.c32
+ 		if [ -s ${LDLINUX_C32} ]; then
+ 			cp ${LDLINUX_C32} ${dir}
+ 		fi