commit: fee41a15bc05f26adfc18a811cd87a2eac36a568 Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> AuthorDate: Mon Oct 6 12:35:46 2025 +0000 Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> CommitDate: Mon Oct 6 12:35:46 2025 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=fee41a15
sys-boot/syslinux: treeclean Works in ::gentoo Link: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3da37ce Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org> sys-boot/syslinux/Manifest | 1 - .../syslinux/files/syslinux-6.03-sysmacros.patch | 34 --- .../files/syslinux-6.04_pre1-fcommon.patch | 54 ---- .../syslinux-6.04_pre1-singleloadsegment.patch | 304 --------------------- sys-boot/syslinux/files/syslinux-musl.patch | 24 -- sys-boot/syslinux/metadata.xml | 14 - sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild | 120 -------- 7 files changed, 551 deletions(-) diff --git a/sys-boot/syslinux/Manifest b/sys-boot/syslinux/Manifest deleted file mode 100644 index 10c5556e..00000000 --- a/sys-boot/syslinux/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST syslinux-6.04-pre1.tar.xz 5283272 BLAKE2B 800e5977ed13b26a1756c33d8625e850631b642e26a86e3328196ddd998596693c3a26db0ada4c0ba78a4ba692a1cc01886b6eb693d877ddafcfb325ecdeb639 SHA512 7927dd39be8e2dcf4138a6fea33def67d19d938379d694f15b48fdd2f5924c028b7a9e7bd71d0c7c6630c203e9e2a54296628e530632ad5e6f55b1ebefe8fc98 diff --git a/sys-boot/syslinux/files/syslinux-6.03-sysmacros.patch b/sys-boot/syslinux/files/syslinux-6.03-sysmacros.patch deleted file mode 100644 index af464fe5..00000000 --- a/sys-boot/syslinux/files/syslinux-6.03-sysmacros.patch +++ /dev/null @@ -1,34 +0,0 @@ -https://bugs.gentoo.org/579928 - -From d84db34dbe39d55b4d7e868764c056689aa0793b Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <[email protected]> -Date: Tue, 19 Apr 2016 01:56:41 -0400 -Subject: [PATCH] extlinux: pull in sys/sysmacros.h for major/minor/makedev - -These functions are defined in sys/sysmacros.h, so add the include to -main.c. This is already handled correctly in mountinfo.c. Otherwise -we get build failures like: - -main.o: In function 'find_device_sysfs': -extlinux/main.c:1131: undefined reference to 'minor' - -Signed-off-by: Mike Frysinger <[email protected]> ---- - extlinux/main.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/extlinux/main.c b/extlinux/main.c -index a7ebd49..ebff7ea 100644 ---- a/extlinux/main.c -+++ b/extlinux/main.c -@@ -38,6 +38,7 @@ - #include <sysexits.h> - #include <sys/ioctl.h> - #include <sys/stat.h> -+#include <sys/sysmacros.h> - #include <sys/types.h> - #include <sys/mount.h> - #include <sys/vfs.h> --- -2.7.4 - diff --git a/sys-boot/syslinux/files/syslinux-6.04_pre1-fcommon.patch b/sys-boot/syslinux/files/syslinux-6.04_pre1-fcommon.patch deleted file mode 100644 index 7d061db2..00000000 --- a/sys-boot/syslinux/files/syslinux-6.04_pre1-fcommon.patch +++ /dev/null @@ -1,54 +0,0 @@ -https://bugs.gentoo.org/705730 - -gcc-10 enabled f-no-common by default. Broke syslinux linking. ---- a/mk/com32.mk -+++ b/mk/com32.mk -@@ -47,6 +47,7 @@ GCCOPT += $(call gcc_ok,-falign-functions=0,-malign-functions=0) - GCCOPT += $(call gcc_ok,-falign-jumps=0,-malign-jumps=0) - GCCOPT += $(call gcc_ok,-falign-labels=0,-malign-labels=0) - GCCOPT += $(call gcc_ok,-falign-loops=0,-malign-loops=0) -+GCCOPT += $(call gcc_ok,-fcommon) - - ifeq ($(FWCLASS),EFI) - GCCOPT += -mno-red-zone ---- a/mk/elf.mk -+++ b/mk/elf.mk -@@ -42,6 +42,7 @@ GCCOPT += $(call gcc_ok,-falign-functions=0,-malign-functions=0) - GCCOPT += $(call gcc_ok,-falign-jumps=0,-malign-jumps=0) - GCCOPT += $(call gcc_ok,-falign-labels=0,-malign-labels=0) - GCCOPT += $(call gcc_ok,-falign-loops=0,-malign-loops=0) -+GCCOPT += $(call gcc_ok,-fcommon) - - com32 = $(topdir)/com32 - core = $(topdir)/core ---- a/mk/embedded.mk -+++ b/mk/embedded.mk -@@ -51,6 +51,7 @@ GCCOPT += $(call gcc_ok,-falign-jumps=0,-malign-jumps=0) - GCCOPT += $(call gcc_ok,-falign-labels=0,-malign-labels=0) - GCCOPT += $(call gcc_ok,-falign-loops=0,-malign-loops=0) - GCCOPT += $(call gcc_ok,-fvisibility=hidden) -+GCCOPT += $(call gcc_ok,-fcommon) - - LIBGCC := $(shell $(CC) $(GCCOPT) --print-libgcc) - ---- a/mk/lib.mk -+++ b/mk/lib.mk -@@ -28,6 +28,7 @@ GCCOPT += $(call gcc_ok,-falign-functions=0,-malign-functions=0) - GCCOPT += $(call gcc_ok,-falign-jumps=0,-malign-jumps=0) - GCCOPT += $(call gcc_ok,-falign-labels=0,-malign-labels=0) - GCCOPT += $(call gcc_ok,-falign-loops=0,-malign-loops=0) -+GCCOPT += $(call gcc_ok,-fcommon) - - INCLUDE = -I$(SRC) - STRIP = strip --strip-all -R .comment -R .note ---- a/mk/efi.mk -+++ b/mk/efi.mk -@@ -7,7 +7,7 @@ core = $(topdir)/core - # Set up architecture specifics; for cross compilation, set ARCH as apt - # gnuefi sets up architecture specifics in ia32 or x86_64 sub directories - # set up the LIBDIR and EFIINC for building for the appropriate architecture --GCCOPT := $(call gcc_ok,-fno-stack-protector,) -+GCCOPT := $(call gcc_ok,-fno-stack-protector,) $(call gcc_ok,-fcommon) - EFIINC = $(objdir)/include/efi - LIBDIR = $(objdir)/lib - diff --git a/sys-boot/syslinux/files/syslinux-6.04_pre1-singleloadsegment.patch b/sys-boot/syslinux/files/syslinux-6.04_pre1-singleloadsegment.patch deleted file mode 100644 index db9b7d0a..00000000 --- a/sys-boot/syslinux/files/syslinux-6.04_pre1-singleloadsegment.patch +++ /dev/null @@ -1,304 +0,0 @@ -Author: Lukas Schwaighofer <[email protected]> -Description: Force the linker to put all sections into a single PT_LOAD - segment. This is required when using binutils >= 2.31 which writes two PT_LOAD - segments by default. This is not supported by the wrapper.c script used to - convert the shared object into an elf binary. -Forwarded: https://www.syslinux.org/archives/2018-August/026167.html - ---- - efi/i386/syslinux.ld | 37 +++++++++++++++++++++---------------- - efi/x86_64/syslinux.ld | 37 +++++++++++++++++++++---------------- - 2 files changed, 42 insertions(+), 32 deletions(-) - -diff --git a/efi/i386/syslinux.ld b/efi/i386/syslinux.ld -index bab3fc7..5b4589d 100644 ---- a/efi/i386/syslinux.ld -+++ b/efi/i386/syslinux.ld -@@ -19,6 +19,11 @@ OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386") - OUTPUT_ARCH(i386) - ENTRY(_start) - -+PHDRS -+{ -+ all PT_LOAD ; -+} -+ - SECTIONS - { - . = 0; -@@ -31,7 +36,7 @@ SECTIONS - *(.text) - *(.text.*) - __text_end = .; -- } -+ } :all - - . = ALIGN(16); - -@@ -40,7 +45,7 @@ SECTIONS - *(.rodata) - *(.rodata.*) - __rodata_end = .; -- } -+ } :all - - . = ALIGN(4); - -@@ -49,14 +54,14 @@ SECTIONS - KEEP (*(SORT(.ctors.*))) - KEEP (*(.ctors)) - __ctors_end = .; -- } -+ } :all - - .dtors : { - __dtors_start = .; - KEEP (*(SORT(.dtors.*))) - KEEP (*(.dtors)) - __dtors_end = .; -- } -+ } :all - - . = ALIGN(4096); - .rel : { -@@ -64,7 +69,7 @@ SECTIONS - *(.rel.data) - *(.rel.data.*) - *(.rel.ctors) -- } -+ } :all - - . = ALIGN(4); - -@@ -72,14 +77,14 @@ SECTIONS - __gnu_hash_start = .; - *(.gnu.hash) - __gnu_hash_end = .; -- } -+ } :all - - - .dynsym : { - __dynsym_start = .; - *(.dynsym) - __dynsym_end = .; -- } -+ } :all - - . = ALIGN(4); - -@@ -87,7 +92,7 @@ SECTIONS - __dynstr_start = .; - *(.dynstr) - __dynstr_end = .; -- } -+ } :all - - . = ALIGN(4); - -@@ -104,7 +109,7 @@ SECTIONS - KEEP (*(.got.plt)) - KEEP (*(.got)) - __got_end = .; -- } -+ } :all - - . = ALIGN(4); - -@@ -112,7 +117,7 @@ SECTIONS - __dynamic_start = .; - *(.dynamic) - __dynamic_end = .; -- } -+ } :all - - . = ALIGN(16); - -@@ -122,19 +127,19 @@ SECTIONS - *(.data.*) - *(.lowmem) - __data_end = .; -- } -+ } :all - - .reloc : { - *(.reloc) -- } -+ } :all - - .symtab : { - *(.symtab) -- } -+ } :all - - .strtab : { - *(.strtab) -- } -+ } :all - - .bss (NOLOAD) : { - /* the EFI loader doesn't seem to like a .bss section, -@@ -148,7 +153,7 @@ SECTIONS - __bss_end = .; - *(.sbss) - *(.scommon) -- } -+ } :all - __bss_len = ABSOLUTE(__bss_end) - ABSOLUTE(__bss_start); - __bss_dwords = (__bss_len + 3) >> 2; - -@@ -161,7 +166,7 @@ SECTIONS - *(.hugebss) - *(.hugebss.*) - __hugebss_end = .; -- } -+ } :all - - _end = .; - -diff --git a/efi/x86_64/syslinux.ld b/efi/x86_64/syslinux.ld -index 450641c..cad28a8 100644 ---- a/efi/x86_64/syslinux.ld -+++ b/efi/x86_64/syslinux.ld -@@ -19,6 +19,11 @@ OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64") - OUTPUT_ARCH(i386:x86-64) - ENTRY(_start) - -+PHDRS -+{ -+ all PT_LOAD ; -+} -+ - SECTIONS - { - . = 0; -@@ -31,7 +36,7 @@ SECTIONS - *(.text) - *(.text.*) - __text_end = .; -- } -+ } :all - - . = ALIGN(16); - -@@ -40,7 +45,7 @@ SECTIONS - *(.rodata) - *(.rodata.*) - __rodata_end = .; -- } -+ } :all - - . = ALIGN(4); - -@@ -49,14 +54,14 @@ SECTIONS - KEEP (*(SORT(.ctors.*))) - KEEP (*(.ctors)) - __ctors_end = .; -- } -+ } :all - - .dtors : { - __dtors_start = .; - KEEP (*(SORT(.dtors.*))) - KEEP (*(.dtors)) - __dtors_end = .; -- } -+ } :all - - . = ALIGN(4096); - .rel : { -@@ -64,7 +69,7 @@ SECTIONS - *(.rel.data) - *(.rel.data.*) - *(.rel.ctors) -- } -+ } :all - - . = ALIGN(4); - -@@ -72,14 +77,14 @@ SECTIONS - __gnu_hash_start = .; - *(.gnu.hash) - __gnu_hash_end = .; -- } -+ } :all - - - .dynsym : { - __dynsym_start = .; - *(.dynsym) - __dynsym_end = .; -- } -+ } :all - - . = ALIGN(4); - -@@ -87,7 +92,7 @@ SECTIONS - __dynstr_start = .; - *(.dynstr) - __dynstr_end = .; -- } -+ } :all - - . = ALIGN(4); - -@@ -104,7 +109,7 @@ SECTIONS - KEEP (*(.got.plt)) - KEEP (*(.got)) - __got_end = .; -- } -+ } :all - - . = ALIGN(4); - -@@ -112,7 +117,7 @@ SECTIONS - __dynamic_start = .; - *(.dynamic) - __dynamic_end = .; -- } -+ } :all - - . = ALIGN(16); - -@@ -122,19 +127,19 @@ SECTIONS - *(.data.*) - *(.lowmem) - __data_end = .; -- } -+ } :all - - .reloc : { - *(.reloc) -- } -+ } :all - - .symtab : { - *(.symtab) -- } -+ } :all - - .strtab : { - *(.strtab) -- } -+ } :all - - .bss (NOLOAD) : { - /* the EFI loader doesn't seem to like a .bss section, -@@ -148,7 +153,7 @@ SECTIONS - __bss_end = .; - *(.sbss) - *(.scommon) -- } -+ } :all - __bss_len = ABSOLUTE(__bss_end) - ABSOLUTE(__bss_start); - __bss_dwords = (__bss_len + 3) >> 2; - -@@ -161,7 +166,7 @@ SECTIONS - *(.hugebss) - *(.hugebss.*) - __hugebss_end = .; -- } -+ } :all - - _end = .; - diff --git a/sys-boot/syslinux/files/syslinux-musl.patch b/sys-boot/syslinux/files/syslinux-musl.patch deleted file mode 100644 index a707bd7a..00000000 --- a/sys-boot/syslinux/files/syslinux-musl.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- syslinux-6.04-pre1/efi/wrapper.h.orig 2018-05-28 09:29:03.313673979 +0000 -+++ syslinux-6.04-pre1/efi/wrapper.h 2018-05-28 09:22:27.546908344 +0000 -@@ -26,6 +26,21 @@ - #define __packed __attribute__((packed)) - #define OFFSETOF(t,m) ((size_t)&((t *)0)->m) - -+#include <stdint.h> -+ -+#ifndef __uint8_t -+#define __uint8_t uint8_t -+#endif -+#ifndef __uint16_t -+#define __uint16_t uint16_t -+#endif -+#ifndef __uint32_t -+#define __uint32_t uint32_t -+#endif -+#ifndef __uint64_t -+#define __uint64_t uint64_t -+#endif -+ - struct header { - __uint16_t msdos_signature; - __uint8_t _pad1[0x16]; diff --git a/sys-boot/syslinux/metadata.xml b/sys-boot/syslinux/metadata.xml deleted file mode 100644 index 423c8b85..00000000 --- a/sys-boot/syslinux/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> -<maintainer type="person"> - <email>[email protected]</email> -</maintainer> -<maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo Base System</name> -</maintainer> -<upstream> - <remote-id type="cpe">cpe:/a:gentoo:syslinux</remote-id> -</upstream> -</pkgmetadata> 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 ca2ef348..00000000 --- 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-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 - "${FILESDIR}"/${PN}-musl.patch -) - -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 -}
