From owner-svn-ports-head@freebsd.org Sat Jun 13 16:47:10 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 323A033D067; Sat, 13 Jun 2020 16:47:10 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49kk5p0YHtz4GDC; Sat, 13 Jun 2020 16:47:10 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0E1B21E4B1; Sat, 13 Jun 2020 16:47:10 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05DGl9Xw094215; Sat, 13 Jun 2020 16:47:09 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05DGl9eS094213; Sat, 13 Jun 2020 16:47:09 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <202006131647.05DGl9eS094213@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Sat, 13 Jun 2020 16:47:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r538683 - in head/net/ipxe: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in head/net/ipxe: . files X-SVN-Commit-Revision: 538683 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Jun 2020 16:47:10 -0000 Author: tobik Date: Sat Jun 13 16:47:09 2020 New Revision: 538683 URL: https://svnweb.freebsd.org/changeset/ports/538683 Log: net/ipxe: Update to latest commit - Build more EFI images [1] Changes: https://github.com/ipxe/ipxe/compare/bdf0e029ae8c9a0e173d5988ee64ff910538af53...9ee70fb95bc266885ff88be228b044a2bb226eeb Submitted by: skozlov (based on) [1] Differential Revision: https://reviews.freebsd.org/D25213 Modified: head/net/ipxe/Makefile head/net/ipxe/distinfo head/net/ipxe/files/pkg-message.in Modified: head/net/ipxe/Makefile ============================================================================== --- head/net/ipxe/Makefile Sat Jun 13 16:28:17 2020 (r538682) +++ head/net/ipxe/Makefile Sat Jun 13 16:47:09 2020 (r538683) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= ipxe -DISTVERSION= 20200314 +DISTVERSION= 20200610 CATEGORIES= net MAINTAINER= tobik@FreeBSD.org @@ -17,7 +17,7 @@ USES= gmake perl5 shebangfix USE_BINUTILS= yes USE_GCC= yes USE_GITHUB= yes -GH_TAGNAME= bdf0e029ae8c9a0e173d5988ee64ff910538af53 +GH_TAGNAME= 9ee70fb95bc266885ff88be228b044a2bb226eeb USE_PERL5= build SHEBANG_FILES= util/geniso util/gensdsk MAKE_ARGS= AR=${AR} \ @@ -62,12 +62,18 @@ _IPXE_BUILDCFG= branding:PRODUCT_NAME="${PKGNAME} (${O OPTIONS_DEFINE= EFI ISO OPTIONS_DEFAULT= EFI ISO -EFI_DESC= Create EFI image +EFI_DESC= Create EFI images ISO_DESC= Create bootable CD image +EFI_BUILD_DEPENDS= bash:shells/bash \ + mformat:emulators/mtools _EFI_ARCHS= ${ARCH:Mamd64:S/amd64/x86_64/} i386 +_EFI_TARGETS= ipxe snp snponly .for _arch in ${_EFI_ARCHS} -EFI_PLIST_FILES+= ${DATADIR}/ipxe.efi-${_arch} +. for _target in ${_EFI_TARGETS} +EFI_PLIST_FILES+= ${DATADIR}/${_target}.efi-${_arch} +. endfor +EFI_PLIST_FILES+= ${DATADIR}/ipxe.efi-${_arch}.usb .endfor ISO_BUILD_DEPENDS= ${LOCALBASE}/share/syslinux/bios/core/isolinux.bin:sysutils/syslinux \ @@ -105,7 +111,8 @@ pre-build-ISO-on: do-build-EFI-on: .for _arch in ${_EFI_ARCHS} - ${DO_MAKE_BUILD} ARCH=${_arch} -C ${WRKSRC} bin-${_arch}-efi/ipxe.efi + ${DO_MAKE_BUILD} ARCH=${_arch} -C ${WRKSRC} ${_EFI_TARGETS:@.target.@bin-${_arch}-efi/${.target.}.efi@} \ + bin-${_arch}-efi/ipxe.usb .endfor do-install: @@ -114,7 +121,12 @@ do-install: do-install-EFI-on: .for _arch in ${_EFI_ARCHS} - ${INSTALL_DATA} ${WRKSRC}/bin-${_arch}-efi/ipxe.efi ${STAGEDIR}${DATADIR}/ipxe.efi-${_arch} +. for _target in ${_EFI_TARGETS} + ${INSTALL_DATA} ${WRKSRC}/bin-${_arch}-efi/${_target}.efi \ + ${STAGEDIR}${DATADIR}/${_target}.efi-${_arch} +. endfor + ${INSTALL_DATA} ${WRKSRC}/bin-${_arch}-efi/ipxe.usb \ + ${STAGEDIR}${DATADIR}/ipxe.efi-${_arch}.usb .endfor .include Modified: head/net/ipxe/distinfo ============================================================================== --- head/net/ipxe/distinfo Sat Jun 13 16:28:17 2020 (r538682) +++ head/net/ipxe/distinfo Sat Jun 13 16:47:09 2020 (r538683) @@ -1,3 +1,3 @@ -TIMESTAMP = 1586364030 -SHA256 (ipxe-ipxe-20200314-bdf0e029ae8c9a0e173d5988ee64ff910538af53_GH0.tar.gz) = 95fc9d43146fe2bf3d9638585117587fc15325731234fbf6c5c7db2a511a07ba -SIZE (ipxe-ipxe-20200314-bdf0e029ae8c9a0e173d5988ee64ff910538af53_GH0.tar.gz) = 3818873 +TIMESTAMP = 1591980390 +SHA256 (ipxe-ipxe-20200610-9ee70fb95bc266885ff88be228b044a2bb226eeb_GH0.tar.gz) = 7dbc881183064b20f540c50c150749dd7be735352d0999da15e8026df1842240 +SIZE (ipxe-ipxe-20200610-9ee70fb95bc266885ff88be228b044a2bb226eeb_GH0.tar.gz) = 3889872 Modified: head/net/ipxe/files/pkg-message.in ============================================================================== --- head/net/ipxe/files/pkg-message.in Sat Jun 13 16:28:17 2020 (r538682) +++ head/net/ipxe/files/pkg-message.in Sat Jun 13 16:47:09 2020 (r538683) @@ -3,14 +3,17 @@ message: <