From owner-svn-ports-head@freebsd.org Wed Apr 25 15:13:49 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A8099FA89CE; Wed, 25 Apr 2018 15:13:49 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 434C67BD22; Wed, 25 Apr 2018 15:13:49 +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 3E22B2C70; Wed, 25 Apr 2018 15:13:49 +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 w3PFDn8R092947; Wed, 25 Apr 2018 15:13:49 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3PFDmV2092945; Wed, 25 Apr 2018 15:13:48 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201804251513.w3PFDmV2092945@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Wed, 25 Apr 2018 15:13:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r468280 - 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: 468280 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.25 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: Wed, 25 Apr 2018 15:13:50 -0000 Author: tobik Date: Wed Apr 25 15:13:48 2018 New Revision: 468280 URL: https://svnweb.freebsd.org/changeset/ports/468280 Log: net/ipxe: Build undionly and EFI images Submitted by: fabian.freyer@physik.tu-berlin.de Differential Revision: https://reviews.freebsd.org/D15194 Modified: head/net/ipxe/Makefile head/net/ipxe/files/pkg-message.in Modified: head/net/ipxe/Makefile ============================================================================== --- head/net/ipxe/Makefile Wed Apr 25 13:26:25 2018 (r468279) +++ head/net/ipxe/Makefile Wed Apr 25 15:13:48 2018 (r468280) @@ -3,7 +3,7 @@ PORTNAME= ipxe PORTVERSION= 20180220 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MAINTAINER= tobik@FreeBSD.org @@ -29,7 +29,7 @@ USE_GITHUB= yes GH_TAGNAME= 47849be3a900c546cf92066849be0806f4e611d9 USE_PERL5= build -ALL_TARGET= bin/ipxe.dsk bin/ipxe.lkrn bin/ipxe.pxe bin/ipxe.usb +ALL_TARGET= bin/ipxe.dsk bin/ipxe.lkrn bin/ipxe.pxe bin/ipxe.usb bin/undionly.kpxe MAKE_ARGS= HOST_CC=${CC} \ PERL=${PERL} \ CC=${CC} \ @@ -64,11 +64,17 @@ _IPXE_BUILDCFG= branding:PRODUCT_NAME="${PKGNAME} (${O general:PING_CMD \ general:POWEROFF_CMD -OPTIONS_DEFAULT= ISO -OPTIONS_DEFINE= ISO +OPTIONS_DEFAULT= ISO EFI +OPTIONS_DEFINE= ISO EFI +EFI_DESC= Create EFI image ISO_DESC= Create bootable CD image +EFI_ARCHS= i386 ${ARCH:Mamd64:S/amd64/x86_64/} +.for _arch in ${EFI_ARCHS} +EFI_PLIST_FILES+= ${DATADIR}/ipxe.efi-${_arch} +.endfor + ISO_ALL_TARGET= bin/ipxe.iso ISO_BUILD_DEPENDS= bash:shells/bash \ ${LOCALBASE}/share/syslinux/bios/core/isolinux.bin:sysutils/syslinux \ @@ -94,9 +100,19 @@ pre-build-ISO-on: # ISO creation fails if isolinux.bin is read only ${INSTALL} -m 644 ${LOCALBASE}/share/syslinux/bios/core/isolinux.bin ${WRKSRC}/isolinux.bin +do-build-EFI-on: +.for _arch in ${EFI_ARCHS} + ${DO_MAKE_BUILD} ARCH=${_arch} -C ${WRKSRC} bin-${_arch}-efi/ipxe.efi +.endfor + do-install: @${MKDIR} ${STAGEDIR}${DATADIR} cd ${WRKSRC} && ${INSTALL_DATA} ${ALL_TARGET} ${STAGEDIR}${DATADIR} + +do-install-EFI-on: +.for _arch in ${EFI_ARCHS} + ${INSTALL_DATA} ${WRKSRC}/bin-${_arch}-efi/ipxe.efi ${STAGEDIR}${DATADIR}/ipxe.efi-${_arch} +.endfor .include Modified: head/net/ipxe/files/pkg-message.in ============================================================================== --- head/net/ipxe/files/pkg-message.in Wed Apr 25 13:26:25 2018 (r468279) +++ head/net/ipxe/files/pkg-message.in Wed Apr 25 15:13:48 2018 (r468280) @@ -1,6 +1,10 @@ The following files have been installed in %%DATADIR%%: - ipxe.dsk for creating a bootable floppy disk -- ipxe.usb for creating a bootable USB key +- ipxe.efi-i386 for loading from EFI on i386 systems +- ipxe.efi-x86_64 for loading from EFI on x86_64 systems - ipxe.iso for creating a bootable CD -- ipxe.pxe for chainloading from a PXE ROM - ipxe.lkrn for any boot manager that can boot Linux kernels +- ipxe.pxe for chainloading from a PXE ROM +- ipxe.usb for creating a bootable USB key +- undionly.kpxe for chainloading from a PXE ROM; contains only + the UNDI drivers