diff options
| author | tobik <tobik@FreeBSD.org> | 2018-06-10 18:02:55 +0800 |
|---|---|---|
| committer | tobik <tobik@FreeBSD.org> | 2018-06-10 18:02:55 +0800 |
| commit | ee1aa0d011e54856cd81145d14b32ed1c3810bb0 (patch) | |
| tree | e4ce308e467f84cb9b2b91eade926d7fa0ddba12 | |
| parent | fead73ec66c008760c39622a5598c79b9dfaeef3 (diff) | |
| download | freebsd-ports-gnome-ee1aa0d011e54856cd81145d14b32ed1c3810bb0.tar.gz freebsd-ports-gnome-ee1aa0d011e54856cd81145d14b32ed1c3810bb0.tar.zst freebsd-ports-gnome-ee1aa0d011e54856cd81145d14b32ed1c3810bb0.zip | |
net/ipxe: Update to latest commit
Pull in gcsplit from sysutils/coreutils when users try to embed
certificates via CERT= in MAKE_ARGS. This currently fails because
iPXE expects csplit to behave like GNU csplit and uses constructs
that our csplit does not support.
PR: 228835
Submitted by: Chad Jacob Milios <milios@ccsys.com> (based on)
| -rw-r--r-- | net/ipxe/Makefile | 17 | ||||
| -rw-r--r-- | net/ipxe/distinfo | 6 |
2 files changed, 15 insertions, 8 deletions
diff --git a/net/ipxe/Makefile b/net/ipxe/Makefile index 01c94d727e07..219991e5e7a1 100644 --- a/net/ipxe/Makefile +++ b/net/ipxe/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= ipxe -PORTVERSION= 20180220 -PORTREVISION= 2 +PORTVERSION= 20180514 CATEGORIES= net MAINTAINER= tobik@FreeBSD.org @@ -26,7 +25,7 @@ USE_GITHUB= yes # A: iPXE uses a rolling release model, in which every commit is intended # to be production-ready. You should always use the latest code. # -GH_TAGNAME= 47849be3a900c546cf92066849be0806f4e611d9 +GH_TAGNAME= e7f67d5a4c6e9f06aa7a9db1b4245f5e16f00bb2 USE_PERL5= build ALL_TARGET= bin/ipxe.dsk bin/ipxe.lkrn bin/ipxe.pxe bin/ipxe.usb bin/undionly.kpxe @@ -64,8 +63,8 @@ _IPXE_BUILDCFG= branding:PRODUCT_NAME="${PKGNAME} (${OPSYS} ${OSREL}/${ARCH})" \ general:PING_CMD \ general:POWEROFF_CMD -OPTIONS_DEFAULT= ISO EFI -OPTIONS_DEFINE= ISO EFI +OPTIONS_DEFAULT= ISO EFI +OPTIONS_DEFINE= ISO EFI EFI_DESC= Create EFI image ISO_DESC= Create bootable CD image @@ -88,6 +87,14 @@ ISO_MAKE_ARGS= ISOLINUX_BIN="${WRKSRC}/isolinux.bin" \ # been processed as they might want to overwrite some settings. _IPXE_BUILDCFG+= ${IPXE_BUILDCFG} +# XXX: iPXE uses csplit when embedding certificates and assumes +# it's GNU csplit, so give it what it wants as a workaround if +# CERT=... is in {IPXE_,}MAKE_ARGS. +.if ${MAKE_ARGS:MCERT=*} +BUILD_DEPENDS+= gcsplit:sysutils/coreutils +MAKE_ARGS+= CSPLIT=gcsplit +.endif + do-configure: .for _cat _opt in ${_IPXE_BUILDCFG:C/\:/ /} @${ECHO_CMD} '#undef ${_opt:S/^!//:C/(.*)=(.*)/\1/}' >> ${WRKSRC}/config/local/${_cat}.h diff --git a/net/ipxe/distinfo b/net/ipxe/distinfo index 407f383985bc..d77560c1149e 100644 --- a/net/ipxe/distinfo +++ b/net/ipxe/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1519713504 -SHA256 (ipxe-ipxe-20180220-47849be3a900c546cf92066849be0806f4e611d9_GH0.tar.gz) = 00c5e40965af555009fc29d7b640e3cecddd25ca2e930a2dcaa0e2bd366a36c1 -SIZE (ipxe-ipxe-20180220-47849be3a900c546cf92066849be0806f4e611d9_GH0.tar.gz) = 3769882 +TIMESTAMP = 1528487574 +SHA256 (ipxe-ipxe-20180514-e7f67d5a4c6e9f06aa7a9db1b4245f5e16f00bb2_GH0.tar.gz) = 35cf8a645a151bb346a4d43df2b44e7aad4e28a5f76556800d657813c5960145 +SIZE (ipxe-ipxe-20180514-e7f67d5a4c6e9f06aa7a9db1b4245f5e16f00bb2_GH0.tar.gz) = 3782601 |