[gentoo-commits] repo/gentoo:master commit in: sys-boot/syslinux/

[gentoo-commits] repo/gentoo:master commit in: sys-boot/syslinux/

[Chí-Thanh Christopher Nguyễn]

commit:     7b0f5202b40b4eae53ead41d333531fd30033e9c
Author:     Chí-Thanh Christopher Nguyễn <chithanh <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 24 20:11:04 2016 +0000
Commit:     Chí-Thanh Christopher Nguyễn <chithanh <AT> gentoo <DOT> org>
CommitDate: Sun Apr 24 20:11:04 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b0f5202

sys-boot/syslinux: bump to latest prerelase, add workaround for ld.gold issues.

Bug: https://bugs.gentoo.org/show_bug.cgi?id=563364

Package-Manager: portage-2.2.26

 sys-boot/syslinux/Manifest                                  |  1 +
 sys-boot/syslinux/syslinux-6.03.ebuild                      | 13 ++++++++++++-
 .../{syslinux-6.03.ebuild => syslinux-6.04_pre1.ebuild}     | 13 ++++++++++++-
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/sys-boot/syslinux/Manifest b/sys-boot/syslinux/Manifest
index 23780b3..ab76b5e 100644
--- a/sys-boot/syslinux/Manifest
+++ b/sys-boot/syslinux/Manifest
@@ -3,3 +3,4 @@ DIST syslinux-4.07.tar.bz2 5761877 SHA256 1240a4e4219b518bdaef78931b6e901befeff3
 DIST syslinux-5.10.tar.xz 5315660 SHA256 4b52d7647d5584c69764c06a836e0d524e5246bf2e94f68cf86342c415508422 SHA512 56422e14b4aa53ca1a5811da0582dbbb349aa52b9e78868bbedc24c67ef2420c4d0ac63fd68c7f0adc2c22606196276265d503b5b6f9d3d796d9ce42845bbdb5 WHIRLPOOL 77d73bdc1cd75a3ad9f58de8a9fa31a1c4247d579ac8c849e8d0dacc7cd1b9e02b2cf0737f1be1c2bc2e974f4ded3955857588a8a07d6cf35997c57f47d9b583
 DIST syslinux-6.02.tar.xz 6471080 SHA256 afa31b7cbf72e1c0c1752a0636ba724ce01c0e374366e46e61db6862b4685478 SHA512 919d165e9cba2b964cec8b015f0a4281a5f90e908f247441d6edefe289170e697b933554d12fa90e698b6d2e8b5b40fdb3b7a95d746a41c580e3a44f8859818f WHIRLPOOL 98d7552f8c66be7689166e7d7a7b5499af0a974711e7ca1f01e1538250c533ceed6d80cec0ac189ff66ea243e22ff1add62c2e3392945d4b7e1586f38c1b6a1d
 DIST syslinux-6.03.tar.xz 6855224 SHA256 26d3986d2bea109d5dc0e4f8c4822a459276cf021125e8c9f23c3cca5d8c850e SHA512 dd2b2916962b9e93bc1e714182e3ca2a727a229b8afabe913050bcfdd43ee2af51ee3acf79121d8c20caf434583efaa7f3196871e0e07c04d82191323a50fe31 WHIRLPOOL c3abf6dd84610f2265ce94ce0991e200e3f7fcf2cf2926d46c389c7235544e959ee52aef4a510258b861da2233fd38696d3164a7d0e75f0060a18cc13f23b546
+DIST syslinux-6.04-pre1.tar.xz 5283272 SHA256 3f6d50a57f3ed47d8234fd0ab4492634eb7c9aaf7dd902f33d3ac33564fd631d SHA512 7927dd39be8e2dcf4138a6fea33def67d19d938379d694f15b48fdd2f5924c028b7a9e7bd71d0c7c6630c203e9e2a54296628e530632ad5e6f55b1ebefe8fc98 WHIRLPOOL d8d3765b974122a1265ca95470379c577108a6aba755c19c1f0373f3986d117c1cfaf1f3f2a9477d2558e66f82db3de980ab12d66c721396154dea7ee1edc28a

diff --git a/sys-boot/syslinux/syslinux-6.03.ebuild b/sys-boot/syslinux/syslinux-6.03.ebuild
index 25ec57b..fe34dc6 100644
--- a/sys-boot/syslinux/syslinux-6.03.ebuild
+++ b/sys-boot/syslinux/syslinux-6.03.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -72,6 +72,17 @@ src_prepare() {
 		x86)	loaderarch="efi32" ;;
 		*)	ewarn "Unsupported architecture, building installers only." ;;
 	esac
+
+	# building with ld.gold causes problems, bug #563364
+	if tc-ld-is-gold; then
+		ewarn "Building syslinux with the gold linker may cause problems, see bug #563364"
+		if [[ -z "${I_KNOW_WHAT_I_AM_DOING}" ]]; then
+			tc-ld-disable-gold
+			ewarn "set I_KNOW_WHAT_I_AM_DOING=1 to override this."
+		else
+			ewarn "Continuing anyway as requested."
+		fi
+	fi
 }
 
 src_compile() {

diff --git a/sys-boot/syslinux/syslinux-6.03.ebuild b/sys-boot/syslinux/syslinux-6.04_pre1.ebuild
similarity index 88%
copy from sys-boot/syslinux/syslinux-6.03.ebuild
copy to sys-boot/syslinux/syslinux-6.04_pre1.ebuild
index 25ec57b..fe34dc6 100644
--- a/sys-boot/syslinux/syslinux-6.03.ebuild
+++ b/sys-boot/syslinux/syslinux-6.04_pre1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -72,6 +72,17 @@ src_prepare() {
 		x86)	loaderarch="efi32" ;;
 		*)	ewarn "Unsupported architecture, building installers only." ;;
 	esac
+
+	# building with ld.gold causes problems, bug #563364
+	if tc-ld-is-gold; then
+		ewarn "Building syslinux with the gold linker may cause problems, see bug #563364"
+		if [[ -z "${I_KNOW_WHAT_I_AM_DOING}" ]]; then
+			tc-ld-disable-gold
+			ewarn "set I_KNOW_WHAT_I_AM_DOING=1 to override this."
+		else
+			ewarn "Continuing anyway as requested."
+		fi
+	fi
 }
 
 src_compile() {

[gentoo-commits] repo/gentoo:master commit in: sys-boot/syslinux/

[Chí-Thanh Christopher Nguyễn]

commit:     ad8507f392eca220394dc70d3704ea4dcf85ba6f
Author:     Chí-Thanh Christopher Nguyễn <chithanh <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 24 20:11:51 2016 +0000
Commit:     Chí-Thanh Christopher Nguyễn <chithanh <AT> gentoo <DOT> org>
CommitDate: Sun Apr 24 20:11:51 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad8507f3

sys-boot/syslinux: remove old

Package-Manager: portage-2.2.26

 sys-boot/syslinux/Manifest             |  1 -
 sys-boot/syslinux/syslinux-6.02.ebuild | 93 ----------------------------------
 2 files changed, 94 deletions(-)

diff --git a/sys-boot/syslinux/Manifest b/sys-boot/syslinux/Manifest
index ab76b5e..14410fa 100644
--- a/sys-boot/syslinux/Manifest
+++ b/sys-boot/syslinux/Manifest
@@ -1,6 +1,5 @@
 DIST syslinux-3.86.tar.bz2 3735823 SHA256 82a8d2a242f869cb4c34b3a074871f472762343e1879a4dca23d7ce5c4dcd06d SHA512 6231f233e5f5ac26aa7e4bfd2704e2a4081350a3f3f21b5ec88a13cf992528c2796dbdfdf6cc2cc7a9543828650ae46de3685e5e55fac3a6ad520430220d1073 WHIRLPOOL 985efd16587ac3f00dc1b75563dc12e5abfeb14b42b64accdadda087f6c9a61c8f5cc149a2b9ce8dd1368d1083720340c20240a4b7d7ea3bf51ff65512d1bd3e
 DIST syslinux-4.07.tar.bz2 5761877 SHA256 1240a4e4219b518bdaef78931b6e901befeff35e6894ac6db785115848a7a05a SHA512 8efbd14803ec74c5ee699a754b4727e4b975c08afd4dbb39f4b7ccdb90743e4459cd4609c6f1065c7b7efaa26c9d465806254891795d363758f35a2fe5704ae5 WHIRLPOOL b68966ed87055a157812f36f2881b4a86797eacef1894b70c1a063327547264daa4b4ca1ea52ccb286ab86332c2163e57004d3503215497278e073b48583a9dc
 DIST syslinux-5.10.tar.xz 5315660 SHA256 4b52d7647d5584c69764c06a836e0d524e5246bf2e94f68cf86342c415508422 SHA512 56422e14b4aa53ca1a5811da0582dbbb349aa52b9e78868bbedc24c67ef2420c4d0ac63fd68c7f0adc2c22606196276265d503b5b6f9d3d796d9ce42845bbdb5 WHIRLPOOL 77d73bdc1cd75a3ad9f58de8a9fa31a1c4247d579ac8c849e8d0dacc7cd1b9e02b2cf0737f1be1c2bc2e974f4ded3955857588a8a07d6cf35997c57f47d9b583
-DIST syslinux-6.02.tar.xz 6471080 SHA256 afa31b7cbf72e1c0c1752a0636ba724ce01c0e374366e46e61db6862b4685478 SHA512 919d165e9cba2b964cec8b015f0a4281a5f90e908f247441d6edefe289170e697b933554d12fa90e698b6d2e8b5b40fdb3b7a95d746a41c580e3a44f8859818f WHIRLPOOL 98d7552f8c66be7689166e7d7a7b5499af0a974711e7ca1f01e1538250c533ceed6d80cec0ac189ff66ea243e22ff1add62c2e3392945d4b7e1586f38c1b6a1d
 DIST syslinux-6.03.tar.xz 6855224 SHA256 26d3986d2bea109d5dc0e4f8c4822a459276cf021125e8c9f23c3cca5d8c850e SHA512 dd2b2916962b9e93bc1e714182e3ca2a727a229b8afabe913050bcfdd43ee2af51ee3acf79121d8c20caf434583efaa7f3196871e0e07c04d82191323a50fe31 WHIRLPOOL c3abf6dd84610f2265ce94ce0991e200e3f7fcf2cf2926d46c389c7235544e959ee52aef4a510258b861da2233fd38696d3164a7d0e75f0060a18cc13f23b546
 DIST syslinux-6.04-pre1.tar.xz 5283272 SHA256 3f6d50a57f3ed47d8234fd0ab4492634eb7c9aaf7dd902f33d3ac33564fd631d SHA512 7927dd39be8e2dcf4138a6fea33def67d19d938379d694f15b48fdd2f5924c028b7a9e7bd71d0c7c6630c203e9e2a54296628e530632ad5e6f55b1ebefe8fc98 WHIRLPOOL d8d3765b974122a1265ca95470379c577108a6aba755c19c1f0373f3986d117c1cfaf1f3f2a9477d2558e66f82db3de980ab12d66c721396154dea7ee1edc28a

diff --git a/sys-boot/syslinux/syslinux-6.02.ebuild b/sys-boot/syslinux/syslinux-6.02.ebuild
deleted file mode 100644
index 2be6a6b..0000000
--- a/sys-boot/syslinux/syslinux-6.02.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders"
-HOMEPAGE="http://www.syslinux.org/"
-SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${P/_/-}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="custom-cflags"
-
-RDEPEND="sys-fs/mtools
-		dev-perl/Crypt-PasswdMD5
-		dev-perl/Digest-SHA1"
-DEPEND="${RDEPEND}
-	dev-lang/nasm
-	>=sys-boot/gnu-efi-3.0u
-	virtual/os-headers"
-
-S=${WORKDIR}/${P/_/-}
-
-# This ebuild is a departure from the old way of rebuilding everything in syslinux
-# This departure is necessary since hpa doesn't support the rebuilding of anything other
-# than the installers.
-
-# These are executables which come precompiled and are run by the boot loader
-QA_PREBUILT="usr/share/${PN}/*.c32"
-
-# removed all the unpack/patching stuff since we aren't rebuilding the core stuff anymore
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-add-fno-stack-protector.patch
-	rm -f gethostip #bug 137081
-
-	# Don't prestrip or override user LDFLAGS, bug #305783
-	local SYSLINUX_MAKEFILES="extlinux/Makefile linux/Makefile mtools/Makefile \
-		sample/Makefile utils/Makefile"
-	sed -i ${SYSLINUX_MAKEFILES} -e '/^LDFLAGS/d' || die "sed failed"
-
-	if use custom-cflags; then
-		sed -i ${SYSLINUX_MAKEFILES} \
-			-e 's|-g -Os||g' \
-			-e 's|-Os||g' \
-			-e 's|CFLAGS[[:space:]]\+=|CFLAGS +=|g' \
-			|| die "sed custom-cflags failed"
-	else
-		QA_FLAGS_IGNORED="
-			/sbin/extlinux
-			/usr/bin/memdiskfind
-			/usr/bin/gethostip
-			/usr/bin/isohybrid
-			/usr/bin/syslinux
-			"
-	fi
-	case ${ARCH} in
-		amd64)	loaderarch="efi64" ;;
-		x86)	loaderarch="efi32" ;;
-		*)	ewarn "Unsupported architecture, building installers only." ;;
-	esac
-}
-
-src_compile() {
-	# build system abuses the LDFLAGS variable to pass arguments to ld
-	unset LDFLAGS
-	if [[ ! -z ${loaderarch} ]]; then
-		emake CC=$(tc-getCC) LD=$(tc-getLD) ${loaderarch}
-	fi
-	emake CC=$(tc-getCC) LD=$(tc-getLD) ${loaderarch} installer
-}
-
-src_install() {
-	# parallel install fails sometimes
-	einfo "loaderarch=${loaderarch}"
-	emake -j1 LD=$(tc-getLD) INSTALLROOT="${D}" MANDIR=/usr/share/man bios ${loaderarch} install
-	dodoc README NEWS doc/*.txt
-}
-
-pkg_postinst() {
-	# print warning for users upgrading from the previous stable version
-	if has 4.06 ${REPLACING_VERSIONS}; then
-		ewarn "syslinux now uses dynamically linked ELF executables. Before you reboot,"
-		ewarn "ensure that needed dependencies are fulfilled. For example, run from your"
-		ewarn "syslinux directory:"
-		ewarn
-		ewarn "LD_LIBRARY_PATH=\".\" ldd menu.c32"
-	fi
-}

[gentoo-commits] repo/gentoo:master commit in: sys-boot/syslinux/

[Chí-Thanh Christopher Nguyễn]

commit:     2c743a1c520e5ecf2793d63a2715b0f6fe7f7287
Author:     Chí-Thanh Christopher Nguyễn <chithanh <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  9 16:11:57 2016 +0000
Commit:     Chí-Thanh Christopher Nguyễn <chithanh <AT> gentoo <DOT> org>
CommitDate: Thu Jun  9 16:12:52 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c743a1c

sys-boot/syslinux: fix quoting for toolchain functions

Bug: https://bugs.gentoo.org/show_bug.cgi?id=585186

Package-Manager: portage-2.2.28

 sys-boot/syslinux/syslinux-3.86.ebuild      | 4 ++--
 sys-boot/syslinux/syslinux-4.07.ebuild      | 4 ++--
 sys-boot/syslinux/syslinux-5.10.ebuild      | 4 ++--
 sys-boot/syslinux/syslinux-6.03.ebuild      | 6 +++---
 sys-boot/syslinux/syslinux-6.04_pre1.ebuild | 6 +++---
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/sys-boot/syslinux/syslinux-3.86.ebuild b/sys-boot/syslinux/syslinux-3.86.ebuild
index 79187cc..740c4e6 100644
--- a/sys-boot/syslinux/syslinux-3.86.ebuild
+++ b/sys-boot/syslinux/syslinux-3.86.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -47,7 +47,7 @@ src_unpack() {
 }
 
 src_compile() {
-	emake CC=$(tc-getCC) installer || die
+	emake CC="$(tc-getCC)" installer || die
 }
 
 src_install() {

diff --git a/sys-boot/syslinux/syslinux-4.07.ebuild b/sys-boot/syslinux/syslinux-4.07.ebuild
index 05495b3..8bfd278 100644
--- a/sys-boot/syslinux/syslinux-4.07.ebuild
+++ b/sys-boot/syslinux/syslinux-4.07.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -60,7 +60,7 @@ src_unpack() {
 }
 
 src_compile() {
-	emake CC=$(tc-getCC) installer || die
+	emake CC="$(tc-getCC)" installer || die
 }
 
 src_install() {

diff --git a/sys-boot/syslinux/syslinux-5.10.ebuild b/sys-boot/syslinux/syslinux-5.10.ebuild
index 90f4365..00c3a48 100644
--- a/sys-boot/syslinux/syslinux-5.10.ebuild
+++ b/sys-boot/syslinux/syslinux-5.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -63,7 +63,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake CC=$(tc-getCC) installer
+	emake CC="$(tc-getCC)" installer
 }
 
 src_install() {

diff --git a/sys-boot/syslinux/syslinux-6.03.ebuild b/sys-boot/syslinux/syslinux-6.03.ebuild
index fe34dc6..c4d25db 100644
--- a/sys-boot/syslinux/syslinux-6.03.ebuild
+++ b/sys-boot/syslinux/syslinux-6.03.ebuild
@@ -89,15 +89,15 @@ src_compile() {
 	# build system abuses the LDFLAGS variable to pass arguments to ld
 	unset LDFLAGS
 	if [[ ! -z ${loaderarch} ]]; then
-		emake CC=$(tc-getCC) LD=$(tc-getLD) ${loaderarch}
+		emake CC="$(tc-getCC)" LD="$(tc-getLD)" ${loaderarch}
 	fi
-	emake CC=$(tc-getCC) LD=$(tc-getLD) ${loaderarch} installer
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" ${loaderarch} installer
 }
 
 src_install() {
 	# parallel install fails sometimes
 	einfo "loaderarch=${loaderarch}"
-	emake -j1 LD=$(tc-getLD) INSTALLROOT="${D}" MANDIR=/usr/share/man bios ${loaderarch} install
+	emake -j1 LD="$(tc-getLD)" INSTALLROOT="${D}" MANDIR=/usr/share/man bios ${loaderarch} install
 	dodoc README NEWS doc/*.txt
 }
 

diff --git a/sys-boot/syslinux/syslinux-6.04_pre1.ebuild b/sys-boot/syslinux/syslinux-6.04_pre1.ebuild
index fe34dc6..c4d25db 100644
--- a/sys-boot/syslinux/syslinux-6.04_pre1.ebuild
+++ b/sys-boot/syslinux/syslinux-6.04_pre1.ebuild
@@ -89,15 +89,15 @@ src_compile() {
 	# build system abuses the LDFLAGS variable to pass arguments to ld
 	unset LDFLAGS
 	if [[ ! -z ${loaderarch} ]]; then
-		emake CC=$(tc-getCC) LD=$(tc-getLD) ${loaderarch}
+		emake CC="$(tc-getCC)" LD="$(tc-getLD)" ${loaderarch}
 	fi
-	emake CC=$(tc-getCC) LD=$(tc-getLD) ${loaderarch} installer
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" ${loaderarch} installer
 }
 
 src_install() {
 	# parallel install fails sometimes
 	einfo "loaderarch=${loaderarch}"
-	emake -j1 LD=$(tc-getLD) INSTALLROOT="${D}" MANDIR=/usr/share/man bios ${loaderarch} install
+	emake -j1 LD="$(tc-getLD)" INSTALLROOT="${D}" MANDIR=/usr/share/man bios ${loaderarch} install
 	dodoc README NEWS doc/*.txt
 }
 

[gentoo-commits] repo/gentoo:master commit in: sys-boot/syslinux/

[Manuel Rüger]

commit:     7d20e25d23bbd09ad08f014f0c29e8a1ece6ed8f
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 24 12:55:02 2017 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Tue Oct 24 12:57:36 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d20e25d

sys-boot/syslinux: Stable on amd64

Package-Manager: Portage-2.3.12, Repoman-2.3.3

 sys-boot/syslinux/syslinux-6.04_pre1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-boot/syslinux/syslinux-6.04_pre1.ebuild b/sys-boot/syslinux/syslinux-6.04_pre1.ebuild
index 3dcc890deca..7c4d0f01234 100644
--- a/sys-boot/syslinux/syslinux-6.04_pre1.ebuild
+++ b/sys-boot/syslinux/syslinux-6.04_pre1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,7 +19,7 @@ SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${SRC_URI_DIR}/${P/_/-}.tar.x
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 ~x86"
 IUSE="custom-cflags"
 
 RDEPEND="sys-fs/mtools

[gentoo-commits] repo/gentoo:master commit in: sys-boot/syslinux/

[Thomas Deutschmann]

commit:     8404b44279d9de5d8613dbdfa8269569ad5c4889
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 27 09:50:30 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Oct 27 09:50:30 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8404b442

sys-boot/syslinux: x86 stable (bug #632596)

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 sys-boot/syslinux/syslinux-6.04_pre1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-boot/syslinux/syslinux-6.04_pre1.ebuild b/sys-boot/syslinux/syslinux-6.04_pre1.ebuild
index 7c4d0f01234..2a96ac4acdf 100644
--- a/sys-boot/syslinux/syslinux-6.04_pre1.ebuild
+++ b/sys-boot/syslinux/syslinux-6.04_pre1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${SRC_URI_DIR}/${P/_/-}.tar.x
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="custom-cflags"
 
 RDEPEND="sys-fs/mtools

[gentoo-commits] repo/gentoo:master commit in: sys-boot/syslinux/

[Mikle Kolyada]

commit:     3a3aff41a42d402fbfb815c0f3d7b51cd3ace1dd
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 26 17:53:07 2018 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Tue Jun 26 17:53:25 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a3aff41

sys-boot/syslinux: switch to https

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 sys-boot/syslinux/syslinux-3.86.ebuild      | 2 +-
 sys-boot/syslinux/syslinux-4.07.ebuild      | 2 +-
 sys-boot/syslinux/syslinux-5.10.ebuild      | 4 ++--
 sys-boot/syslinux/syslinux-6.03.ebuild      | 4 ++--
 sys-boot/syslinux/syslinux-6.04_pre1.ebuild | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sys-boot/syslinux/syslinux-3.86.ebuild b/sys-boot/syslinux/syslinux-3.86.ebuild
index 5a228651d5e..a6f387689ac 100644
--- a/sys-boot/syslinux/syslinux-3.86.ebuild
+++ b/sys-boot/syslinux/syslinux-3.86.ebuild
@@ -6,7 +6,7 @@ EAPI=0
 inherit eutils toolchain-funcs
 
 DESCRIPTION="SysLinux, IsoLinux and PXELinux bootloader"
-HOMEPAGE="http://syslinux.zytor.com/"
+HOMEPAGE="https://syslinux.zytor.com/"
 SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${PV:0:1}.xx/${P}.tar.bz2"
 
 LICENSE="GPL-2"

diff --git a/sys-boot/syslinux/syslinux-4.07.ebuild b/sys-boot/syslinux/syslinux-4.07.ebuild
index 958da21c5cf..6d6dee9d9c9 100644
--- a/sys-boot/syslinux/syslinux-4.07.ebuild
+++ b/sys-boot/syslinux/syslinux-4.07.ebuild
@@ -6,7 +6,7 @@ EAPI=0
 inherit eutils toolchain-funcs
 
 DESCRIPTION="SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders"
-HOMEPAGE="http://syslinux.zytor.com/"
+HOMEPAGE="https://syslinux.zytor.com/"
 SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${PV:0:1}.xx/${P/_/-}.tar.bz2"
 
 LICENSE="GPL-2"

diff --git a/sys-boot/syslinux/syslinux-5.10.ebuild b/sys-boot/syslinux/syslinux-5.10.ebuild
index 978e1f047d9..dbe728fd149 100644
--- a/sys-boot/syslinux/syslinux-5.10.ebuild
+++ b/sys-boot/syslinux/syslinux-5.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -6,7 +6,7 @@ EAPI=4
 inherit eutils toolchain-funcs
 
 DESCRIPTION="SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders"
-HOMEPAGE="http://www.syslinux.org/"
+HOMEPAGE="https://www.syslinux.org/"
 SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${PV:0:1}.xx/${P/_/-}.tar.xz"
 
 LICENSE="GPL-2"

diff --git a/sys-boot/syslinux/syslinux-6.03.ebuild b/sys-boot/syslinux/syslinux-6.03.ebuild
index 3dcc890deca..c1f72d04354 100644
--- a/sys-boot/syslinux/syslinux-6.03.ebuild
+++ b/sys-boot/syslinux/syslinux-6.03.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 inherit eutils toolchain-funcs
 
 DESCRIPTION="SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders"
-HOMEPAGE="http://www.syslinux.org/"
+HOMEPAGE="https://www.syslinux.org/"
 # Final releases in 6.xx/$PV.tar.* (literal "xx")
 # Testing releases in Testing/$PV/$PV.tar.*
 SRC_URI_DIR=${PV:0:1}.xx

diff --git a/sys-boot/syslinux/syslinux-6.04_pre1.ebuild b/sys-boot/syslinux/syslinux-6.04_pre1.ebuild
index 2a96ac4acdf..649460108cd 100644
--- a/sys-boot/syslinux/syslinux-6.04_pre1.ebuild
+++ b/sys-boot/syslinux/syslinux-6.04_pre1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 inherit eutils toolchain-funcs
 
 DESCRIPTION="SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders"
-HOMEPAGE="http://www.syslinux.org/"
+HOMEPAGE="https://www.syslinux.org/"
 # Final releases in 6.xx/$PV.tar.* (literal "xx")
 # Testing releases in Testing/$PV/$PV.tar.*
 SRC_URI_DIR=${PV:0:1}.xx

[gentoo-commits] repo/gentoo:master commit in: sys-boot/syslinux/

[Sergei Trofimovich]

commit:     37710f28851ba50ede07f1f5b9c0820a822d8ca2
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 10 13:02:44 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Mar 10 13:03:19 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37710f28

sys-boot/syslinux: allow user patches, #662678

Applying user patches will ease testing and debugging of #662678

Bug: https://bugs.gentoo.org/662678
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 sys-boot/syslinux/syslinux-6.04_pre1.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sys-boot/syslinux/syslinux-6.04_pre1.ebuild b/sys-boot/syslinux/syslinux-6.04_pre1.ebuild
index 649460108cd..026381ff536 100644
--- a/sys-boot/syslinux/syslinux-6.04_pre1.ebuild
+++ b/sys-boot/syslinux/syslinux-6.04_pre1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -82,6 +82,8 @@ src_prepare() {
 			ewarn "Continuing anyway as requested."
 		fi
 	fi
+
+	epatch_user
 }
 
 src_compile() {

[gentoo-commits] repo/gentoo:master commit in: sys-boot/syslinux/

[Andreas K. Hüttel]

commit:     823e81cf3cca05da337a94ce86a6f583f2d1b37a
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  4 06:26:11 2019 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Jun  4 06:26:11 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=823e81cf

sys-boot/syslinux: restore syslinux-4

Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 sys-boot/syslinux/Manifest             |  1 +
 sys-boot/syslinux/syslinux-4.07.ebuild | 70 ++++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+)

diff --git a/sys-boot/syslinux/Manifest b/sys-boot/syslinux/Manifest
index b9ab5dc8f24..f247daa7748 100644
--- a/sys-boot/syslinux/Manifest
+++ b/sys-boot/syslinux/Manifest
@@ -1,3 +1,4 @@
+DIST syslinux-4.07.tar.bz2 5761877 BLAKE2B 2fe28f268f896601a045564b1e3dde618d57ebf4098d007f7e45119ad019fa88221658608f88e55d4d09cd297140427cdeaf03a40a2341d732064a0630fe92b5 SHA512 8efbd14803ec74c5ee699a754b4727e4b975c08afd4dbb39f4b7ccdb90743e4459cd4609c6f1065c7b7efaa26c9d465806254891795d363758f35a2fe5704ae5
 DIST syslinux-5.10.tar.xz 5315660 BLAKE2B 19d6861bb6220fe57e12d8d6118d37b197c3c771e4d2e7a51ce7db39219e3c837e6d1543d7a3927820f3a34da34ce849f9badbaf9cd83cb5ee24fd5ed7b705f2 SHA512 56422e14b4aa53ca1a5811da0582dbbb349aa52b9e78868bbedc24c67ef2420c4d0ac63fd68c7f0adc2c22606196276265d503b5b6f9d3d796d9ce42845bbdb5
 DIST syslinux-6.03.tar.xz 6855224 BLAKE2B 9caccf8bed4e3c3e87393c9dc8f3b3d267c14469bbf8135a648ea41d8a43a4aedbf2b007c6b9a6853de8866152f5bc33e5ea85fca1db86c5f2fac88d97189b0f SHA512 dd2b2916962b9e93bc1e714182e3ca2a727a229b8afabe913050bcfdd43ee2af51ee3acf79121d8c20caf434583efaa7f3196871e0e07c04d82191323a50fe31
 DIST syslinux-6.04-pre1.tar.xz 5283272 BLAKE2B 800e5977ed13b26a1756c33d8625e850631b642e26a86e3328196ddd998596693c3a26db0ada4c0ba78a4ba692a1cc01886b6eb693d877ddafcfb325ecdeb639 SHA512 7927dd39be8e2dcf4138a6fea33def67d19d938379d694f15b48fdd2f5924c028b7a9e7bd71d0c7c6630c203e9e2a54296628e530632ad5e6f55b1ebefe8fc98

diff --git a/sys-boot/syslinux/syslinux-4.07.ebuild b/sys-boot/syslinux/syslinux-4.07.ebuild
new file mode 100644
index 00000000000..92eeeea5c9d
--- /dev/null
+++ b/sys-boot/syslinux/syslinux-4.07.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders"
+HOMEPAGE="https://syslinux.zytor.com/"
+SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${PV:0:1}.xx/${P/_/-}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* amd64 x86"
+IUSE="custom-cflags"
+
+RDEPEND="sys-fs/mtools
+		dev-perl/Crypt-PasswdMD5
+		dev-perl/Digest-SHA1"
+DEPEND="${RDEPEND}
+	dev-lang/nasm
+	virtual/os-headers"
+
+S=${WORKDIR}/${P/_/-}
+
+# This ebuild is a departure from the old way of rebuilding everything in syslinux
+# This departure is necessary since hpa doesn't support the rebuilding of anything other
+# than the installers.
+
+# removed all the unpack/patching stuff since we aren't rebuilding the core stuff anymore
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# Fix building on hardened
+	epatch "${FILESDIR}"/${PN}-4.05-nopie.patch
+
+	rm -f gethostip #bug 137081
+
+	# Don't prestrip or override user LDFLAGS, bug #305783
+	local SYSLINUX_MAKEFILES="extlinux/Makefile linux/Makefile mtools/Makefile \
+		sample/Makefile utils/Makefile"
+	sed -i ${SYSLINUX_MAKEFILES} -e '/^LDFLAGS/d' || die "sed failed"
+
+	if use custom-cflags; then
+		sed -i ${SYSLINUX_MAKEFILES} \
+			-e 's|-g -Os||g' \
+			-e 's|-Os||g' \
+			-e 's|CFLAGS[[:space:]]\+=|CFLAGS +=|g' \
+			|| die "sed custom-cflags failed"
+	else
+		QA_FLAGS_IGNORED="
+			/sbin/extlinux
+			/usr/bin/memdiskfind
+			/usr/bin/gethostip
+			/usr/bin/isohybrid
+			/usr/bin/syslinux
+			"
+	fi
+
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" installer || die
+}
+
+src_install() {
+	emake INSTALLSUBDIRS=utils INSTALLROOT="${D}" MANDIR=/usr/share/man install || die
+	dodoc README NEWS doc/*.txt || die
+}

[gentoo-commits] repo/gentoo:master commit in: sys-boot/syslinux/

[Michał Górny]

commit:     0c579cfee0692c35d0649c4ec0f3ddf0dddaf557
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 30 06:49:05 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Oct  5 18:54:08 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c579cfe

sys-boot/syslinux: Inline mirror://kernel

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-boot/syslinux/syslinux-4.07.ebuild      | 2 +-
 sys-boot/syslinux/syslinux-5.10.ebuild      | 2 +-
 sys-boot/syslinux/syslinux-6.03.ebuild      | 2 +-
 sys-boot/syslinux/syslinux-6.04_pre1.ebuild | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys-boot/syslinux/syslinux-4.07.ebuild b/sys-boot/syslinux/syslinux-4.07.ebuild
index 92eeeea5c9d..021f559c7eb 100644
--- a/sys-boot/syslinux/syslinux-4.07.ebuild
+++ b/sys-boot/syslinux/syslinux-4.07.ebuild
@@ -7,7 +7,7 @@ inherit eutils toolchain-funcs
 
 DESCRIPTION="SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders"
 HOMEPAGE="https://syslinux.zytor.com/"
-SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${PV:0:1}.xx/${P/_/-}.tar.bz2"
+SRC_URI="https://www.kernel.org/pub/linux/utils/boot/syslinux/${PV:0:1}.xx/${P/_/-}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"

diff --git a/sys-boot/syslinux/syslinux-5.10.ebuild b/sys-boot/syslinux/syslinux-5.10.ebuild
index dbe728fd149..bc99bbf6c4e 100644
--- a/sys-boot/syslinux/syslinux-5.10.ebuild
+++ b/sys-boot/syslinux/syslinux-5.10.ebuild
@@ -7,7 +7,7 @@ inherit eutils toolchain-funcs
 
 DESCRIPTION="SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders"
 HOMEPAGE="https://www.syslinux.org/"
-SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${PV:0:1}.xx/${P/_/-}.tar.xz"
+SRC_URI="https://www.kernel.org/pub/linux/utils/boot/syslinux/${PV:0:1}.xx/${P/_/-}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"

diff --git a/sys-boot/syslinux/syslinux-6.03.ebuild b/sys-boot/syslinux/syslinux-6.03.ebuild
index c1f72d04354..c82f18d21b8 100644
--- a/sys-boot/syslinux/syslinux-6.03.ebuild
+++ b/sys-boot/syslinux/syslinux-6.03.ebuild
@@ -15,7 +15,7 @@ SRC_URI_TESTING=Testing/${PV:0:4}
 [[ ${PV/_beta} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING
 [[ ${PV/_pre} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING
 [[ ${PV/_rc} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING
-SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${SRC_URI_DIR}/${P/_/-}.tar.xz"
+SRC_URI="https://www.kernel.org/pub/linux/utils/boot/syslinux/${SRC_URI_DIR}/${P/_/-}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"

diff --git a/sys-boot/syslinux/syslinux-6.04_pre1.ebuild b/sys-boot/syslinux/syslinux-6.04_pre1.ebuild
index 5ad853d33db..3fb6b3a94cc 100644
--- a/sys-boot/syslinux/syslinux-6.04_pre1.ebuild
+++ b/sys-boot/syslinux/syslinux-6.04_pre1.ebuild
@@ -15,7 +15,7 @@ SRC_URI_TESTING=Testing/${PV:0:4}
 [[ ${PV/_beta} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING
 [[ ${PV/_pre} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING
 [[ ${PV/_rc} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING
-SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${SRC_URI_DIR}/${P/_/-}.tar.xz"
+SRC_URI="https://www.kernel.org/pub/linux/utils/boot/syslinux/${SRC_URI_DIR}/${P/_/-}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"

[gentoo-commits] repo/gentoo:master commit in: sys-boot/syslinux/

[Michał Górny]

commit:     77f18d32f3f0b60cb4329ae55dc9766f226faece
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  7 07:18:59 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov  7 07:18:59 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77f18d32

sys-boot/syslinux: Drop old (EAPI 0)

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-boot/syslinux/Manifest             |  1 -
 sys-boot/syslinux/syslinux-4.07.ebuild | 70 ----------------------------------
 2 files changed, 71 deletions(-)

diff --git a/sys-boot/syslinux/Manifest b/sys-boot/syslinux/Manifest
index f247daa7748..b9ab5dc8f24 100644
--- a/sys-boot/syslinux/Manifest
+++ b/sys-boot/syslinux/Manifest
@@ -1,4 +1,3 @@
-DIST syslinux-4.07.tar.bz2 5761877 BLAKE2B 2fe28f268f896601a045564b1e3dde618d57ebf4098d007f7e45119ad019fa88221658608f88e55d4d09cd297140427cdeaf03a40a2341d732064a0630fe92b5 SHA512 8efbd14803ec74c5ee699a754b4727e4b975c08afd4dbb39f4b7ccdb90743e4459cd4609c6f1065c7b7efaa26c9d465806254891795d363758f35a2fe5704ae5
 DIST syslinux-5.10.tar.xz 5315660 BLAKE2B 19d6861bb6220fe57e12d8d6118d37b197c3c771e4d2e7a51ce7db39219e3c837e6d1543d7a3927820f3a34da34ce849f9badbaf9cd83cb5ee24fd5ed7b705f2 SHA512 56422e14b4aa53ca1a5811da0582dbbb349aa52b9e78868bbedc24c67ef2420c4d0ac63fd68c7f0adc2c22606196276265d503b5b6f9d3d796d9ce42845bbdb5
 DIST syslinux-6.03.tar.xz 6855224 BLAKE2B 9caccf8bed4e3c3e87393c9dc8f3b3d267c14469bbf8135a648ea41d8a43a4aedbf2b007c6b9a6853de8866152f5bc33e5ea85fca1db86c5f2fac88d97189b0f SHA512 dd2b2916962b9e93bc1e714182e3ca2a727a229b8afabe913050bcfdd43ee2af51ee3acf79121d8c20caf434583efaa7f3196871e0e07c04d82191323a50fe31
 DIST syslinux-6.04-pre1.tar.xz 5283272 BLAKE2B 800e5977ed13b26a1756c33d8625e850631b642e26a86e3328196ddd998596693c3a26db0ada4c0ba78a4ba692a1cc01886b6eb693d877ddafcfb325ecdeb639 SHA512 7927dd39be8e2dcf4138a6fea33def67d19d938379d694f15b48fdd2f5924c028b7a9e7bd71d0c7c6630c203e9e2a54296628e530632ad5e6f55b1ebefe8fc98

diff --git a/sys-boot/syslinux/syslinux-4.07.ebuild b/sys-boot/syslinux/syslinux-4.07.ebuild
deleted file mode 100644
index 021f559c7eb..00000000000
--- a/sys-boot/syslinux/syslinux-4.07.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders"
-HOMEPAGE="https://syslinux.zytor.com/"
-SRC_URI="https://www.kernel.org/pub/linux/utils/boot/syslinux/${PV:0:1}.xx/${P/_/-}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="custom-cflags"
-
-RDEPEND="sys-fs/mtools
-		dev-perl/Crypt-PasswdMD5
-		dev-perl/Digest-SHA1"
-DEPEND="${RDEPEND}
-	dev-lang/nasm
-	virtual/os-headers"
-
-S=${WORKDIR}/${P/_/-}
-
-# This ebuild is a departure from the old way of rebuilding everything in syslinux
-# This departure is necessary since hpa doesn't support the rebuilding of anything other
-# than the installers.
-
-# removed all the unpack/patching stuff since we aren't rebuilding the core stuff anymore
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# Fix building on hardened
-	epatch "${FILESDIR}"/${PN}-4.05-nopie.patch
-
-	rm -f gethostip #bug 137081
-
-	# Don't prestrip or override user LDFLAGS, bug #305783
-	local SYSLINUX_MAKEFILES="extlinux/Makefile linux/Makefile mtools/Makefile \
-		sample/Makefile utils/Makefile"
-	sed -i ${SYSLINUX_MAKEFILES} -e '/^LDFLAGS/d' || die "sed failed"
-
-	if use custom-cflags; then
-		sed -i ${SYSLINUX_MAKEFILES} \
-			-e 's|-g -Os||g' \
-			-e 's|-Os||g' \
-			-e 's|CFLAGS[[:space:]]\+=|CFLAGS +=|g' \
-			|| die "sed custom-cflags failed"
-	else
-		QA_FLAGS_IGNORED="
-			/sbin/extlinux
-			/usr/bin/memdiskfind
-			/usr/bin/gethostip
-			/usr/bin/isohybrid
-			/usr/bin/syslinux
-			"
-	fi
-
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" installer || die
-}
-
-src_install() {
-	emake INSTALLSUBDIRS=utils INSTALLROOT="${D}" MANDIR=/usr/share/man install || die
-	dodoc README NEWS doc/*.txt || die
-}

[gentoo-commits] repo/gentoo:master commit in: sys-boot/syslinux/

[Sergei Trofimovich]

commit:     8b83425b9634ddc92cbf3f8492d5d6faa4ba5868
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Tue May 26 22:30:58 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue May 26 22:30:58 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b83425b

sys-boot/syslinux: respect user's AR, OBJCOPY, RANLIB, bug #721902

Reported-by: Agostino Sarubbo
Closes: https://bugs.gentoo.org/721902
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild | 119 +++++++++++++++++++++++++
 1 file changed, 119 insertions(+)

diff --git a/sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild b/sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild
new file mode 100644
index 00000000000..415672bbf77
--- /dev/null
+++ b/sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders"
+HOMEPAGE="https://www.syslinux.org/"
+# Final releases in 6.xx/$PV.tar.* (literal "xx")
+# Testing releases in Testing/$PV/$PV.tar.*
+SRC_URI_DIR=${PV:0:1}.xx
+SRC_URI_TESTING=Testing/${PV:0:4}
+[[ ${PV/_alpha} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING
+[[ ${PV/_beta} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING
+[[ ${PV/_pre} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING
+[[ ${PV/_rc} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING
+SRC_URI="https://www.kernel.org/pub/linux/utils/boot/syslinux/${SRC_URI_DIR}/${P/_/-}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="custom-cflags"
+
+RDEPEND="sys-fs/mtools
+	dev-perl/Crypt-PasswdMD5
+	dev-perl/Digest-SHA1"
+DEPEND="${RDEPEND}
+	dev-lang/nasm
+	>=sys-boot/gnu-efi-3.0u
+	virtual/os-headers"
+
+S=${WORKDIR}/${P/_/-}
+
+# This ebuild is a departure from the old way of rebuilding everything in syslinux
+# This departure is necessary since hpa doesn't support the rebuilding of anything other
+# than the installers.
+
+# These are executables which come precompiled and are run by the boot loader
+QA_PREBUILT="usr/share/${PN}/*.c32"
+
+# removed all the unpack/patching stuff since we aren't rebuilding the core stuff anymore
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.03-sysmacros.patch #579928
+	"${FILESDIR}"/${P}-singleloadsegment.patch #662678
+	"${FILESDIR}"/${P}-fcommon.patch #705730
+)
+
+src_prepare() {
+	default
+
+	rm -f gethostip #bug 137081
+
+	# Don't prestrip or override user LDFLAGS, bug #305783
+	local SYSLINUX_MAKEFILES="extlinux/Makefile linux/Makefile mtools/Makefile \
+		sample/Makefile utils/Makefile"
+	sed -i ${SYSLINUX_MAKEFILES} -e '/^LDFLAGS/d' || die "sed failed"
+
+	if use custom-cflags; then
+		sed -i ${SYSLINUX_MAKEFILES} \
+			-e 's|-g -Os||g' \
+			-e 's|-Os||g' \
+			-e 's|CFLAGS[[:space:]]\+=|CFLAGS +=|g' \
+			|| die "sed custom-cflags failed"
+	else
+		QA_FLAGS_IGNORED="
+			/sbin/extlinux
+			/usr/bin/memdiskfind
+			/usr/bin/gethostip
+			/usr/bin/isohybrid
+			/usr/bin/syslinux
+			"
+	fi
+	case ${ARCH} in
+		amd64)	loaderarch="efi64" ;;
+		x86)	loaderarch="efi32" ;;
+		*)	ewarn "Unsupported architecture, building installers only." ;;
+	esac
+
+	# building with ld.gold causes problems, bug #563364
+	if tc-ld-is-gold; then
+		ewarn "Building syslinux with the gold linker may cause problems, see bug #563364"
+		if [[ -z "${I_KNOW_WHAT_I_AM_DOING}" ]]; then
+			tc-ld-disable-gold
+			ewarn "set I_KNOW_WHAT_I_AM_DOING=1 to override this."
+		else
+			ewarn "Continuing anyway as requested."
+		fi
+	fi
+
+	tc-export AR CC LD OBJCOPY RANLIB
+}
+
+_emake() {
+	emake \
+		AR="${AR}" \
+		CC="${CC}" \
+		LD="${LD}" \
+		OBJCOPY="${OBJCOPY}" \
+		RANLIB="${RANLIB}" \
+		"$@"
+}
+
+src_compile() {
+	# build system abuses the LDFLAGS variable to pass arguments to ld
+	unset LDFLAGS
+	if [[ ! -z ${loaderarch} ]]; then
+		_emake ${loaderarch}
+	fi
+	_emake ${loaderarch} installer
+}
+
+src_install() {
+	# parallel install fails sometimes
+	einfo "loaderarch=${loaderarch}"
+	_emake -j1 INSTALLROOT="${D}" MANDIR=/usr/share/man bios ${loaderarch} install
+	dodoc README NEWS doc/*.txt
+}

[gentoo-commits] repo/gentoo:master commit in: sys-boot/syslinux/

[Thomas Deutschmann]

commit:     baa1f74026df5af3720ed0c354e58930732eeb95
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  2 02:59:39 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Dec  2 02:59:39 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=baa1f740

sys-boot/syslinux: x86 stable (bug #734800)

Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild b/sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild
index 415672bbf77..52aaa1653ef 100644
--- a/sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild
+++ b/sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/boot/syslinux/${SRC_URI_DIR}/${P
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* ~amd64 x86"
 IUSE="custom-cflags"
 
 RDEPEND="sys-fs/mtools

[gentoo-commits] repo/gentoo:master commit in: sys-boot/syslinux/

[Sam James]

commit:     d1121a7ac4f1cfe76bf05f65855390650023073b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 17 00:58:25 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 17 00:58:25 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1121a7a

sys-boot/syslinux: Stabilize 6.04_pre1-r2 amd64, #734800

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild b/sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild
index 52aaa1653ef..170f9004ac0 100644
--- a/sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild
+++ b/sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/boot/syslinux/${SRC_URI_DIR}/${P
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 x86"
+KEYWORDS="-* amd64 x86"
 IUSE="custom-cflags"
 
 RDEPEND="sys-fs/mtools

[gentoo-commits] repo/gentoo:master commit in: sys-boot/syslinux/

[Andreas K. Hüttel]

commit:     53c31ce51ace223e4439cde2b6b2a395e40ae9d5
Author:     Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  1 19:18:35 2021 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Jan  1 21:49:10 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53c31ce5

sys-boot/syslinux: Remove old

Bug: https://bugs.gentoo.org/705730
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas K. Huettel <dilfridge <AT> gentoo.org>

 sys-boot/syslinux/syslinux-6.04_pre1.ebuild | 115 ----------------------------
 1 file changed, 115 deletions(-)

diff --git a/sys-boot/syslinux/syslinux-6.04_pre1.ebuild b/sys-boot/syslinux/syslinux-6.04_pre1.ebuild
deleted file mode 100644
index 3fb6b3a94cc..00000000000
--- a/sys-boot/syslinux/syslinux-6.04_pre1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders"
-HOMEPAGE="https://www.syslinux.org/"
-# Final releases in 6.xx/$PV.tar.* (literal "xx")
-# Testing releases in Testing/$PV/$PV.tar.*
-SRC_URI_DIR=${PV:0:1}.xx
-SRC_URI_TESTING=Testing/${PV:0:4}
-[[ ${PV/_alpha} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING
-[[ ${PV/_beta} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING
-[[ ${PV/_pre} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING
-[[ ${PV/_rc} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING
-SRC_URI="https://www.kernel.org/pub/linux/utils/boot/syslinux/${SRC_URI_DIR}/${P/_/-}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="custom-cflags"
-
-RDEPEND="sys-fs/mtools
-		dev-perl/Crypt-PasswdMD5
-		dev-perl/Digest-SHA1"
-DEPEND="${RDEPEND}
-	dev-lang/nasm
-	>=sys-boot/gnu-efi-3.0u
-	virtual/os-headers"
-
-S=${WORKDIR}/${P/_/-}
-
-# This ebuild is a departure from the old way of rebuilding everything in syslinux
-# This departure is necessary since hpa doesn't support the rebuilding of anything other
-# than the installers.
-
-# These are executables which come precompiled and are run by the boot loader
-QA_PREBUILT="usr/share/${PN}/*.c32"
-
-# removed all the unpack/patching stuff since we aren't rebuilding the core stuff anymore
-
-src_prepare() {
-	rm -f gethostip #bug 137081
-
-	epatch "${FILESDIR}"/${PN}-6.03-sysmacros.patch #579928
-	epatch "${FILESDIR}"/${P}-singleloadsegment.patch #662678
-
-	# Don't prestrip or override user LDFLAGS, bug #305783
-	local SYSLINUX_MAKEFILES="extlinux/Makefile linux/Makefile mtools/Makefile \
-		sample/Makefile utils/Makefile"
-	sed -i ${SYSLINUX_MAKEFILES} -e '/^LDFLAGS/d' || die "sed failed"
-
-	if use custom-cflags; then
-		sed -i ${SYSLINUX_MAKEFILES} \
-			-e 's|-g -Os||g' \
-			-e 's|-Os||g' \
-			-e 's|CFLAGS[[:space:]]\+=|CFLAGS +=|g' \
-			|| die "sed custom-cflags failed"
-	else
-		QA_FLAGS_IGNORED="
-			/sbin/extlinux
-			/usr/bin/memdiskfind
-			/usr/bin/gethostip
-			/usr/bin/isohybrid
-			/usr/bin/syslinux
-			"
-	fi
-	case ${ARCH} in
-		amd64)	loaderarch="efi64" ;;
-		x86)	loaderarch="efi32" ;;
-		*)	ewarn "Unsupported architecture, building installers only." ;;
-	esac
-
-	# building with ld.gold causes problems, bug #563364
-	if tc-ld-is-gold; then
-		ewarn "Building syslinux with the gold linker may cause problems, see bug #563364"
-		if [[ -z "${I_KNOW_WHAT_I_AM_DOING}" ]]; then
-			tc-ld-disable-gold
-			ewarn "set I_KNOW_WHAT_I_AM_DOING=1 to override this."
-		else
-			ewarn "Continuing anyway as requested."
-		fi
-	fi
-
-	epatch_user
-}
-
-src_compile() {
-	# build system abuses the LDFLAGS variable to pass arguments to ld
-	unset LDFLAGS
-	if [[ ! -z ${loaderarch} ]]; then
-		emake CC="$(tc-getCC)" LD="$(tc-getLD)" ${loaderarch}
-	fi
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" ${loaderarch} installer
-}
-
-src_install() {
-	# parallel install fails sometimes
-	einfo "loaderarch=${loaderarch}"
-	emake -j1 LD="$(tc-getLD)" INSTALLROOT="${D}" MANDIR=/usr/share/man bios ${loaderarch} install
-	dodoc README NEWS doc/*.txt
-}
-
-pkg_postinst() {
-	# print warning for users upgrading from the previous stable version
-	if has 4.07 ${REPLACING_VERSIONS}; then
-		ewarn "syslinux now uses dynamically linked ELF executables. Before you reboot,"
-		ewarn "ensure that needed dependencies are fulfilled. For example, run from your"
-		ewarn "syslinux directory:"
-		ewarn
-		ewarn "LD_LIBRARY_PATH=\".\" ldd menu.c32"
-	fi
-}

[gentoo-commits] repo/gentoo:master commit in: sys-boot/syslinux/

[Sam James]

commit:     2c3fc8542c587e4b9cb1b17e274505fdf35b0c19
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  2 09:12:07 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Apr  3 15:43:54 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c3fc854

sys-boot/syslinux: fix variable references

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild b/sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild
index 170f9004ac0..00346dcd603 100644
--- a/sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild
+++ b/sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,14 +7,14 @@ inherit eutils toolchain-funcs
 
 DESCRIPTION="SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders"
 HOMEPAGE="https://www.syslinux.org/"
-# Final releases in 6.xx/$PV.tar.* (literal "xx")
-# Testing releases in Testing/$PV/$PV.tar.*
+# Final releases in 6.xx/${PV}.tar.* (literal "xx")
+# Testing releases in Testing/${PV}/${PV}.tar.*
 SRC_URI_DIR=${PV:0:1}.xx
 SRC_URI_TESTING=Testing/${PV:0:4}
-[[ ${PV/_alpha} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING
-[[ ${PV/_beta} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING
-[[ ${PV/_pre} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING
-[[ ${PV/_rc} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING
+[[ ${PV/_alpha} != ${PV} ]] && SRC_URI_DIR=${SRC_URI_TESTING}
+[[ ${PV/_beta} != ${PV} ]] && SRC_URI_DIR=${SRC_URI_TESTING}
+[[ ${PV/_pre} != ${PV} ]] && SRC_URI_DIR=${SRC_URI_TESTING}
+[[ ${PV/_rc} != ${PV} ]] && SRC_URI_DIR=${SRC_URI_TESTING}
 SRC_URI="https://www.kernel.org/pub/linux/utils/boot/syslinux/${SRC_URI_DIR}/${P/_/-}.tar.xz"
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: sys-boot/syslinux/

[David Seifert]

commit:     21e95bfb01dfaad15c206bf7bcf35467c707ce0d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 16 10:13:48 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Apr 16 10:13:48 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21e95bfb

sys-boot/syslinux: eutils--

Signed-off-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild b/sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild
index 00346dcd603..2371fdae815 100644
--- a/sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild
+++ b/sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders"
 HOMEPAGE="https://www.syslinux.org/"

[gentoo-commits] repo/gentoo:master commit in: sys-boot/syslinux/

[Sam James]

commit:     f92b2c5fe6f38f753d4c7bfc36001f7c81f140d2
Author:     Manoj Gupta <manojgupta <AT> google <DOT> com>
AuthorDate: Fri May 21 02:44:18 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 16 04:03:04 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f92b2c5f

sys-boot/syslinux: Add DEPEND on sys-apps/util-linux

Some syslinux files needs headers from util-linux
e.g. extlinux/xfs_sb.h includes <uuid/uuid.h>.

Signed-off-by: Manoj Gupta <manojgupta <AT> google.com>
Closes: https://github.com/gentoo/gentoo/pull/20903
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild b/sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild
index 2371fdae815..2a2e03e65c9 100644
--- a/sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild
+++ b/sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild
@@ -28,6 +28,7 @@ RDEPEND="sys-fs/mtools
 DEPEND="${RDEPEND}
 	dev-lang/nasm
 	>=sys-boot/gnu-efi-3.0u
+	sys-apps/util-linux
 	virtual/os-headers"
 
 S=${WORKDIR}/${P/_/-}

[gentoo-commits] repo/gentoo:master commit in: sys-boot/syslinux/

[Sam James]

commit:     28b19e967121b5213a5dd971ab8f3e42d377cbcd
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 16 04:03:34 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 16 04:03:47 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28b19e96

sys-boot/syslinux: add sys-apps/util-linux to RDEPEND too

Needed for libuuid.

See: https://github.com/gentoo/gentoo/pull/20903
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild b/sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild
index 2a2e03e65c9..b0ed750f5a1 100644
--- a/sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild
+++ b/sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild
@@ -22,13 +22,13 @@ SLOT="0"
 KEYWORDS="-* amd64 x86"
 IUSE="custom-cflags"
 
-RDEPEND="sys-fs/mtools
+RDEPEND="sys-apps/util-linux
+	sys-fs/mtools
 	dev-perl/Crypt-PasswdMD5
 	dev-perl/Digest-SHA1"
 DEPEND="${RDEPEND}
 	dev-lang/nasm
 	>=sys-boot/gnu-efi-3.0u
-	sys-apps/util-linux
 	virtual/os-headers"
 
 S=${WORKDIR}/${P/_/-}

[gentoo-commits] repo/gentoo:master commit in: sys-boot/syslinux/

[Mike Gilbert]

commit:     c8cb8a9930524cd70efad59529c9e1936dcb0bf3
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon May 30 20:28:26 2022 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon May 30 20:32:13 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8cb8a99

sys-boot/syslinux: replace efi32 and efi64 with ABI_X86 flags

Closes: https://bugs.gentoo.org/584464
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-boot/syslinux/metadata.xml              |  3 +--
 sys-boot/syslinux/syslinux-6.04_pre3.ebuild | 29 +++++++++++++++++------------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/sys-boot/syslinux/metadata.xml b/sys-boot/syslinux/metadata.xml
index 22c238faa909..ca6327ed17a2 100644
--- a/sys-boot/syslinux/metadata.xml
+++ b/sys-boot/syslinux/metadata.xml
@@ -10,8 +10,7 @@
 	</maintainer>
 	<use>
 		<flag name="bios">Enable BIOS support</flag>
-		<flag name="efi32">Enable 32-bit EFI support</flag>
-		<flag name="efi64">Enable 64-bit EFI support</flag>
+		<flag name="efi">Enable EFI support</flag>
 	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:gentoo:syslinux</remote-id>

diff --git a/sys-boot/syslinux/syslinux-6.04_pre3.ebuild b/sys-boot/syslinux/syslinux-6.04_pre3.ebuild
index 14724565c3dd..0cdfd3d15c7b 100644
--- a/sys-boot/syslinux/syslinux-6.04_pre3.ebuild
+++ b/sys-boot/syslinux/syslinux-6.04_pre3.ebuild
@@ -13,8 +13,9 @@ SRC_URI="https://git.zytor.com/syslinux/syslinux.git/snapshot/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE="+bios efi32 efi64"
-REQUIRED_USE="|| ( bios efi32 efi64 )"
+IUSE="abi_x86_32 abi_x86_64 +bios +efi"
+REQUIRED_USE="|| ( bios efi )
+	efi? ( || ( abi_x86_32 abi_x86_64 ) )"
 
 BDEPEND="
 	dev-lang/perl
@@ -31,8 +32,7 @@ RDEPEND="
 	dev-perl/Digest-SHA1
 "
 DEPEND="${RDEPEND}
-	efi32? ( sys-boot/gnu-efi[abi_x86_32(-)] )
-	efi64? ( sys-boot/gnu-efi[abi_x86_64(-)] )
+	efi? ( sys-boot/gnu-efi[abi_x86_32(-)?,abi_x86_64(-)?] )
 	virtual/os-headers
 "
 
@@ -69,21 +69,26 @@ src_compile() {
 	if use bios; then
 		emake bios
 	fi
-	if use efi32; then
-		efimake x86 efi32
-	fi
-	if use efi64; then
-		efimake amd64 efi64
+	if use efi; then
+		if use abi_x86_32; then
+			efimake x86 efi32
+		fi
+		if use abi_x86_64; then
+			efimake amd64 efi64
+		fi
 	fi
 }
 
 src_install() {
+	local firmware=( $(usev bios) )
+	if use efi; then
+		use abi_x86_32 && firmware+=( efi32 )
+		use abi_x86_64 && firmware+=( efi64 )
+	fi
 	local args=(
 		INSTALLROOT="${ED}"
 		MANDIR='$(DATADIR)/man'
-		$(usev bios)
-		$(usev efi32)
-		$(usev efi64)
+		"${firmware[@]}"
 		install
 	)
 	emake -j1 "${args[@]}"

[gentoo-commits] repo/gentoo:master commit in: sys-boot/syslinux/

[Mike Gilbert]

commit:     db7da26331948628d8639245dbe65793031bb12a
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue May 31 00:07:45 2022 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue May 31 00:08:15 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db7da263

sys-boot/syslinux: drop KEYWORDS on 6.04_pre3

Basic runtime testing fails to load extlinux.

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-boot/syslinux/syslinux-6.04_pre3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-boot/syslinux/syslinux-6.04_pre3.ebuild b/sys-boot/syslinux/syslinux-6.04_pre3.ebuild
index 0cdfd3d15c7b..67929943e8d1 100644
--- a/sys-boot/syslinux/syslinux-6.04_pre3.ebuild
+++ b/sys-boot/syslinux/syslinux-6.04_pre3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://git.zytor.com/syslinux/syslinux.git/snapshot/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+#KEYWORDS="-* ~amd64 ~x86"
 IUSE="abi_x86_32 abi_x86_64 +bios +efi"
 REQUIRED_USE="|| ( bios efi )
 	efi? ( || ( abi_x86_32 abi_x86_64 ) )"

[gentoo-commits] repo/gentoo:master commit in: sys-boot/syslinux/

[Mike Gilbert]

commit:     cbb67e0be81716c147d845cec44e59be689b2ac2
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue May 31 01:30:30 2022 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue May 31 01:42:08 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbb67e0b

sys-boot/syslinux: set DATE and HEXDATE

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-boot/syslinux/syslinux-6.04_pre3.ebuild | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/sys-boot/syslinux/syslinux-6.04_pre3.ebuild b/sys-boot/syslinux/syslinux-6.04_pre3.ebuild
index 67929943e8d1..bf2d6923e02e 100644
--- a/sys-boot/syslinux/syslinux-6.04_pre3.ebuild
+++ b/sys-boot/syslinux/syslinux-6.04_pre3.ebuild
@@ -64,17 +64,21 @@ efimake() {
 }
 
 src_compile() {
+	local DATE=$(date -u -r NEWS +%Y%m%d)
+	local HEXDATE=$(printf '0x%08x' "${DATE}")
+
 	tc-export AR CC LD OBJCOPY RANLIB
 	unset LDFLAGS
+
 	if use bios; then
-		emake bios
+		emake bios DATE="${DATE}" HEXDATE="${HEXDATE}"
 	fi
 	if use efi; then
 		if use abi_x86_32; then
-			efimake x86 efi32
+			efimake x86 efi32 DATE="${DATE}" HEXDATE="${HEXDATE}"
 		fi
 		if use abi_x86_64; then
-			efimake amd64 efi64
+			efimake amd64 efi64 DATE="${DATE}" HEXDATE="${HEXDATE}"
 		fi
 	fi
 }

[gentoo-commits] repo/gentoo:master commit in: sys-boot/syslinux/

[Mike Gilbert]

commit:     eb4b29fba5dfcbbb9af611e39ad1446f4d6aecdc
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue May 31 12:30:28 2022 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue May 31 12:31:18 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb4b29fb

sys-boot/syslinux: set RESTRICT=test

Closes: https://bugs.gentoo.org/848690
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-boot/syslinux/syslinux-6.04_pre3.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sys-boot/syslinux/syslinux-6.04_pre3.ebuild b/sys-boot/syslinux/syslinux-6.04_pre3.ebuild
index f97f594ef776..9d2dcf602fe1 100644
--- a/sys-boot/syslinux/syslinux-6.04_pre3.ebuild
+++ b/sys-boot/syslinux/syslinux-6.04_pre3.ebuild
@@ -17,6 +17,8 @@ IUSE="abi_x86_32 abi_x86_64 +bios +efi"
 REQUIRED_USE="|| ( bios efi )
 	efi? ( || ( abi_x86_32 abi_x86_64 ) )"
 
+RESTRICT="test"
+
 BDEPEND="
 	dev-lang/perl
 	bios? (

[gentoo-commits] repo/gentoo:master commit in: sys-boot/syslinux/

[Mike Gilbert]

commit:     2312b1a486f1512ad0c7c09af65739f6d8775f3c
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 20 23:24:39 2022 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Dec 20 23:25:35 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2312b1a4

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 <AT> gentoo.org>

 .../{syslinux-6.04_pre1-r2.ebuild => syslinux-6.04_pre1-r4.ebuild}     | 3 ++-
 .../{syslinux-6.04_pre1-r3.ebuild => syslinux-6.04_pre1-r5.ebuild}     | 1 +
 .../{syslinux-6.04_pre3.ebuild => syslinux-6.04_pre3-r1.ebuild}        | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild b/sys-boot/syslinux/syslinux-6.04_pre1-r4.ebuild
similarity index 97%
rename from sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild
rename to 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
similarity index 97%
rename from sys-boot/syslinux/syslinux-6.04_pre1-r3.ebuild
rename to 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
similarity index 97%
rename from sys-boot/syslinux/syslinux-6.04_pre3.ebuild
rename to 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
 }

[gentoo-commits] repo/gentoo:master commit in: sys-boot/syslinux/

[Sam James]

commit:     457a408fd47cc48950a5c7cd86ed99c3c42206ce
Author:     Ian Jordan <immoloism <AT> gmail <DOT> com>
AuthorDate: Fri Nov 18 03:15:53 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 24 07:05:41 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=457a408f

sys-boot/syslinux: Filter LTO

Syslinux can only use LTO when using the ffat-lto-objects cflag and as this is a hack solution I recommend filtering which seems to be the only way to do it without.

Closes: https://bugs.gentoo.org/863722
Signed-off-by: Ian Jordan <immoloism <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/28318
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-boot/syslinux/syslinux-6.04_pre1-r4.ebuild | 4 +++-
 sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild | 4 +++-
 sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/sys-boot/syslinux/syslinux-6.04_pre1-r4.ebuild b/sys-boot/syslinux/syslinux-6.04_pre1-r4.ebuild
index cf6b824f1fdc..0c721bfd018e 100644
--- a/sys-boot/syslinux/syslinux-6.04_pre1-r4.ebuild
+++ b/sys-boot/syslinux/syslinux-6.04_pre1-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit toolchain-funcs flag-o-matic
 
 DESCRIPTION="SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders"
 HOMEPAGE="https://www.syslinux.org/"
@@ -104,6 +104,8 @@ _emake() {
 }
 
 src_compile() {
+	filter-lto #863722
+
 	# build system abuses the LDFLAGS variable to pass arguments to ld
 	unset LDFLAGS
 	if [[ ! -z ${loaderarch} ]]; then

diff --git a/sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild b/sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild
index e4925c07622a..41c78e9eeffb 100644
--- a/sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild
+++ b/sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit toolchain-funcs
+inherit toolchain-funcs flag-o-matic
 
 DESCRIPTION="SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders"
 HOMEPAGE="https://www.syslinux.org/"
@@ -50,6 +50,8 @@ src_prepare() {
 	default
 }
 src_compile() {
+	filter-lto #863722
+
 	local DATE=$(date -u -r NEWS +%Y%m%d)
 	local HEXDATE=$(printf '0x%08x' "${DATE}")
 

diff --git a/sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild b/sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild
index 9c48e26d67c6..65c9463b4d12 100644
--- a/sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild
+++ b/sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit toolchain-funcs
+inherit toolchain-funcs flag-o-matic
 
 DESCRIPTION="SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders"
 HOMEPAGE="https://www.syslinux.org/"
@@ -67,6 +67,8 @@ efimake() {
 }
 
 src_compile() {
+	filter-lto #863722
+
 	local DATE=$(date -u -r NEWS +%Y%m%d)
 	local HEXDATE=$(printf '0x%08x' "${DATE}")
 

[gentoo-commits] repo/gentoo:master commit in: sys-boot/syslinux/

[Mike Gilbert]

commit:     79b0906d4f86aa59adee9a534b4f8f5ad216931a
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 25 02:09:18 2022 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Dec 25 02:09:18 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79b0906d

sys-boot/syslinux: drop asciidoc and upx deps

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild | 6 +-----
 sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild b/sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild
index 41c78e9eeffb..61890936d0a1 100644
--- a/sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild
+++ b/sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild
@@ -19,11 +19,7 @@ REQUIRED_USE="|| ( bios efi )
 
 BDEPEND="
 	dev-lang/perl
-	bios? (
-		app-arch/upx
-		app-text/asciidoc
-		dev-lang/nasm
-	)
+	bios? ( dev-lang/nasm )
 "
 RDEPEND="
 	sys-apps/util-linux

diff --git a/sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild b/sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild
index 65c9463b4d12..d1f4f1c97f13 100644
--- a/sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild
+++ b/sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild
@@ -21,11 +21,7 @@ RESTRICT="test"
 
 BDEPEND="
 	dev-lang/perl
-	bios? (
-		app-arch/upx
-		app-text/asciidoc
-		dev-lang/nasm
-	)
+	bios? ( dev-lang/nasm )
 "
 RDEPEND="
 	sys-apps/util-linux

[gentoo-commits] repo/gentoo:master commit in: sys-boot/syslinux/

[Arthur Zamarin]

commit:     256ce8c30bbe2dc50c8910edfb562f3de5857d13
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 25 17:11:07 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 25 17:11:07 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=256ce8c3

sys-boot/syslinux: Stabilize 6.04_pre1-r5 amd64, #887571

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild b/sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild
index 098664deace9..b363d64c3d32 100644
--- a/sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild
+++ b/sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/boot/syslinux/Testing/6.04/${MY_
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 x86"
+KEYWORDS="-* amd64 x86"
 IUSE="abi_x86_32 abi_x86_64 +bios +efi"
 REQUIRED_USE="|| ( bios efi )
 	efi? ( || ( abi_x86_32 abi_x86_64 ) )"

[gentoo-commits] repo/gentoo:master commit in: sys-boot/syslinux/

[Mike Gilbert]

commit:     6abf07eaaf5a78c29fb065ba3ba3bfbe3a0f8a7b
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 25 23:50:20 2022 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Dec 25 23:50:49 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6abf07ea

sys-boot/syslinux: unset CFLAGS

Closes: https://bugs.gentoo.org/888466
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild | 2 +-
 sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild b/sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild
index b363d64c3d32..df1dd06bfa03 100644
--- a/sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild
+++ b/sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild
@@ -52,7 +52,7 @@ src_compile() {
 	local HEXDATE=$(printf '0x%08x' "${DATE}")
 
 	tc-export AR CC LD OBJCOPY RANLIB
-	unset LDFLAGS
+	unset CFLAGS LDFLAGS
 
 	if use bios; then
 		emake bios DATE="${DATE}" HEXDATE="${HEXDATE}"

diff --git a/sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild b/sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild
index d1f4f1c97f13..a942b7d05b86 100644
--- a/sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild
+++ b/sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild
@@ -69,7 +69,7 @@ src_compile() {
 	local HEXDATE=$(printf '0x%08x' "${DATE}")
 
 	tc-export AR CC LD OBJCOPY RANLIB
-	unset LDFLAGS
+	unset CFLAGS LDFLAGS
 
 	if use bios; then
 		emake bios DATE="${DATE}" HEXDATE="${HEXDATE}"

[gentoo-commits] repo/gentoo:master commit in: sys-boot/syslinux/

[Mike Gilbert]

commit:     9acd8ef9867c41398a6457a56e3aa7b6f6ac2c5d
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 27 16:47:43 2022 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Dec 27 16:48:32 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9acd8ef9

sys-boot/syslinux: fix install with bios disabled

Closes: https://bugs.gentoo.org/888466
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild | 4 +++-
 sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild b/sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild
index df1dd06bfa03..61289b005cc2 100644
--- a/sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild
+++ b/sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild
@@ -80,7 +80,9 @@ src_install() {
 		install
 	)
 	emake -j1 "${args[@]}"
-	mv "${ED}"/usr/bin/keytab-{lilo,syslinux} || die
+	if use bios; then
+		mv "${ED}"/usr/bin/keytab-{lilo,syslinux} || die
+	fi
 	einstalldocs
 	dostrip -x /usr/share/syslinux
 }

diff --git a/sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild b/sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild
index a942b7d05b86..e42f6139206e 100644
--- a/sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild
+++ b/sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild
@@ -97,7 +97,9 @@ src_install() {
 		install
 	)
 	emake -j1 "${args[@]}"
-	mv "${ED}"/usr/bin/keytab-{lilo,syslinux} || die
+	if use bios; then
+		mv "${ED}"/usr/bin/keytab-{lilo,syslinux} || die
+	fi
 	einstalldocs
 	dostrip -x /usr/share/syslinux
 }

[gentoo-commits] repo/gentoo:master commit in: sys-boot/syslinux/

[Andrew Ammerlaan]

commit:     2900f329ad5c0e17c6f29458d05418cdd13e9774
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 12 07:37:29 2023 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Aug 17 07:48:40 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2900f329

sys-boot/syslinux: use secureboot.eclass to sign efi exec

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild | 10 ++++++++--
 sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild | 10 ++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild b/sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild
index 61289b005cc2..6b5cb5abcf12 100644
--- a/sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild
+++ b/sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit toolchain-funcs flag-o-matic
+inherit toolchain-funcs flag-o-matic secureboot
 
 DESCRIPTION="SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders"
 HOMEPAGE="https://www.syslinux.org/"
@@ -38,6 +38,10 @@ QA_WX_LOAD="usr/share/syslinux/*"
 QA_PRESTRIPPED="usr/share/syslinux/.*"
 QA_FLAGS_IGNORED=".*"
 
+pkg_setup() {
+	use efi && secureboot_pkg_setup
+}
+
 src_prepare() {
 	local PATCHES=(
 		"${FILESDIR}/syslinux-6.03-sysmacros.patch"
@@ -85,4 +89,6 @@ src_install() {
 	fi
 	einstalldocs
 	dostrip -x /usr/share/syslinux
+
+	use efi && secureboot_auto_sign --in-place
 }

diff --git a/sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild b/sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild
index e42f6139206e..b483d5b273d2 100644
--- a/sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild
+++ b/sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit toolchain-funcs flag-o-matic
+inherit toolchain-funcs flag-o-matic secureboot
 
 DESCRIPTION="SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders"
 HOMEPAGE="https://www.syslinux.org/"
@@ -41,6 +41,10 @@ QA_WX_LOAD="usr/share/syslinux/*"
 QA_PRESTRIPPED="usr/share/syslinux/.*"
 QA_FLAGS_IGNORED=".*"
 
+pkg_setup() {
+	use efi && secureboot_pkg_setup
+}
+
 src_prepare() {
 	local PATCHES=(
 		"${FILESDIR}/6.04_pre1"
@@ -102,4 +106,6 @@ src_install() {
 	fi
 	einstalldocs
 	dostrip -x /usr/share/syslinux
+
+	use efi && secureboot_auto_sign --in-place
 }

[gentoo-commits] repo/gentoo:master commit in: sys-boot/syslinux/

[Sam James]

commit:     83de7565f4e223ec6b276a84acd7d093d9c99569
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 18 10:08:10 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 18 10:08:10 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83de7565

sys-boot/syslinux: drop binutils patch from 6.04_pre3

It doesn't apply there.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild b/sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild
index 0320264c2fdd..b483d5b273d2 100644
--- a/sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild
+++ b/sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild
@@ -49,7 +49,6 @@ src_prepare() {
 	local PATCHES=(
 		"${FILESDIR}/6.04_pre1"
 		"${FILESDIR}/6.04_pre3"
-		"${FILESDIR}/syslinux-6.04-binutils-2.41.patch"
 	)
 	default
 }

[gentoo-commits] repo/gentoo:master commit in: sys-boot/syslinux/

[Andrew Ammerlaan]

commit:     9d0a5f4cfd6cecefa59977551971e07f392a293a
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 26 14:53:23 2023 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun Jan  7 17:19:09 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d0a5f4c

sys-boot/syslinux: rename USE=efi to USE=uefi

Signed-off-by: David Seifert <soap <AT> gentoo.org>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sys-boot/syslinux/metadata.xml                 |  2 +-
 sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild | 14 +++++++-------
 sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild | 16 ++++++++--------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/sys-boot/syslinux/metadata.xml b/sys-boot/syslinux/metadata.xml
index ca6327ed17a2..1ba8d83fd2b4 100644
--- a/sys-boot/syslinux/metadata.xml
+++ b/sys-boot/syslinux/metadata.xml
@@ -10,7 +10,7 @@
 	</maintainer>
 	<use>
 		<flag name="bios">Enable BIOS support</flag>
-		<flag name="efi">Enable EFI support</flag>
+		<flag name="uefi">Enable UEFI support</flag>
 	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:gentoo:syslinux</remote-id>

diff --git a/sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild b/sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild
index 7ba486a0a92a..cc03c3c95fd0 100644
--- a/sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild
+++ b/sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild
@@ -13,9 +13,9 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/boot/syslinux/Testing/6.04/${MY_
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-* amd64 x86"
-IUSE="abi_x86_32 abi_x86_64 +bios +efi"
-REQUIRED_USE="|| ( bios efi )
-	efi? ( || ( abi_x86_32 abi_x86_64 ) )"
+IUSE="abi_x86_32 abi_x86_64 +bios +uefi"
+REQUIRED_USE="|| ( bios uefi )
+	uefi? ( || ( abi_x86_32 abi_x86_64 ) )"
 
 BDEPEND="
 	dev-lang/perl
@@ -39,7 +39,7 @@ QA_PRESTRIPPED="usr/share/syslinux/.*"
 QA_FLAGS_IGNORED=".*"
 
 pkg_setup() {
-	use efi && secureboot_pkg_setup
+	use uefi && secureboot_pkg_setup
 }
 
 src_prepare() {
@@ -62,7 +62,7 @@ src_compile() {
 	if use bios; then
 		emake bios DATE="${DATE}" HEXDATE="${HEXDATE}"
 	fi
-	if use efi; then
+	if use uefi; then
 		if use abi_x86_32; then
 			emake efi32 DATE="${DATE}" HEXDATE="${HEXDATE}"
 		fi
@@ -74,7 +74,7 @@ src_compile() {
 
 src_install() {
 	local firmware=( $(usev bios) )
-	if use efi; then
+	if use uefi; then
 		use abi_x86_32 && firmware+=( efi32 )
 		use abi_x86_64 && firmware+=( efi64 )
 	fi
@@ -91,5 +91,5 @@ src_install() {
 	einstalldocs
 	dostrip -x /usr/share/syslinux
 
-	use efi && secureboot_auto_sign --in-place
+	use uefi && secureboot_auto_sign --in-place
 }

diff --git a/sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild b/sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild
index b483d5b273d2..36ba918ffe7b 100644
--- a/sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild
+++ b/sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild
@@ -13,9 +13,9 @@ SRC_URI="https://git.zytor.com/syslinux/syslinux.git/snapshot/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 #KEYWORDS="-* ~amd64 ~x86"
-IUSE="abi_x86_32 abi_x86_64 +bios +efi"
-REQUIRED_USE="|| ( bios efi )
-	efi? ( || ( abi_x86_32 abi_x86_64 ) )"
+IUSE="abi_x86_32 abi_x86_64 +bios +uefi"
+REQUIRED_USE="|| ( bios uefi )
+	uefi? ( || ( abi_x86_32 abi_x86_64 ) )"
 
 RESTRICT="test"
 
@@ -30,7 +30,7 @@ RDEPEND="
 	dev-perl/Digest-SHA1
 "
 DEPEND="${RDEPEND}
-	efi? ( sys-boot/gnu-efi[abi_x86_32(-)?,abi_x86_64(-)?] )
+	uefi? ( sys-boot/gnu-efi[abi_x86_32(-)?,abi_x86_64(-)?] )
 	virtual/os-headers
 "
 
@@ -42,7 +42,7 @@ QA_PRESTRIPPED="usr/share/syslinux/.*"
 QA_FLAGS_IGNORED=".*"
 
 pkg_setup() {
-	use efi && secureboot_pkg_setup
+	use uefi && secureboot_pkg_setup
 }
 
 src_prepare() {
@@ -78,7 +78,7 @@ src_compile() {
 	if use bios; then
 		emake bios DATE="${DATE}" HEXDATE="${HEXDATE}"
 	fi
-	if use efi; then
+	if use uefi; then
 		if use abi_x86_32; then
 			efimake x86 efi32 DATE="${DATE}" HEXDATE="${HEXDATE}"
 		fi
@@ -90,7 +90,7 @@ src_compile() {
 
 src_install() {
 	local firmware=( $(usev bios) )
-	if use efi; then
+	if use uefi; then
 		use abi_x86_32 && firmware+=( efi32 )
 		use abi_x86_64 && firmware+=( efi64 )
 	fi
@@ -107,5 +107,5 @@ src_install() {
 	einstalldocs
 	dostrip -x /usr/share/syslinux
 
-	use efi && secureboot_auto_sign --in-place
+	use uefi && secureboot_auto_sign --in-place
 }

[gentoo-commits] repo/gentoo:master commit in: sys-boot/syslinux/

[Ben Kohler]

commit:     9b88a06bc6250e2e1401497991a5ae0ecda81e97
Author:     Violet Purcell <vimproved <AT> inventati <DOT> org>
AuthorDate: Wed Oct 18 18:56:57 2023 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Wed Oct  9 16:45:29 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b88a06b

sys-boot/syslinux: pass UPX=false to make

When building with bios support, Syslinux attempts to call upx. However,
it is not a necessary build step and the build will just continue if it
fails. This commit passes UPX=false to make when built with bios support
to silence the command not found QA warnings.

Closes: https://bugs.gentoo.org/888211
Signed-off-by: Violet Purcell <vimproved <AT> inventati.org>
Closes: https://github.com/gentoo/gentoo/pull/33399
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild | 2 +-
 sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild b/sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild
index cc03c3c95fd0..b13e8ee8582b 100644
--- a/sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild
+++ b/sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild
@@ -60,7 +60,7 @@ src_compile() {
 	unset CFLAGS LDFLAGS
 
 	if use bios; then
-		emake bios DATE="${DATE}" HEXDATE="${HEXDATE}"
+		emake bios DATE="${DATE}" HEXDATE="${HEXDATE}" UPX=false
 	fi
 	if use uefi; then
 		if use abi_x86_32; then

diff --git a/sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild b/sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild
index 36ba918ffe7b..cc980c2f0157 100644
--- a/sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild
+++ b/sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild
@@ -76,7 +76,7 @@ src_compile() {
 	unset CFLAGS LDFLAGS
 
 	if use bios; then
-		emake bios DATE="${DATE}" HEXDATE="${HEXDATE}"
+		emake bios DATE="${DATE}" HEXDATE="${HEXDATE}" UPX=false
 	fi
 	if use uefi; then
 		if use abi_x86_32; then