Date: Sat, 8 Feb 2014 11:15:36 GMT From: Olli Hauer <ohauer@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Cc: gk.freebsd@googlemail.com Subject: ports/186559: [patch] net/gpxe fix gpxe.iso building Message-ID: <201402081115.s18BFa4k031415@freefall.freebsd.org> Resent-Message-ID: <201402081120.s18BK0CQ031526@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 186559 >Category: ports >Synopsis: [patch] net/gpxe fix gpxe.iso building >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Feb 08 11:20:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: ohauer >Release: >Organization: >Environment: >Description: Even the path to isolinux.bin is corrected the file has wrong permission (444) to create the gpxe.iso. As workaround install isolinux.bin with mode 644 into $WRKSRC and adjust the path in arch/i386/Makefile Additional support staging patch: http://people.freebsd.org/~ohauer/diffs/gpxe.diff >How-To-Repeat: >Fix: --- gpxe.diff begins here --- Index: gpxe/Makefile =================================================================== --- gpxe/Makefile (revision 343314) +++ gpxe/Makefile (working copy) @@ -9,15 +9,13 @@ http://slackware.cs.utah.edu/pub/kernel.org/pub/software/utils/boot/gpxe/ MAINTAINER= gk.freebsd@googlemail.com -COMMENT= Create an open-source PXE implementation and bootloader +COMMENT= Open Source (GPL) gPXE network bootloader -BROKEN= Fails to build - LICENSE= GPLv2 -BUILD_DEPENDS= syslinux:${PORTSDIR}/sysutils/syslinux +BUILD_DEPENDS= syslinux:${PORTSDIR}/sysutils/syslinux \ + mkisofs:${PORTSDIR}/sysutils/cdrtools -USE_CDRTOOLS= yes USES= gmake perl5 WRKSRC= ${WRKDIR}/${DISTNAME}/src @@ -28,7 +26,6 @@ SUB_FILES= pkg-message -NO_STAGE= yes .include <bsd.port.options.mk> ONLY_FOR_ARCHS= amd64 i386 @@ -38,16 +35,17 @@ MAKE_ARGS+= ARCH=i386 .endif +ISOLINUX_BIN= ${LOCALBASE}/share/syslinux/bios/core/isolinux.bin + post-patch: - @${REINPLACE_CMD} "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/arch/i386/Makefile + @${REINPLACE_CMD} "s|%%WRKSRC%%|${WRKSRC}|" ${WRKSRC}/arch/i386/Makefile +# ISO creation fails if isolinux.bin is read only + ${INSTALL} -m 644 ${ISOLINUX_BIN} ${WRKSRC} do-install: - @${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/src/bin/gpxe.dsk ${DATADIR} - ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/src/bin/gpxe.usb ${DATADIR} - ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/src/bin/gpxe.iso ${DATADIR} + @${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/src/bin/gpxe.dsk ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/src/bin/gpxe.usb ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/src/bin/gpxe.iso ${STAGEDIR}${DATADIR} -post-install: - @${CAT} ${PKGMESSAGE} - .include <bsd.port.mk> Index: gpxe/files/patch-arch__i386__Makefile =================================================================== --- gpxe/files/patch-arch__i386__Makefile (revision 343314) +++ gpxe/files/patch-arch__i386__Makefile (working copy) @@ -1,12 +1,12 @@ --- ./arch/i386/Makefile.orig 2010-06-29 21:31:33.000000000 +0200 -+++ ./arch/i386/Makefile 2010-08-07 16:06:23.000000000 +0200 -@@ -72,7 +72,8 @@ ++++ ./arch/i386/Makefile 2014-02-08 11:45:50.000000000 +0100 +@@ -71,8 +71,7 @@ + # ISOLINUX_BIN_LIST := \ $(ISOLINUX_BIN) \ - /usr/lib/syslinux/isolinux.bin \ +- /usr/lib/syslinux/isolinux.bin \ - /usr/share/syslinux/isolinux.bin -+ %%PREFIX%%/share/syslinux/isolinux.bin \ -+ %%PREFIX%%/share/syslinux/isolinux.bin ++ %%WRKSRC%%/isolinux.bin ISOLINUX_BIN = $(firstword $(wildcard $(ISOLINUX_BIN_LIST))) # i386-specific directories containing source files --- gpxe.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402081115.s18BFa4k031415>