summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2022-12-20 18:24:39 -0500
committerMike Gilbert <floppym@gentoo.org>2022-12-20 18:25:35 -0500
commit2312b1a486f1512ad0c7c09af65739f6d8775f3c (patch)
tree6c50696016772ad5d5968cdfb2b4b48751a1aaf8
parentnet-libs/cppzmq: drop 4.6.0 (diff)
downloadgentoo-2312b1a486f1512ad0c7c09af65739f6d8775f3c.tar.gz
gentoo-2312b1a486f1512ad0c7c09af65739f6d8775f3c.tar.bz2
gentoo-2312b1a486f1512ad0c7c09af65739f6d8775f3c.zip
sys-boot/syslinux: rename keytab-lilo to keytab-syslinux
Avoids a collision with sys-boot/lilo. Closes: https://bugs.gentoo.org/887395 Signed-off-by: Mike Gilbert <floppym@gentoo.org>
-rw-r--r--sys-boot/syslinux/syslinux-6.04_pre1-r4.ebuild (renamed from sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild)3
-rw-r--r--sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild (renamed from sys-boot/syslinux/syslinux-6.04_pre1-r3.ebuild)1
-rw-r--r--sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild (renamed from sys-boot/syslinux/syslinux-6.04_pre3.ebuild)1
3 files changed, 4 insertions, 1 deletions
diff --git a/sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild b/sys-boot/syslinux/syslinux-6.04_pre1-r4.ebuild
index b0ed750f5a1e..cf6b824f1fdc 100644
--- a/sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild
+++ b/sys-boot/syslinux/syslinux-6.04_pre1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -116,5 +116,6 @@ src_install() {
# parallel install fails sometimes
einfo "loaderarch=${loaderarch}"
_emake -j1 INSTALLROOT="${D}" MANDIR=/usr/share/man bios ${loaderarch} install
+ mv "${ED}"/usr/bin/keytab-{lilo,syslinux} || die
dodoc README NEWS doc/*.txt
}
diff --git a/sys-boot/syslinux/syslinux-6.04_pre1-r3.ebuild b/sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild
index 4fba6cac1462..e4925c07622a 100644
--- a/sys-boot/syslinux/syslinux-6.04_pre1-r3.ebuild
+++ b/sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild
@@ -82,6 +82,7 @@ src_install() {
install
)
emake -j1 "${args[@]}"
+ mv "${ED}"/usr/bin/keytab-{lilo,syslinux} || die
einstalldocs
dostrip -x /usr/share/syslinux
}
diff --git a/sys-boot/syslinux/syslinux-6.04_pre3.ebuild b/sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild
index 9d2dcf602fe1..9c48e26d67c6 100644
--- a/sys-boot/syslinux/syslinux-6.04_pre3.ebuild
+++ b/sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild
@@ -99,6 +99,7 @@ src_install() {
install
)
emake -j1 "${args[@]}"
+ mv "${ED}"/usr/bin/keytab-{lilo,syslinux} || die
einstalldocs
dostrip -x /usr/share/syslinux
}