Gentoo Archives: gentoo-commits

From: Matthias Maier <tamiko@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-firmware/ipxe/
Date: Mon, 12 Feb 2018 00:01:56
Message-Id: 1518393695.c9bc5dfd490682a71cd5fa2790b0379996bba31e.tamiko@gentoo
1 commit: c9bc5dfd490682a71cd5fa2790b0379996bba31e
2 Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
3 AuthorDate: Mon Feb 12 00:00:55 2018 +0000
4 Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 12 00:01:35 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9bc5dfd
7
8 sys-firmware/ipxe: Add USE=binary
9
10 Closes: https://bugs.gentoo.org/484886
11 Package-Manager: Portage-2.3.24, Repoman-2.3.6
12
13 sys-firmware/ipxe/Manifest | 1 +
14 sys-firmware/ipxe/ipxe-1.0.0_p20180211.ebuild | 23 +++++++++++++++++------
15 sys-firmware/ipxe/metadata.xml | 1 +
16 3 files changed, 19 insertions(+), 6 deletions(-)
17
18 diff --git a/sys-firmware/ipxe/Manifest b/sys-firmware/ipxe/Manifest
19 index 301afef0a72..da4bd1fddb1 100644
20 --- a/sys-firmware/ipxe/Manifest
21 +++ b/sys-firmware/ipxe/Manifest
22 @@ -1,3 +1,4 @@
23 DIST ipxe-1.0.0_p20130925-cba22d3.tar.bz2 2240189 BLAKE2B 58717ca43ece4ffbe8f68cae2f409c4cd8f1d3c2149521c28db017d4fcd31b6122fa35b9a476d3dc865baba0d2768744f4977420fb6410f1b09dad9170c32497 SHA512 a098d3fc0f68067be281b9c3654bb1b0be1b9d397327b55b36b17e69faf03ce6117d0278552c06990a5020e4ece7acac168d975b3c7bfce3b6865dea1fd1d8dd
24 DIST ipxe-1.0.0_p20160620-694c18a.tar.bz2 2839663 BLAKE2B ec6999f3bcaf198f4b73464ee34456b923d0be26f11980e3020dd66012ddbf1b721aebb1c74c4289a0012e2ffae96a54a25821a4c7c621f727e090d13de58213 SHA512 67657dabe09f497c270cca16391669c89032112c1496b54009e2f1e8a477904d758476d4e465973aa0b6fc764be48ed6421607189aaea76e23fa0da6e9c8add5
25 +DIST ipxe-1.0.0_p20180211-546dd51-bin.tar.xz 1748228 BLAKE2B 5ed2ce71c7dbc41d5cbef6e263abd230b9831c945a8edb33a29d408bd4262e370a2f73c8d2eb3cb20e08c61ece83af1fb1bb4c5694098cb29c44628dbd18def8 SHA512 af2778c925a6e4c374ddae85f3db983c83e7a4e5bb2cf35e356d277b87d4c89bf63cc2c061ec31d608ff2160c13297232fa131da2b9dd0b580d93e1b0efd6532
26 DIST ipxe-1.0.0_p20180211-546dd51.tar.bz2 2954305 BLAKE2B 8232b1afe017ff5d0389534e4efea3209ea0330d66e4d3d429abf81da66639b19488911d85bf2da200ff8cb0d49c5dda438074c4538303335419ea080ef80a16 SHA512 45d7f80f15a1c5ff1daa31b132065d38013a51127795ad81308b468940a455edcb40cde7601475039a7c977d732817203bbc627c642d3d10146a480da603f1dd
27
28 diff --git a/sys-firmware/ipxe/ipxe-1.0.0_p20180211.ebuild b/sys-firmware/ipxe/ipxe-1.0.0_p20180211.ebuild
29 index 3af1d37ca63..1794162081a 100644
30 --- a/sys-firmware/ipxe/ipxe-1.0.0_p20180211.ebuild
31 +++ b/sys-firmware/ipxe/ipxe-1.0.0_p20180211.ebuild
32 @@ -10,27 +10,36 @@ GIT_SHORT=${GIT_REV:0:7}
33
34 DESCRIPTION="Open source network boot (PXE) firmware"
35 HOMEPAGE="http://ipxe.org/"
36 -SRC_URI="https://git.ipxe.org/ipxe.git/snapshot/${GIT_REV}.tar.bz2 -> ${P}-${GIT_SHORT}.tar.bz2"
37 +SRC_URI="
38 + !binary? ( https://git.ipxe.org/ipxe.git/snapshot/${GIT_REV}.tar.bz2 -> ${P}-${GIT_SHORT}.tar.bz2 )
39 + binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-${GIT_SHORT}-bin.tar.xz )"
40
41 LICENSE="GPL-2"
42 SLOT="0"
43 -# TODO: Add arm/arm64 once figure out how to build w/out including
44 -# all the x86-specific drivers (that use I/O insns).
45 -KEYWORDS="-* ~amd64 ~x86"
46 -IUSE="efi ipv6 iso lkrn +qemu undi usb vmware"
47 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86"
48 +IUSE="+binary efi ipv6 iso lkrn +qemu undi usb vmware"
49
50 -DEPEND="app-arch/xz-utils
51 +REQUIRED_USE="!amd64? ( !x86? ( binary ) )"
52 +
53 +SOURCE_DEPEND="app-arch/xz-utils
54 dev-lang/perl
55 sys-libs/zlib
56 iso? (
57 sys-boot/syslinux
58 virtual/cdrtools
59 )"
60 +DEPEND="
61 + !binary? (
62 + amd64? ( ${SOURCE_DEPEND} )
63 + x86? ( ${SOURCE_DEPEND} )
64 + )"
65 RDEPEND=""
66
67 S="${WORKDIR}/ipxe-${GIT_SHORT}/src"
68
69 src_configure() {
70 + use binary && return
71 +
72 cat <<-EOF > "${S}"/config/local/general.h
73 #undef BANNER_TIMEOUT
74 #define BANNER_TIMEOUT 0
75 @@ -66,6 +75,8 @@ ipxemake() {
76 }
77
78 src_compile() {
79 + use binary && return
80 +
81 export NO_WERROR=1
82 if use qemu; then
83 ipxemake bin/808610de.rom # pxe-e1000.rom (old)
84
85 diff --git a/sys-firmware/ipxe/metadata.xml b/sys-firmware/ipxe/metadata.xml
86 index 79e3a615e17..2dad71b85b7 100644
87 --- a/sys-firmware/ipxe/metadata.xml
88 +++ b/sys-firmware/ipxe/metadata.xml
89 @@ -5,6 +5,7 @@
90 <email>qemu@g.o</email>
91 </maintainer>
92 <use>
93 + <flag name="binary">Use pre-built binaries</flag>
94 <flag name="efi">Build an EFI program for using PXE</flag>
95 <flag name="iso">Build a bootable ISO for using PXE</flag>
96 <flag name="lkrn">Build a linux kernel bootable file for using with grub/etc...</flag>