Attachment 148714 Details for Bug 194642 – syslinux603.patch

[patch] syslinux603.patch

syslinux603.patch (text/plain), 5.52 KB, created by Uffe Jakobsen on 2014-10-27 21:07:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Uffe Jakobsen

Created: 2014-10-27 21:07:57 UTC

Size: 5.52 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 371606)
>+++ Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	syslinux
>-PORTVERSION=	6.02
>-PORTREVISION=	1
>+PORTVERSION=	6.03
> CATEGORIES=	sysutils
> MASTER_SITES=	KERNEL_ORG/linux/utils/boot/syslinux
> 
>@@ -35,11 +34,11 @@
> 		's|^UMAKEDEPS|#UMAKEDEPS|' ${WRKSRC}/mk/syslinux.mk
> 
> do-install:
>-	@${INSTALL_PROGRAM} ${WRKSRC}/bios/mtools/syslinux ${STAGEDIR}${PREFIX}/bin
>-	@${INSTALL_MAN} ${WRKSRC}/man/syslinux.1 ${STAGEDIR}${MANPREFIX}/man/man1
>-	@${FIND} -d ${WRKSRC} -type d -empty -delete
>-	@${MKDIR} ${STAGEDIR}${DATADIR}
>-	@(cd ${WRKSRC} && ${COPYTREE_SHARE} "bios efi32 efi64" ${STAGEDIR}${DATADIR})
>-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/share/syslinux/bios/mtools/syslinux
>+	${STRIP_CMD} ${WRKSRC}/bios/mtools/syslinux
>+	${INSTALL_PROGRAM} ${WRKSRC}/bios/mtools/syslinux ${STAGEDIR}${PREFIX}/bin
>+	${INSTALL_MAN} ${WRKSRC}/man/syslinux.1 ${STAGEDIR}${MANPREFIX}/man/man1
>+	${FIND} -d ${WRKSRC} -type d -empty -delete
>+	${MKDIR} ${STAGEDIR}${DATADIR}
>+	(cd ${WRKSRC} && ${COPYTREE_SHARE} "bios efi32 efi64" ${STAGEDIR}${DATADIR})
> 
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 371606)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (syslinux-6.02.tar.xz) = afa31b7cbf72e1c0c1752a0636ba724ce01c0e374366e46e61db6862b4685478
>-SIZE (syslinux-6.02.tar.xz) = 6471080
>+SHA256 (syslinux-6.03.tar.xz) = 26d3986d2bea109d5dc0e4f8c4822a459276cf021125e8c9f23c3cca5d8c850e
>+SIZE (syslinux-6.03.tar.xz) = 6855224
>Index: files/patch-Makefile
>===================================================================
>--- files/patch-Makefile	(revision 371606)
>+++ files/patch-Makefile	(working copy)
>@@ -1,12 +1,12 @@
>---- Makefile.orig	2011-04-18 23:24:17.000000000 +0200
>-+++ Makefile	2011-05-05 15:51:44.356358227 +0200
>-@@ -170,19 +170,19 @@
>+--- Makefile.orig	2014-10-06 18:27:44.000000000 +0200
>++++ Makefile	2014-10-21 22:59:36.000000000 +0200
>+@@ -185,19 +185,20 @@
>  
>  else
>  
>--BSUBDIRS = codepage com32 lzo core memdisk mbr memdump gpxe sample \
>+-BSUBDIRS = codepage com32 lzo core memdisk mbr gpxe sample \
> -	   diag libinstaller dos win32 win64 dosutil txt
>-+#BSUBDIRS = codepage com32 lzo core memdisk mbr memdump gpxe sample \
>++#BSUBDIRS = codepage com32 lzo core memdisk mbr gpxe sample \
> +#	   diag libinstaller dos win32 win64 dosutil txt
>  
>  ITARGET  =
>@@ -14,7 +14,8 @@
>  	utils/gethostip utils/isohybrid utils/mkdiskimage \
>  	mtools/syslinux linux/syslinux extlinux/extlinux
> -ISUBDIRS = libinstaller mtools linux extlinux utils
>-+ISUBDIRS = libinstaller mtools # linux extlinux utils
>++#ISUBDIRS = libinstaller mtools linux extlinux utils
>++ISUBDIRS = libinstaller mtools
>  
>  # Things to install in /usr/bin
>  INSTALL_BIN   =	mtools/syslinux
>Index: files/patch-libinstaller-syslinux.h
>===================================================================
>--- files/patch-libinstaller-syslinux.h	(revision 371606)
>+++ files/patch-libinstaller-syslinux.h	(working copy)
>@@ -1,37 +1,39 @@
>---- libinstaller/syslinux.h.orig	2013-10-13 19:59:03.000000000 +0200
>-+++ libinstaller/syslinux.h	2014-09-29 05:30:55.000000000 +0200
>-@@ -13,20 +13,21 @@
>+--- libinstaller/syslinux.h.orig	2014-10-06 18:27:44.000000000 +0200
>++++ libinstaller/syslinux.h	2014-10-21 23:58:17.000000000 +0200
>+@@ -13,6 +13,7 @@
>  #ifndef SYSLINUX_H
>  #define SYSLINUX_H
>  
>-+#include <sys/types.h>
>++#include <unistd.h>
>  #include <inttypes.h>
>  #include "advconst.h"
>  #include "setadv.h"
>+@@ -26,15 +27,15 @@
>+ #endif
>  
>  /* The standard boot sector and ldlinux image */
> -extern unsigned char syslinux_bootsect[];
>-+extern unsigned char *syslinux_bootsect;
>++extern unsigned char* syslinux_bootsect;
>  extern const unsigned int syslinux_bootsect_len;
>  extern const int syslinux_bootsect_mtime;
>  
>--extern unsigned char syslinux_ldlinux[];
>+-extern unsigned char _slimg syslinux_ldlinux[];
> -extern const unsigned int syslinux_ldlinux_len;
>-+extern unsigned char *syslinux_ldlinux;
>++extern unsigned char* _slimg syslinux_ldlinux;
> +extern unsigned int syslinux_ldlinux_len;
>  extern const int syslinux_ldlinux_mtime;
>  
>--extern unsigned char syslinux_ldlinuxc32[];
>-+extern unsigned char *syslinux_ldlinuxc32;
>+-extern unsigned char _slimg syslinux_ldlinuxc32[];
>++extern unsigned char* _slimg syslinux_ldlinuxc32;
>  extern const unsigned int syslinux_ldlinuxc32_len;
>-
>+ 
>  #define boot_sector	syslinux_bootsect
>-@@ -34,7 +35,7 @@
>+@@ -42,7 +43,7 @@
>  #define boot_image	syslinux_ldlinux
>  #define boot_image_len	syslinux_ldlinux_len
>  
> -extern unsigned char syslinux_mbr[];
>-+extern unsigned char *syslinux_mbr;
>++extern unsigned char* syslinux_mbr;
>  extern const unsigned int syslinux_mbr_len;
>  extern const int syslinux_mbr_mtime;
>  
>Index: files/patch-libinstaller-syslxopt.c
>===================================================================
>--- files/patch-libinstaller-syslxopt.c	(revision 371606)
>+++ files/patch-libinstaller-syslxopt.c	(working copy)
>@@ -1,5 +1,5 @@
>---- libinstaller/syslxopt.c.orig	2010-10-20 21:25:38.000000000 +0200
>-+++ libinstaller/syslxopt.c	2010-11-16 15:09:16.897550744 +0100
>+--- libinstaller/syslxopt.c.orig	2014-10-06 18:27:44.000000000 +0200
>++++ libinstaller/syslxopt.c	2014-10-21 23:25:13.000000000 +0200
> @@ -45,6 +45,8 @@
>      .activate_partition = 0,
>      .force = 0,
>@@ -24,7 +24,7 @@
>      {"device", 1, NULL, OPT_DEVICE},
> +    {"verbose", 0, NULL, 'v' },
> +    {"bimage", 1, NULL, 'b' },
>-     {0, 0, 0, 0}
>+     {NULL, 0, NULL, 0}
>  };
>  
> -const char short_options[] = "t:fid:UuzsS:H:rvho:OM:ma";

Actions: View | Diff

Attachments on bug 194642: 148714 | 148715 | 148716 | 148717