Attachment #135567 for bug #180505

View | Details | Raw Unified | Return to bug 180505
Collapse All | Expand All




# $FreeBSD: head/sysutils/syslinux/Makefile 313190 2013-03-02 05:43:04Z miwi $

PORTNAME=	syslinux
PORTVERSION=	6.01
CATEGORIES=	sysutils
MASTER_SITES=	KERNEL_ORG/linux/utils/boot/syslinux

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Boot loader for the Linux operating system

LICENSE=	GPLv2

BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
RUN_DEPENDS=	mtools:${PORTSDIR}/emulators/mtools

LICENSE=	GPLv2

USE_XZ=		yes
USE_PERL5_BUILD=	yes
USE_GMAKE=	yes
MAKE_ARGS=	CC="${CC}"
ALL_TARGET=	bios
MAKE_JOBS_SAFE=	yes

MAN1=		syslinux.1

_A =	mbr/mbr.bin mbr/gptmbr.bin \
	core/pxelinux.0 core/isolinux.bin gpxe/gpxelinux.0 \
	memdisk/memdisk \
	com32/chain/*.c32 com32/cmenu/libmenu/libmenu.c32 \
	com32/elflink/ldlinux/*.c32 com32/gfxboot/*.c32 \
	com32/hdt/*.c32 com32/lib/*.c32 \
	com32/lua/src/*.c32 com32/mboot/*.c32 \
	com32/menu/*.c32 com32/modules/*.c32 \
	com32/rosh/*.c32 com32/sysdump/*.c32

# convert elf_i386 to elf_i386_fbsd
pre-patch:

	  ${ECHO_CMD} "@dirrm share/syslinux" )

do-install:
	(cd ${WRKSRC}/bios/mtools && ${INSTALL_PROGRAM} syslinux ${PREFIX}/bin)
	(cd ${WRKSRC}/man && ${INSTALL_MAN} syslinux.1 ${MANPREFIX}/man/man1)
	@${MKDIR} ${DATADIR}
	(cd ${WRKSRC}/bios && ${INSTALL_DATA} ${_A} ${DATADIR})

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)sysutils/syslinux/distinfo (-2 / +2 lines)
1	SHA256 (syslinux-5.01.tar.xz) = 41320ae9c8211bb99b1322fdbf98a83d3bdc0f9a78291ad27f8512b12e16b411	1	SHA256 (syslinux-6.01.tar.xz) = abd9e83c4d8e759a801dd9195869d5407fc07234dd4c560337cca63825fb4d6f
2	SIZE (syslinux-5.01.tar.xz) = 5001008	2	SIZE (syslinux-6.01.tar.xz) = 6370172




--- Makefile.orig	2011-04-18 23:24:17.000000000 +0200
+++ Makefile	2011-05-05 15:51:44.356358227 +0200
@@ -170,19 +170,19 @@
 
 else
 
-BSUBDIRS = codepage com32 lzo core memdisk mbr memdump gpxe sample \
-	   diag libinstaller dos win32 win64 dosutil txt
+#BSUBDIRS = codepage com32 lzo core memdisk mbr memdump gpxe sample \
+#	   diag libinstaller dos win32 win64 dosutil txt
 
 ITARGET  =
 IOBJECTS = $(ITARGET) \
 	utils/gethostip utils/isohybrid utils/mkdiskimage \
 	mtools/syslinux linux/syslinux extlinux/extlinux
-ISUBDIRS = libinstaller mtools linux extlinux utils
+ISUBDIRS = libinstaller mtools # linux extlinux utils
 
 # Things to install in /usr/bin
 INSTALL_BIN   =	mtools/syslinux
 # Things to install in /sbin
-INSTALL_SBIN  = extlinux/extlinux
+#INSTALL_SBIN  = extlinux/extlinux
 # Things to install in /usr/lib/syslinux
 INSTALL_AUX   =	core/pxelinux.0 gpxe/gpxelinux.0 gpxe/gpxelinuxk.0 \
 		core/isolinux.bin core/isolinux-debug.bin \




--- mtools/Makefile.orig	2011-12-09 19:28:17.000000000 +0100
+++ mtools/Makefile	2012-08-16 10:09:08.429505540 +0200
@@ -1,8 +1,8 @@
 MAKEDIR = $(topdir)/mk
 include $(MAKEDIR)/syslinux.mk
 
-OPTFLAGS = -g -Os
+#OPTFLAGS = -g -Os
 INCLUDES = -I$(SRC) -I$(objdir) -I$(SRC)/../libfat -I$(SRC)/../libinstaller
-CFLAGS	 = $(GCCWARN) -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES)
+CFLAGS	 += $(GCCWARN) -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES)
 LDFLAGS	 = 
 
 SRCS     = syslinux.c \




bin/syslinux
%%DATADIR%%/cat.c32
%%DATADIR%%/chain.c32
%%DATADIR%%/cmd.c32
%%DATADIR%%/config.c32
%%DATADIR%%/cptime.c32
%%DATADIR%%/cpuid.c32
%%DATADIR%%/cpuidtest.c32
%%DATADIR%%/disk.c32
%%DATADIR%%/dmitest.c32
%%DATADIR%%/elf.c32
%%DATADIR%%/ethersel.c32
%%DATADIR%%/gfxboot.c32
%%DATADIR%%/gptmbr.bin
%%DATADIR%%/gpxecmd.c32
%%DATADIR%%/gpxelinux.0
%%DATADIR%%/hdt.c32
%%DATADIR%%/hexdump.c32
%%DATADIR%%/host.c32
%%DATADIR%%/ifcpu.c32

%%DATADIR%%/isolinux.bin
%%DATADIR%%/kbdmap.c32
%%DATADIR%%/kontron_wdt.c32
%%DATADIR%%/ldlinux.c32
%%DATADIR%%/libcom32.c32
%%DATADIR%%/liblua.c32
%%DATADIR%%/libmenu.c32
%%DATADIR%%/linux.c32
%%DATADIR%%/ls.c32
%%DATADIR%%/lua.c32
%%DATADIR%%/mboot.c32
%%DATADIR%%/mbr.bin
%%DATADIR%%/memdisk
%%DATADIR%%/meminfo.c32
%%DATADIR%%/menu.c32
%%DATADIR%%/pcitest.c32
%%DATADIR%%/pmload.c32
%%DATADIR%%/poweroff.c32
%%DATADIR%%/prdhcp.c32
%%DATADIR%%/pwd.c32
%%DATADIR%%/pxechn.c32
%%DATADIR%%/pxelinux.0
%%DATADIR%%/reboot.c32
%%DATADIR%%/rosh.c32
%%DATADIR%%/sanboot.c32
%%DATADIR%%/sdi.c32
%%DATADIR%%/sysdump.c32
%%DATADIR%%/vesainfo.c32
%%DATADIR%%/vesamenu.c32
%%DATADIR%%/vpdtest.c32

Return to bug 180505

Lines 2-23 Link Here

(-)sysutils/syslinux/Makefile (-8 / +14 lines)
2	# $FreeBSD: head/sysutils/syslinux/Makefile 313190 2013-03-02 05:43:04Z miwi $	2	# $FreeBSD: head/sysutils/syslinux/Makefile 313190 2013-03-02 05:43:04Z miwi $
3		3
4	PORTNAME= syslinux	4	PORTNAME= syslinux
5	PORTVERSION= 5.01	5	PORTVERSION= 6.01
6	CATEGORIES= sysutils	6	CATEGORIES= sysutils
7	MASTER_SITES= KERNEL_ORG/linux/utils/boot/syslinux	7	MASTER_SITES= KERNEL_ORG/linux/utils/boot/syslinux
8		8
9	MAINTAINER= ports@FreeBSD.org	9	MAINTAINER= ports@FreeBSD.org
10	COMMENT= Boot loader for the Linux operating system	10	COMMENT= Boot loader for the Linux operating system
11		11
		12	LICENSE= GPLv2
		13
12	BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm	14	BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm
13	RUN_DEPENDS= mtools:${PORTSDIR}/emulators/mtools	15	RUN_DEPENDS= mtools:${PORTSDIR}/emulators/mtools
14		16
15	LICENSE= GPLv2
16
17	USE_XZ= yes	17	USE_XZ= yes
18	USE_PERL5_BUILD= yes	18	USE_PERL5_BUILD= yes
19	USE_GMAKE= yes	19	USE_GMAKE= yes
20	MAKE_ARGS= CC="${CC}"	20	MAKE_ARGS= CC="${CC}"
		21	ALL_TARGET= bios
21	MAKE_JOBS_SAFE= yes	22	MAKE_JOBS_SAFE= yes
22		23
23	MAN1= syslinux.1	24	MAN1= syslinux.1
Lines 28-34 Link Here
28	_A = mbr/mbr.bin mbr/gptmbr.bin \	29	_A = mbr/mbr.bin mbr/gptmbr.bin \
29	core/pxelinux.0 core/isolinux.bin gpxe/gpxelinux.0 \	30	core/pxelinux.0 core/isolinux.bin gpxe/gpxelinux.0 \
30	memdisk/memdisk \	31	memdisk/memdisk \
31	com32/menu/.c32 com32/modules/.c32	32	com32/chain/*.c32 com32/cmenu/libmenu/libmenu.c32 \
		33	com32/elflink/ldlinux/.c32 com32/gfxboot/.c32 \
		34	com32/hdt/.c32 com32/lib/.c32 \
		35	com32/lua/src/.c32 com32/mboot/.c32 \
		36	com32/menu/.c32 com32/modules/.c32 \
		37	com32/rosh/.c32 com32/sysdump/.c32
32		38
33	# convert elf_i386 to elf_i386_fbsd	39	# convert elf_i386 to elf_i386_fbsd
34	pre-patch:	40	pre-patch:
Lines 47-55 Link Here
47	${ECHO_CMD} "@dirrm share/syslinux" )	53	${ECHO_CMD} "@dirrm share/syslinux" )
48		54
49	do-install:	55	do-install:
50	${MKDIR} ${DATADIR}	56	(cd ${WRKSRC}/bios/mtools && ${INSTALL_PROGRAM} syslinux ${PREFIX}/bin)
51	( cd ${WRKSRC}; ${INSTALL_DATA} ${_A} ${DATADIR} )	57	(cd ${WRKSRC}/man && ${INSTALL_MAN} syslinux.1 ${MANPREFIX}/man/man1)
52	${INSTALL_PROGRAM} ${WRKSRC}/mtools/syslinux ${PREFIX}/bin	58	@${MKDIR} ${DATADIR}
53	${INSTALL_MAN} ${WRKSRC}/man/syslinux.1 ${MANPREFIX}/man/man1	59	(cd ${WRKSRC}/bios && ${INSTALL_DATA} ${_A} ${DATADIR})
54		60
55	.include <bsd.port.post.mk>	61	.include <bsd.port.post.mk>

Lines 1-24 Link Here

(-)sysutils/syslinux/files/patch-Makefile (-8 / +10 lines)
1	--- Makefile.orig 2011-04-18 23:24:17.000000000 +0200	1	--- Makefile.orig 2011-04-18 23:24:17.000000000 +0200
2	+++ Makefile 2011-05-05 15:51:44.356358227 +0200	2	+++ Makefile 2011-05-05 15:51:44.356358227 +0200
3	@@ -57,18 +57,18 @@	3	@@ -170,19 +170,19 @@
4	# Note: libinstaller is both a BSUBDIR and an ISUBDIR. It contains	4
5	# files that depend only on the B phase, but may have to be regenerated	5	else
6	# for "make installer".	6
7	-BSUBDIRS = codepage com32 lzo core memdisk mbr memdump gpxe sample \	7	-BSUBDIRS = codepage com32 lzo core memdisk mbr memdump gpxe sample \
8	+BSUBDIRS_ = codepage com32 lzo core memdisk mbr memdump gpxe sample \	8	- diag libinstaller dos win32 win64 dosutil txt
9	diag libinstaller dos win32 win64 dosutil txt	9	+#BSUBDIRS = codepage com32 lzo core memdisk mbr memdump gpxe sample \
		10	+# diag libinstaller dos win32 win64 dosutil txt
		11
10	ITARGET =	12	ITARGET =
11	IOBJECTS = $(ITARGET) \	13	IOBJECTS = $(ITARGET) \
12	utils/gethostip utils/isohybrid utils/mkdiskimage \	14	utils/gethostip utils/isohybrid utils/mkdiskimage \
13	mtools/syslinux linux/syslinux extlinux/extlinux	15	mtools/syslinux linux/syslinux extlinux/extlinux
14	-ISUBDIRS = libinstaller mtools linux extlinux utils	16	-ISUBDIRS = libinstaller mtools linux extlinux utils
15	+ISUBDIRS = libinstaller mtools	17	+ISUBDIRS = libinstaller mtools # linux extlinux utils
16		18
17	# Things to install in /usr/bin	19	# Things to install in /usr/bin
18	INSTALL_BIN = mtools/syslinux	20	INSTALL_BIN = mtools/syslinux
19	# Things to install in /sbin	21	# Things to install in /sbin
20	-INSTALL_SBIN = extlinux/extlinux	22	-INSTALL_SBIN = extlinux/extlinux
21	+INSTALL_SBIN = #extlinux/extlinux	23	+#INSTALL_SBIN = extlinux/extlinux
22	# Things to install in /usr/lib/syslinux	24	# Things to install in /usr/lib/syslinux
23	INSTALL_AUX = core/pxelinux.0 gpxe/gpxelinux.0 gpxe/gpxelinuxk.0 \	25	INSTALL_AUX = core/pxelinux.0 gpxe/gpxelinux.0 gpxe/gpxelinuxk.0 \
24	core/isolinux.bin core/isolinux-debug.bin \	26	core/isolinux.bin core/isolinux-debug.bin \

Lines 1-13 Link Here

(-)sysutils/syslinux/files/patch-mtools-Makefile (-4 / +4 lines)
1	--- mtools/Makefile.orig 2011-12-09 19:28:17.000000000 +0100	1	--- mtools/Makefile.orig 2011-12-09 19:28:17.000000000 +0100
2	+++ mtools/Makefile 2012-08-16 10:09:08.429505540 +0200	2	+++ mtools/Makefile 2012-08-16 10:09:08.429505540 +0200
3	@@ -2,9 +2,8 @@	3	@@ -1,8 +1,8 @@
4	MAKEDIR = $(topdir)/mk
5	include $(MAKEDIR)/syslinux.mk	4	include $(MAKEDIR)/syslinux.mk
6		5
7	-OPTFLAGS = -g -Os	6	-OPTFLAGS = -g -Os
8	INCLUDES = -I. -I.. -I../libfat -I../libinstaller	7	+#OPTFLAGS = -g -Os
		8	INCLUDES = -I$(SRC) -I$(objdir) -I$(SRC)/../libfat -I$(SRC)/../libinstaller
9	-CFLAGS = $(GCCWARN) -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES)	9	-CFLAGS = $(GCCWARN) -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES)
10	+CFLAGS += $(GCCWARN) -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES)	10	+CFLAGS += $(GCCWARN) -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES)
11	LDFLAGS =	11	LDFLAGS =
12		12
13	SRCS = syslinux.c \	13	SRCS = syslinux.c \

Lines 1-16 Link Here

(-)sysutils/syslinux/pkg-plist (+13 lines)
1	bin/syslinux	1	bin/syslinux
2	%%DATADIR%%/cat.c32	2	%%DATADIR%%/cat.c32
		3	%%DATADIR%%/chain.c32
3	%%DATADIR%%/cmd.c32	4	%%DATADIR%%/cmd.c32
4	%%DATADIR%%/config.c32	5	%%DATADIR%%/config.c32
		6	%%DATADIR%%/cptime.c32
5	%%DATADIR%%/cpuid.c32	7	%%DATADIR%%/cpuid.c32
6	%%DATADIR%%/cpuidtest.c32	8	%%DATADIR%%/cpuidtest.c32
7	%%DATADIR%%/disk.c32	9	%%DATADIR%%/disk.c32
8	%%DATADIR%%/dmitest.c32	10	%%DATADIR%%/dmitest.c32
9	%%DATADIR%%/elf.c32	11	%%DATADIR%%/elf.c32
10	%%DATADIR%%/ethersel.c32	12	%%DATADIR%%/ethersel.c32
		13	%%DATADIR%%/gfxboot.c32
11	%%DATADIR%%/gptmbr.bin	14	%%DATADIR%%/gptmbr.bin
12	%%DATADIR%%/gpxecmd.c32	15	%%DATADIR%%/gpxecmd.c32
13	%%DATADIR%%/gpxelinux.0	16	%%DATADIR%%/gpxelinux.0
		17	%%DATADIR%%/hdt.c32
14	%%DATADIR%%/hexdump.c32	18	%%DATADIR%%/hexdump.c32
15	%%DATADIR%%/host.c32	19	%%DATADIR%%/host.c32
16	%%DATADIR%%/ifcpu.c32	20	%%DATADIR%%/ifcpu.c32
Lines 20-40 Link Here
20	%%DATADIR%%/isolinux.bin	24	%%DATADIR%%/isolinux.bin
21	%%DATADIR%%/kbdmap.c32	25	%%DATADIR%%/kbdmap.c32
22	%%DATADIR%%/kontron_wdt.c32	26	%%DATADIR%%/kontron_wdt.c32
		27	%%DATADIR%%/ldlinux.c32
		28	%%DATADIR%%/libcom32.c32
		29	%%DATADIR%%/liblua.c32
		30	%%DATADIR%%/libmenu.c32
23	%%DATADIR%%/linux.c32	31	%%DATADIR%%/linux.c32
24	%%DATADIR%%/ls.c32	32	%%DATADIR%%/ls.c32
		33	%%DATADIR%%/lua.c32
		34	%%DATADIR%%/mboot.c32
25	%%DATADIR%%/mbr.bin	35	%%DATADIR%%/mbr.bin
26	%%DATADIR%%/memdisk	36	%%DATADIR%%/memdisk
27	%%DATADIR%%/meminfo.c32	37	%%DATADIR%%/meminfo.c32
28	%%DATADIR%%/menu.c32	38	%%DATADIR%%/menu.c32
29	%%DATADIR%%/pcitest.c32	39	%%DATADIR%%/pcitest.c32
30	%%DATADIR%%/pmload.c32	40	%%DATADIR%%/pmload.c32
		41	%%DATADIR%%/poweroff.c32
31	%%DATADIR%%/prdhcp.c32	42	%%DATADIR%%/prdhcp.c32
32	%%DATADIR%%/pwd.c32	43	%%DATADIR%%/pwd.c32
33	%%DATADIR%%/pxechn.c32	44	%%DATADIR%%/pxechn.c32
34	%%DATADIR%%/pxelinux.0	45	%%DATADIR%%/pxelinux.0
35	%%DATADIR%%/reboot.c32	46	%%DATADIR%%/reboot.c32
		47	%%DATADIR%%/rosh.c32
36	%%DATADIR%%/sanboot.c32	48	%%DATADIR%%/sanboot.c32
37	%%DATADIR%%/sdi.c32	49	%%DATADIR%%/sdi.c32
		50	%%DATADIR%%/sysdump.c32
38	%%DATADIR%%/vesainfo.c32	51	%%DATADIR%%/vesainfo.c32
39	%%DATADIR%%/vesamenu.c32	52	%%DATADIR%%/vesamenu.c32
40	%%DATADIR%%/vpdtest.c32	53	%%DATADIR%%/vpdtest.c32