From b46782805d0eed36ce9685f7e9abf25671f24d7d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 21 Dec 2022 01:52:56 +0000 Subject: gentoo auto-resync : 21:12:2022 - 01:52:55 --- sys-boot/Manifest.gz | Bin 6225 -> 6226 bytes sys-boot/syslinux/Manifest | 6 +- sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild | 120 ------------------------ sys-boot/syslinux/syslinux-6.04_pre1-r3.ebuild | 87 ------------------ sys-boot/syslinux/syslinux-6.04_pre1-r4.ebuild | 121 +++++++++++++++++++++++++ sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild | 88 ++++++++++++++++++ sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild | 105 +++++++++++++++++++++ sys-boot/syslinux/syslinux-6.04_pre3.ebuild | 104 --------------------- 8 files changed, 317 insertions(+), 314 deletions(-) delete mode 100644 sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild delete mode 100644 sys-boot/syslinux/syslinux-6.04_pre1-r3.ebuild create mode 100644 sys-boot/syslinux/syslinux-6.04_pre1-r4.ebuild create mode 100644 sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild create mode 100644 sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild delete mode 100644 sys-boot/syslinux/syslinux-6.04_pre3.ebuild (limited to 'sys-boot') diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz index abdb10a595a4..bb3e5d7b4669 100644 Binary files a/sys-boot/Manifest.gz and b/sys-boot/Manifest.gz differ diff --git a/sys-boot/syslinux/Manifest b/sys-boot/syslinux/Manifest index 799f0015dbb7..56bf950a95ef 100644 --- a/sys-boot/syslinux/Manifest +++ b/sys-boot/syslinux/Manifest @@ -8,7 +8,7 @@ AUX syslinux-6.04_pre1-fcommon.patch 2111 BLAKE2B 6b0d047cc729e7e9c9658ccd6ecd11 AUX syslinux-6.04_pre1-singleloadsegment.patch 4744 BLAKE2B a28ff29b9a4bdd2cb65a6700c96ff99ba1a045a401d50587efe59d703f12aca3e47a14a8e7a569c50f11d367545990d09c35f90362efe49d0c9d489802885879 SHA512 9585edfc8ab0e22d4d7757ccdc435c198c5457466fb4fdefc1829cbbe8951f3406b7b51eea56044cc297d29e45772e2154e5746e6d9b92310f17c880c950ff8a DIST syslinux-6.04-pre1.tar.xz 5283272 BLAKE2B 800e5977ed13b26a1756c33d8625e850631b642e26a86e3328196ddd998596693c3a26db0ada4c0ba78a4ba692a1cc01886b6eb693d877ddafcfb325ecdeb639 SHA512 7927dd39be8e2dcf4138a6fea33def67d19d938379d694f15b48fdd2f5924c028b7a9e7bd71d0c7c6630c203e9e2a54296628e530632ad5e6f55b1ebefe8fc98 DIST syslinux-6.04-pre3.tar.gz 10760898 BLAKE2B 708bb7f3ecbe1888471f3be0102270c056bf8c5be22013f36b56c90f13f5358ce1853722b14b962d8156cd1f045b9687166b98a1d7ad2853acbe6303fa40fae9 SHA512 0619a25347f3964e0c7c6ff629b2f59f01bd9e0afd822f46b67f26b8c84cbc55534cf7b22ff1bf83eec4986fd2d8f1646a3d750190a7c6c50251affc0b62594d -EBUILD syslinux-6.04_pre1-r2.ebuild 3251 BLAKE2B 6a9d50d935e133a6937b55c05b5f06f53c01ea20427583b4cdf5d7d1976778d653fe77d083ac3df86d9c38ff10e01db9f735e878ebf26f99937174fe29b30b77 SHA512 621bafdbdca728e8c7abf3331e13eba7a0d672215adf7fab51225394c9ee4e433323751911a58984785a9a58d01dc393752632f3d3d28c46699201d364db20d2 -EBUILD syslinux-6.04_pre1-r3.ebuild 1746 BLAKE2B 4d38a809948cab9409fb967dd7bf1a9dfc90c0c79949f302c1a7a3647438524b8655a9ed734e9c012880c85302cd43d4e240d48bf5fbfcf35cb0e6cd2564480a SHA512 66903bac7048317a4545bed655e3de728665f6ddba37a3816274ba7d141f3871e78c953b9284146ce8befd01ba55b450934f06edb3825e2043106c739431a6ad -EBUILD syslinux-6.04_pre3.ebuild 2046 BLAKE2B ad2c55bac63b277be423c498c26b797ad3d3600b08e5226fd4d03796e90e421dde7048bc37c1e695998cd456f6bf514b60634ab3d157949d958362d309d527bd SHA512 3063a203d92afbcdf412e8456c2417650a3beb0f3ed0d0d30b0f135fb0fdd91647c7c4af78cec18a9e7159b0086e0b6f4b5eead9541180cdbc4d10fb6b45ea13 +EBUILD syslinux-6.04_pre1-r4.ebuild 3301 BLAKE2B 272666e8c6155125d021c153ae9645acd33e23b95e65161509edaca713c655dd1244ba6d0e136e6ca3b6a57f3201168c1b3da93e48294d1810ffb2a948a20f0c SHA512 051f83dcc11aee5747ed6b92d16f165702fb48ce8429d98cf8eb92d39ff2715f3cafab44ff98ab49b5b921f5c21f48d0e75e06a7580dc2344f57ecd442d29377 +EBUILD syslinux-6.04_pre1-r5.ebuild 1796 BLAKE2B 6ae143294462ab8289bb84b30e54f38fbf0afa4ede134a70339f6922d19d6a3308b0d982005bcc236c1c399edca504a2ee7a63190209e3c2bee96b89b5f2fc10 SHA512 3efd7d5dfe3bc2c8598af1fbe51e4542e36045131520109ac859aff19c72fe2088c3e968155e35dd79f191c02fb6f2aef2bcce17456827084fac979390e378e0 +EBUILD syslinux-6.04_pre3-r1.ebuild 2096 BLAKE2B ee5d18330cb0107439c0ba4e6d147c0f99c30c4be8910629cd2b11c0e5bd2a452cd8488fc9e1b395a47ca2b142f463949648bb6bf786a414657c75796d918d40 SHA512 24b5653ca25824d75d7a98ca1e0815176ced0b77ecbd82ec617ade2f69af4fecd97de656c725dab91a14a6bd9d091ea2f6575b123a647d9b2dae18c31ff87c46 MISC metadata.xml 529 BLAKE2B 8d1614f7254b20836e2bc0f650ae2e3795fd665119bc2d1427e236a417c5c82699929c0291f4b12c04ba2ac387f9d6650682d0d95802fdf333b1267367b4e75c SHA512 e80e9ba96972111b3c5cdea98fb032c50bb7f94a445785ed54d236933768ae2734d248c71ecf54f36d6b3641a7e15abdb4ef4c0b968d59d20ee9259019d32e38 diff --git a/sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild b/sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild deleted file mode 100644 index b0ed750f5a1e..000000000000 --- a/sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit 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-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 - 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 -} diff --git a/sys-boot/syslinux/syslinux-6.04_pre1-r3.ebuild b/sys-boot/syslinux/syslinux-6.04_pre1-r3.ebuild deleted file mode 100644 index 4fba6cac1462..000000000000 --- a/sys-boot/syslinux/syslinux-6.04_pre1-r3.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -DESCRIPTION="SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders" -HOMEPAGE="https://www.syslinux.org/" -MY_P=${P/_/-} -SRC_URI="https://www.kernel.org/pub/linux/utils/boot/syslinux/Testing/6.04/${MY_P}.tar.xz" - -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 ) )" - -BDEPEND=" - dev-lang/perl - bios? ( - app-arch/upx - app-text/asciidoc - dev-lang/nasm - ) -" -RDEPEND=" - sys-apps/util-linux - sys-fs/mtools - dev-perl/Crypt-PasswdMD5 - dev-perl/Digest-SHA1 -" -DEPEND="${RDEPEND} - virtual/os-headers -" - -S=${WORKDIR}/${MY_P} - -QA_EXECSTACK="usr/share/syslinux/*" -QA_WX_LOAD="usr/share/syslinux/*" -QA_PRESTRIPPED="usr/share/syslinux/.*" -QA_FLAGS_IGNORED=".*" - -src_prepare() { - local PATCHES=( - "${FILESDIR}/syslinux-6.03-sysmacros.patch" - "${FILESDIR}/${PV}" - ) - default -} -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 DATE="${DATE}" HEXDATE="${HEXDATE}" - fi - if use efi; then - if use abi_x86_32; then - emake efi32 DATE="${DATE}" HEXDATE="${HEXDATE}" - fi - if use abi_x86_64; then - emake efi64 DATE="${DATE}" HEXDATE="${HEXDATE}" - 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' - "${firmware[@]}" - install - ) - emake -j1 "${args[@]}" - einstalldocs - dostrip -x /usr/share/syslinux -} diff --git a/sys-boot/syslinux/syslinux-6.04_pre1-r4.ebuild b/sys-boot/syslinux/syslinux-6.04_pre1-r4.ebuild new file mode 100644 index 000000000000..cf6b824f1fdc --- /dev/null +++ b/sys-boot/syslinux/syslinux-6.04_pre1-r4.ebuild @@ -0,0 +1,121 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit 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-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 + 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 + mv "${ED}"/usr/bin/keytab-{lilo,syslinux} || die + dodoc README NEWS doc/*.txt +} diff --git a/sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild b/sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild new file mode 100644 index 000000000000..e4925c07622a --- /dev/null +++ b/sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders" +HOMEPAGE="https://www.syslinux.org/" +MY_P=${P/_/-} +SRC_URI="https://www.kernel.org/pub/linux/utils/boot/syslinux/Testing/6.04/${MY_P}.tar.xz" + +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 ) )" + +BDEPEND=" + dev-lang/perl + bios? ( + app-arch/upx + app-text/asciidoc + dev-lang/nasm + ) +" +RDEPEND=" + sys-apps/util-linux + sys-fs/mtools + dev-perl/Crypt-PasswdMD5 + dev-perl/Digest-SHA1 +" +DEPEND="${RDEPEND} + virtual/os-headers +" + +S=${WORKDIR}/${MY_P} + +QA_EXECSTACK="usr/share/syslinux/*" +QA_WX_LOAD="usr/share/syslinux/*" +QA_PRESTRIPPED="usr/share/syslinux/.*" +QA_FLAGS_IGNORED=".*" + +src_prepare() { + local PATCHES=( + "${FILESDIR}/syslinux-6.03-sysmacros.patch" + "${FILESDIR}/${PV}" + ) + default +} +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 DATE="${DATE}" HEXDATE="${HEXDATE}" + fi + if use efi; then + if use abi_x86_32; then + emake efi32 DATE="${DATE}" HEXDATE="${HEXDATE}" + fi + if use abi_x86_64; then + emake efi64 DATE="${DATE}" HEXDATE="${HEXDATE}" + 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' + "${firmware[@]}" + 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-r1.ebuild b/sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild new file mode 100644 index 000000000000..9c48e26d67c6 --- /dev/null +++ b/sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders" +HOMEPAGE="https://www.syslinux.org/" +MY_P=${P/_/-} +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 ) )" + +RESTRICT="test" + +BDEPEND=" + dev-lang/perl + bios? ( + app-arch/upx + app-text/asciidoc + dev-lang/nasm + ) +" +RDEPEND=" + sys-apps/util-linux + sys-fs/mtools + dev-perl/Crypt-PasswdMD5 + dev-perl/Digest-SHA1 +" +DEPEND="${RDEPEND} + efi? ( sys-boot/gnu-efi[abi_x86_32(-)?,abi_x86_64(-)?] ) + virtual/os-headers +" + +S=${WORKDIR}/${MY_P} + +QA_EXECSTACK="usr/share/syslinux/*" +QA_WX_LOAD="usr/share/syslinux/*" +QA_PRESTRIPPED="usr/share/syslinux/.*" +QA_FLAGS_IGNORED=".*" + +src_prepare() { + local PATCHES=( + "${FILESDIR}/6.04_pre1" + "${FILESDIR}/6.04_pre3" + ) + default +} + +efimake() { + local ABI="${1}" + local libdir="$(get_libdir)" + shift + local args=( + EFIINC="${ESYSROOT}/usr/include/efi" + LIBDIR="${ESYSROOT}/usr/${libdir}" + LIBEFI="${ESYSROOT}/usr/${libdir}/libefi.a" + "${@}" + ) + emake "${args[@]}" +} + +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 DATE="${DATE}" HEXDATE="${HEXDATE}" + fi + if use efi; then + if use abi_x86_32; then + efimake x86 efi32 DATE="${DATE}" HEXDATE="${HEXDATE}" + fi + if use abi_x86_64; then + efimake amd64 efi64 DATE="${DATE}" HEXDATE="${HEXDATE}" + 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' + "${firmware[@]}" + 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.ebuild deleted file mode 100644 index 9d2dcf602fe1..000000000000 --- a/sys-boot/syslinux/syslinux-6.04_pre3.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -DESCRIPTION="SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders" -HOMEPAGE="https://www.syslinux.org/" -MY_P=${P/_/-} -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 ) )" - -RESTRICT="test" - -BDEPEND=" - dev-lang/perl - bios? ( - app-arch/upx - app-text/asciidoc - dev-lang/nasm - ) -" -RDEPEND=" - sys-apps/util-linux - sys-fs/mtools - dev-perl/Crypt-PasswdMD5 - dev-perl/Digest-SHA1 -" -DEPEND="${RDEPEND} - efi? ( sys-boot/gnu-efi[abi_x86_32(-)?,abi_x86_64(-)?] ) - virtual/os-headers -" - -S=${WORKDIR}/${MY_P} - -QA_EXECSTACK="usr/share/syslinux/*" -QA_WX_LOAD="usr/share/syslinux/*" -QA_PRESTRIPPED="usr/share/syslinux/.*" -QA_FLAGS_IGNORED=".*" - -src_prepare() { - local PATCHES=( - "${FILESDIR}/6.04_pre1" - "${FILESDIR}/6.04_pre3" - ) - default -} - -efimake() { - local ABI="${1}" - local libdir="$(get_libdir)" - shift - local args=( - EFIINC="${ESYSROOT}/usr/include/efi" - LIBDIR="${ESYSROOT}/usr/${libdir}" - LIBEFI="${ESYSROOT}/usr/${libdir}/libefi.a" - "${@}" - ) - emake "${args[@]}" -} - -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 DATE="${DATE}" HEXDATE="${HEXDATE}" - fi - if use efi; then - if use abi_x86_32; then - efimake x86 efi32 DATE="${DATE}" HEXDATE="${HEXDATE}" - fi - if use abi_x86_64; then - efimake amd64 efi64 DATE="${DATE}" HEXDATE="${HEXDATE}" - 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' - "${firmware[@]}" - install - ) - emake -j1 "${args[@]}" - einstalldocs - dostrip -x /usr/share/syslinux -} -- cgit v1.2.3