| 1 |
commit: c8cb8a9930524cd70efad59529c9e1936dcb0bf3 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon May 30 20:28:26 2022 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 30 20:32:13 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8cb8a99 |
| 7 |
|
| 8 |
sys-boot/syslinux: replace efi32 and efi64 with ABI_X86 flags |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/584464 |
| 11 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 12 |
|
| 13 |
sys-boot/syslinux/metadata.xml | 3 +-- |
| 14 |
sys-boot/syslinux/syslinux-6.04_pre3.ebuild | 29 +++++++++++++++++------------ |
| 15 |
2 files changed, 18 insertions(+), 14 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-boot/syslinux/metadata.xml b/sys-boot/syslinux/metadata.xml |
| 18 |
index 22c238faa909..ca6327ed17a2 100644 |
| 19 |
--- a/sys-boot/syslinux/metadata.xml |
| 20 |
+++ b/sys-boot/syslinux/metadata.xml |
| 21 |
@@ -10,8 +10,7 @@ |
| 22 |
</maintainer> |
| 23 |
<use> |
| 24 |
<flag name="bios">Enable BIOS support</flag> |
| 25 |
- <flag name="efi32">Enable 32-bit EFI support</flag> |
| 26 |
- <flag name="efi64">Enable 64-bit EFI support</flag> |
| 27 |
+ <flag name="efi">Enable EFI support</flag> |
| 28 |
</use> |
| 29 |
<upstream> |
| 30 |
<remote-id type="cpe">cpe:/a:gentoo:syslinux</remote-id> |
| 31 |
|
| 32 |
diff --git a/sys-boot/syslinux/syslinux-6.04_pre3.ebuild b/sys-boot/syslinux/syslinux-6.04_pre3.ebuild |
| 33 |
index 14724565c3dd..0cdfd3d15c7b 100644 |
| 34 |
--- a/sys-boot/syslinux/syslinux-6.04_pre3.ebuild |
| 35 |
+++ b/sys-boot/syslinux/syslinux-6.04_pre3.ebuild |
| 36 |
@@ -13,8 +13,9 @@ SRC_URI="https://git.zytor.com/syslinux/syslinux.git/snapshot/${MY_P}.tar.gz" |
| 37 |
LICENSE="GPL-2" |
| 38 |
SLOT="0" |
| 39 |
KEYWORDS="-* ~amd64 ~x86" |
| 40 |
-IUSE="+bios efi32 efi64" |
| 41 |
-REQUIRED_USE="|| ( bios efi32 efi64 )" |
| 42 |
+IUSE="abi_x86_32 abi_x86_64 +bios +efi" |
| 43 |
+REQUIRED_USE="|| ( bios efi ) |
| 44 |
+ efi? ( || ( abi_x86_32 abi_x86_64 ) )" |
| 45 |
|
| 46 |
BDEPEND=" |
| 47 |
dev-lang/perl |
| 48 |
@@ -31,8 +32,7 @@ RDEPEND=" |
| 49 |
dev-perl/Digest-SHA1 |
| 50 |
" |
| 51 |
DEPEND="${RDEPEND} |
| 52 |
- efi32? ( sys-boot/gnu-efi[abi_x86_32(-)] ) |
| 53 |
- efi64? ( sys-boot/gnu-efi[abi_x86_64(-)] ) |
| 54 |
+ efi? ( sys-boot/gnu-efi[abi_x86_32(-)?,abi_x86_64(-)?] ) |
| 55 |
virtual/os-headers |
| 56 |
" |
| 57 |
|
| 58 |
@@ -69,21 +69,26 @@ src_compile() { |
| 59 |
if use bios; then |
| 60 |
emake bios |
| 61 |
fi |
| 62 |
- if use efi32; then |
| 63 |
- efimake x86 efi32 |
| 64 |
- fi |
| 65 |
- if use efi64; then |
| 66 |
- efimake amd64 efi64 |
| 67 |
+ if use efi; then |
| 68 |
+ if use abi_x86_32; then |
| 69 |
+ efimake x86 efi32 |
| 70 |
+ fi |
| 71 |
+ if use abi_x86_64; then |
| 72 |
+ efimake amd64 efi64 |
| 73 |
+ fi |
| 74 |
fi |
| 75 |
} |
| 76 |
|
| 77 |
src_install() { |
| 78 |
+ local firmware=( $(usev bios) ) |
| 79 |
+ if use efi; then |
| 80 |
+ use abi_x86_32 && firmware+=( efi32 ) |
| 81 |
+ use abi_x86_64 && firmware+=( efi64 ) |
| 82 |
+ fi |
| 83 |
local args=( |
| 84 |
INSTALLROOT="${ED}" |
| 85 |
MANDIR='$(DATADIR)/man' |
| 86 |
- $(usev bios) |
| 87 |
- $(usev efi32) |
| 88 |
- $(usev efi64) |
| 89 |
+ "${firmware[@]}" |
| 90 |
install |
| 91 |
) |
| 92 |
emake -j1 "${args[@]}" |
Archives