gentoo auto-resync : 18:06:2023 - 07:47:30

4 files changed, 154 insertions, 20 deletions

diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index 5a0a724e5cb0..61be12565462 100644
--- a/sys-firmware/Manifest.gz
+++ b/sys-firmware/Manifest.gz
diff --git a/sys-firmware/ipxe/Manifest b/sys-firmware/ipxe/Manifest
index 2dae24041586..1b96b45c9709 100644
--- a/sys-firmware/ipxe/Manifest
+++ b/sys-firmware/ipxe/Manifest
@@ -1,4 +1,7 @@
 DIST ipxe-1.21.1-bin.tar.xz 1860424 BLAKE2B 9d621c92be1058389758f885a02b601169d645335bba366a18d16326a7616345e44eb0cd5007d32ac034e7e3c8f8eecd90ade3346e34ca0df899622321f38017 SHA512 85afacfb70e562a935380b7d14ab7328e418478a6f6124eaec7cd0fefb9ba13b8a3f04833fab7b724ceb4c94897a7be2c67faa8be59373719a972ad51e6a5ab3
 DIST ipxe-1.21.1.tar.gz 3934045 BLAKE2B 03871b5f89c6228a9082bb89c7b102d85e5f3afcd5fe0d93762e220fe162c9c3037a9918f30251fd103835d949335f99109a12559f560a5b686e65a7c24c6501 SHA512 47400975110ed4ab95835aa1b7c8d5a6917c19c5713c6ab88bc0741a3adcd62245a9c4251d1f46fffc45289c6b18bf893f86dbc3b67d3189c41b7f198367ecaa
+DIST ipxe-1.21.1_p20230601-bin.tar.xz 2248076 BLAKE2B aac91488a4df65548b857980283fc66b3d6d245e400a8dc1115be1708439d09aafb9d6fe93366feafa889035bdfb13edd15be34bf47aa52b75f14f75a1956618 SHA512 2dbcc5b6bf764f9fecf0fd18e304d4ac21ae081a590ceda710a2984e2cd500cff3f26f36d4abb15f806ee64f11ee1b1eb299e6e184f54d85ce74843918a4f02a
+DIST ipxe-1.21.1_p20230601.gh.tar.gz 4137586 BLAKE2B 51d8e0f5c95e77707d934a0d8c16104c0d7c500ca33f408c2d94b77244d4b198e7a4b40ee091eb059a55bc0f780572bee8d3556de28f9fdae498206c24139276 SHA512 3fbb803bd679adbeb805c7d3a8ac952e14ff41fdbb7b0c30d8ccb196e39da346faf4c3e2588466bc82400b9f113f08aa8a8056d4ed2393d1aa0fee0d22b67111
 EBUILD ipxe-1.21.1.ebuild 2706 BLAKE2B 740826574d5b726b8a8e85887e81e796458845ac2ab74a1e071be8c798caf88371a8ef16d3c5db3301752d62903a9ea26c3ef655c9fd772963725b7a1d036075 SHA512 606f6e8f18cf37db8dd773eea0c7cede8e1664361d6d511e5ef9741995fdb43cf53b4e8f8ceb7c3c8c189744ecfb4eb636e7f0158ce0db759dff55a01c6d477d
-MISC metadata.xml 997 BLAKE2B a4ff20bc2a59d422b6ed064cb5cea19c7bbfd93dbecb7ea6e4f3c87f244e3a5be11a5fd57e97fd47b701f808b35f9925378d85215d7216fdd916e5f8f0634eb9 SHA512 2850061b8c4674bba56e77f607fedd4954a8d759841260ce6cbf95129996fd0db4c0411e8b1d2d59b90cc29c7e91e172d79d5c91aa814e7657b484b7fe728e83
+EBUILD ipxe-1.21.1_p20230601.ebuild 3223 BLAKE2B 6eaa3a3ea3e4b4ecd644fc936bf0c77f24da5ed68b167b9b8acaeb317c3bef048e2765437a808e04744c88c28fb0378471153b7086702c6a73f516ede785e222 SHA512 37eedc574f89e810538c728493b35a3e6c70905567e33378557bf57ef90fe26a012c610578cde9bf1993facdb513da0b95e348d595b2632acb0b3ec8dbb87507
+MISC metadata.xml 1163 BLAKE2B 6cf9984068bb88e8c7ce87d96097829cd1b4af5b007388a187738dd86de9a1f65d08cf92edde08c292bf81b144252624f18a610a2699c9fd06994ed99e736801 SHA512 1cc437b096442f8bcbf8122479e13f2cdff1e9b71b4299ee8491df7a668a36ce0830ed0895b19f24728a49568cc3921c87d6008b180f807742dadea86f57e8d2
diff --git a/sys-firmware/ipxe/ipxe-1.21.1_p20230601.ebuild b/sys-firmware/ipxe/ipxe-1.21.1_p20230601.ebuild
new file mode 100644
index 000000000000..8123927dca19
--- /dev/null
+++ b/sys-firmware/ipxe/ipxe-1.21.1_p20230601.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit savedconfig toolchain-funcs
+
+# for 1.21.1_p20230601
+COMMIT_SHA1="4fa4052c7ebb59e4d4aa396f1563c89118623ec7"
+
+DESCRIPTION="Open source network boot (PXE) firmware"
+HOMEPAGE="https://ipxe.org/"
+SRC_URI="
+	!binary? ( https://github.com/${PN}/${PN}/archive/${COMMIT_SHA1}.tar.gz -> ${P}.gh.tar.gz )
+	binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-bin.tar.xz )"
+S="${WORKDIR}/${PN}-${COMMIT_SHA1}/src"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv x86"
+IUSE="+binary efi efi64 ipv6 iso lkrn +qemu undi usb vmware"
+REQUIRED_USE="!amd64? ( !x86? ( binary ) )"
+
+SOURCE_DEPEND="
+	app-arch/xz-utils
+	dev-lang/perl
+	iso? (
+		app-cdr/cdrtools
+		sys-boot/syslinux
+	)"
+BDEPEND="
+	!binary? (
+		amd64? ( ${SOURCE_DEPEND} )
+		x86? ( ${SOURCE_DEPEND} )
+	)"
+
+src_configure() {
+	use binary && return
+
+	cat > config/local/general.h <<-EOF || die
+		#undef BANNER_TIMEOUT
+		#define BANNER_TIMEOUT 0
+	EOF
+
+	if use ipv6; then
+		cat >> config/local/general.h <<-EOF || die
+			#define NET_PROTO_IPV6
+		EOF
+	fi
+
+	if use vmware; then
+		cat >> config/local/general.h <<-EOF || die
+			#define VMWARE_SETTINGS
+			#define CONSOLE_VMWARE
+		EOF
+	fi
+
+	restore_config config/local/general.h
+
+	tc-ld-disable-gold
+}
+
+ipxemake() {
+	# Q='' makes the build verbose since that's what everyone loves now
+	emake Q='' \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getLD)" \
+		AS="$(tc-getAS)" \
+		AR="$(tc-getAR)" \
+		NM="$(tc-getNM)" \
+		OBJCOPY="$(tc-getOBJCOPY)" \
+		RANLIB="$(tc-getRANLIB)" \
+		OBJDUMP="$(tc-getOBJDUMP)" \
+		HOST_CC="$(tc-getBUILD_CC)" \
+		"$@"
+}
+
+src_compile() {
+	use binary && return
+
+	export NO_WERROR=1
+	if use qemu; then
+		ipxemake bin/808610de.rom # pxe-e1000.rom (old)
+		ipxemake bin/8086100e.rom # pxe-e1000.rom
+		ipxemake bin/80861209.rom # pxe-eepro100.rom
+		ipxemake bin/10500940.rom # pxe-ne2k_pci.rom
+		ipxemake bin/10222000.rom # pxe-pcnet.rom
+		ipxemake bin/10ec8139.rom # pxe-rtl8139.rom
+		ipxemake bin/1af41000.rom # pxe-virtio.rom
+	fi
+
+	if use vmware; then
+		ipxemake bin/8086100f.mrom # e1000
+		ipxemake bin/808610d3.mrom # e1000e
+		ipxemake bin/10222000.mrom # vlance
+		ipxemake bin/15ad07b0.rom # vmxnet3
+	fi
+
+	use efi && ipxemake PLATFORM=efi BIN=bin-i386-efi bin-i386-efi/ipxe.efi
+	use efi64 && ipxemake PLATFORM=efi BIN=bin-x86_64-efi bin-x86_64-efi/ipxe.efi
+	use iso && ipxemake bin/ipxe.iso
+	use undi && ipxemake bin/undionly.kpxe
+	use usb && ipxemake bin/ipxe.usb
+	use lkrn && ipxemake bin/ipxe.lkrn
+}
+
+src_install() {
+	insinto /usr/share/ipxe/
+
+	if use qemu || use vmware; then
+		doins bin/*.rom
+	fi
+	use vmware && doins bin/*.mrom
+	use efi && newins bin-i386-efi/ipxe.efi ipxe-i386.efi
+	use efi64 && newins bin-x86_64-efi/ipxe.efi ipxe-x86_64.efi
+	# Add a symlink for backwards compatiblity, in case both variants are
+	# enabled the x86_64 bit variant takes presedence.
+	use efi && dosym ipxe-i386.efi /usr/share/ipxe/ipxe.efi
+	use efi64 && dosym ipxe-x86_64.efi /usr/share/ipxe/ipxe.efi
+
+	use iso && doins bin/*.iso
+	use undi && doins bin/*.kpxe
+	use usb && doins bin/*.usb
+	use lkrn && doins bin/*.lkrn
+
+	save_config config/local/general.h
+}
diff --git a/sys-firmware/ipxe/metadata.xml b/sys-firmware/ipxe/metadata.xml
index 8f1848c208ca..11d78499e871 100644
--- a/sys-firmware/ipxe/metadata.xml
+++ b/sys-firmware/ipxe/metadata.xml
@@ -1,23 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>tamiko@gentoo.org</email>
-	<name>Matthias Maier</name>
-</maintainer>
-<maintainer type="project">
-	<email>virtualization@gentoo.org</email>
-	<name>Gentoo Virtualization Project</name>
-</maintainer>
-<use>
-	<flag name="binary">Use pre-built binaries</flag>
-	<flag name="efi">Build an EFI program for using PXE</flag>
-	<flag name="iso">Build a bootable ISO for using PXE</flag>
-	<flag name="lkrn">Build a linux kernel bootable file for using with grub/etc...</flag>
-	<flag name="usb">Build a bootable USB image for using PXE</flag>
-	<flag name="undi">Build a Universal Network Device Interface driver
-		chainloading your existing PXE NIC into iPXE</flag>
-	<flag name="qemu">Build the required PXE ROM images for <pkg>app-emulation/qemu</pkg></flag>
-	<flag name="vmware">Build the PXE ROM images that VMWare uses</flag>
-</use>
+	<maintainer type="person">
+		<email>tamiko@gentoo.org</email>
+		<name>Matthias Maier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>virtualization@gentoo.org</email>
+		<name>Gentoo Virtualization Project</name>
+	</maintainer>
+	<use>
+		<flag name="binary">Use pre-built binaries</flag>
+		<flag name="efi">Build a 32bit EFI program for using PXE</flag>
+		<flag name="efi64">Build a 64bit EFI program for using PXE</flag>
+		<flag name="iso">Build a bootable ISO for using PXE</flag>
+		<flag name="lkrn">Build a linux kernel bootable file for using with grub/etc...</flag>
+		<flag name="usb">Build a bootable USB image for using PXE</flag>
+		<flag name="undi">Build a Universal Network Device Interface driver
+			chainloading your existing PXE NIC into iPXE</flag>
+		<flag name="qemu">Build the required PXE ROM images for <pkg>app-emulation/qemu</pkg></flag>
+		<flag name="vmware">Build the PXE ROM images that VMWare uses</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">ipxe/ipxe</remote-id>
+	</upstream>
 </pkgmetadata>