Page MenuHomeFreeBSD
Files F149510202

D25213.diff
No OneTemporary
Actions

D25213.diff
View Options

Index: head/net/ipxe/Makefile
===================================================================
--- head/net/ipxe/Makefile
+++ head/net/ipxe/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= ipxe
-DISTVERSION= 20200314
+DISTVERSION= 20200610
CATEGORIES= net
MAINTAINER= tobik@FreeBSD.org
@@ -17,7 +17,7 @@
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 @@
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 @@
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-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 <bsd.port.post.mk>
Index: head/net/ipxe/distinfo
===================================================================
--- head/net/ipxe/distinfo
+++ head/net/ipxe/distinfo
@@ -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
Index: head/net/ipxe/files/pkg-message.in
===================================================================
--- head/net/ipxe/files/pkg-message.in
+++ head/net/ipxe/files/pkg-message.in
@@ -3,14 +3,17 @@
message: <<EOD
The following files have been installed in %%DATADIR%%:
- ipxe.dsk for creating a bootable floppy disk
-- ipxe.efi-i386 for loading from EFI on i386 systems
-- ipxe.efi-x86_64 for loading from EFI on x86_64 systems
+- ipxe.efi-* for loading from EFI
+- ipxe.efi-*.usb for creating a bootable EFI USB key
- ipxe.iso for creating a bootable CD
- 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
+- snponly.efi-* similar to undionly, but uses SNP/NII, should
+ only find and boot the specific NIC device it was chained from
+- snp.efi-* same as snponly but tries to boot all devices
- {8086100f,808610d3,10222000,15ad07b0}.rom for replacing the
VMware PXE ROM. See http://ipxe.org/howto/vmware for more
information.

File Metadata

Mime Type
text/plain
Expires
Wed, Mar 25, 10:52 PM (21 h, 16 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30350359
Default Alt Text
D25213.diff (3 KB)

Event Timeline