summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sys-boot')
-rw-r--r--sys-boot/bootcreator/bootcreator-1.1.ebuild29
-rw-r--r--sys-boot/efibootmgr/Manifest1
-rw-r--r--sys-boot/efibootmgr/efibootmgr-17.ebuild39
-rw-r--r--sys-boot/efibootmgr/files/efibootmgr-17-clang.patch82
-rw-r--r--sys-boot/efibootmgr/files/efibootmgr-17-fix-efivar-37-conflict.patch14
-rw-r--r--sys-boot/grub/grub-2.04-r2.ebuild (renamed from sys-boot/grub/grub-2.04-r1.ebuild)2
-rw-r--r--sys-boot/grub/grub-2.05_alpha20200310-r1.ebuild (renamed from sys-boot/grub/grub-2.05_alpha20200310.ebuild)2
-rw-r--r--sys-boot/grub/grub-9999.ebuild2
-rw-r--r--sys-boot/grub/metadata.xml1
-rw-r--r--sys-boot/lilo/files/lilo-24.x-fix-gcc-10.patch51
-rw-r--r--sys-boot/lilo/lilo-24.1.ebuild10
-rw-r--r--sys-boot/lilo/lilo-24.2.ebuild1
-rw-r--r--sys-boot/palo/Manifest2
-rw-r--r--sys-boot/palo/files/palo-2.12-gcc10.patch11
-rw-r--r--sys-boot/palo/palo-2.12-r1.ebuild44
-rw-r--r--sys-boot/palo/palo-2.13.ebuild43
-rw-r--r--sys-boot/palo/palo-2.14.ebuild4
-rw-r--r--sys-boot/raspberrypi-firmware/Manifest5
-rw-r--r--sys-boot/raspberrypi-firmware/files/raspberrypi-firmware-0_p20130711-cmdline.txt1
-rw-r--r--sys-boot/raspberrypi-firmware/files/raspberrypi-firmware-1.20201022-cmdline.txt1
-rw-r--r--sys-boot/raspberrypi-firmware/files/raspberrypi-firmware-1.20201022-config.txt (renamed from sys-boot/raspberrypi-firmware/files/raspberrypi-firmware-0_p20130711-config.txt)58
-rw-r--r--sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20190709.ebuild60
-rw-r--r--sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20201022.ebuild (renamed from sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20190215.ebuild)64
-rw-r--r--sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20201201.ebuild (renamed from sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20190925.ebuild)66
-rw-r--r--sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild66
-rw-r--r--sys-boot/refind/files/refind-0.12.0-gcc10.patch11
-rw-r--r--sys-boot/refind/refind-0.11.4.ebuild8
-rw-r--r--sys-boot/refind/refind-0.12.0-r1.ebuild22
-rw-r--r--sys-boot/refind/refind-0.12.0.ebuild168
-rw-r--r--sys-boot/silo/Manifest3
-rw-r--r--sys-boot/silo/silo-1.4.14_p20120819-r1.ebuild71
-rw-r--r--sys-boot/silo/silo-1.4.14_p20170829.ebuild66
-rw-r--r--sys-boot/silo/silo-1.4.14_p20200602.ebuild28
-rw-r--r--sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild2
-rw-r--r--sys-boot/syslinux/syslinux-6.04_pre1.ebuild115
-rw-r--r--sys-boot/unetbootin/Manifest7
-rw-r--r--sys-boot/unetbootin/files/unetbootin-581-desktop.patch24
-rw-r--r--sys-boot/unetbootin/metadata.xml5
-rw-r--r--sys-boot/unetbootin/unetbootin-661.ebuild99
-rw-r--r--sys-boot/unetbootin/unetbootin-675.ebuild103
-rw-r--r--sys-boot/unetbootin/unetbootin-677-r1.ebuild111
-rw-r--r--sys-boot/unetbootin/unetbootin-700.ebuild (renamed from sys-boot/unetbootin/unetbootin-681.ebuild)35
-rw-r--r--sys-boot/yaboot/files/yaboot-nopiessp-gcc4.patch38
43 files changed, 397 insertions, 1178 deletions
diff --git a/sys-boot/bootcreator/bootcreator-1.1.ebuild b/sys-boot/bootcreator/bootcreator-1.1.ebuild
deleted file mode 100644
index 5f9a3fcc145..00000000000
--- a/sys-boot/bootcreator/bootcreator-1.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Simple generator for Forth based BootMenu scripts for Pegasos machines"
-HOMEPAGE="http://tbs-software.com/morgoth/projects.html"
-SRC_URI="http://tbs-software.com/morgoth/files/bootcreator-src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ppc"
-IUSE=""
-
-DEPEND=""
-
-S=${WORKDIR}
-
-src_compile() {
- emake all
-}
-
-src_install() {
- dosbin src/bootcreator
- dodoc doc/README
-
- insinto /etc
- newins examples/example.bc bootmenu.example
-}
diff --git a/sys-boot/efibootmgr/Manifest b/sys-boot/efibootmgr/Manifest
index 299c980bdb8..9eb28d6dd16 100644
--- a/sys-boot/efibootmgr/Manifest
+++ b/sys-boot/efibootmgr/Manifest
@@ -1,3 +1,4 @@
DIST efibootmgr-14.tar.bz2 34972 BLAKE2B 78490756c5fd449f4319b79e0818e9d80340bd487f57d0de34f79f48cc24eb7b9c7309b535d00efad4babd40904d4cfb085cca278170625a1e875961e423f5dd SHA512 97935f8752440ce236162e174ea3404e907ebddc5877d597a97813da76ad580689fc2e97044885fc860a12a473af7183242b6120e78e53243d35e569fb002baf
DIST efibootmgr-15.tar.bz2 35476 BLAKE2B 19b7c9ce51f3b930b2d59fa4a594c7a8bf5f1c7aa3224049e88cdafe82991799b1b719ec68c80131027f70c16bd19e38157f5d0bc7761843959410c667aa4070 SHA512 d9d9eef14d373d5da88141e8105f754fea4c039755ed0a0cb9b3c9c2bb285733ad930fd912df42075fe2cf750585699307b067f594d8e65269b3b8a5a00b1cd1
DIST efibootmgr-16.tar.bz2 36603 BLAKE2B 3d09a9d3c4ecd48010315fccae60ab408c0d08e9c734e86a944130ea03e038835fa08745819f5353efbbe36f5017be64faded4b625ef0a0b55d4ca0d612ef232 SHA512 936318c7163c07b716f89be3d830957d9db68ba1b059223f7ea3d9eafe0dbf1c91b9aee096f5aed70955c6052c3b8547295c0a47f17cdf43788259d87d1990b9
+DIST efibootmgr-17.tar.gz 41643 BLAKE2B a1995a5df74766f762d2eb971fd6095edea8d0a498c9dd1100515866b40c38ae2f299aae51f12767850ec23fbe4709c2c7428dd48755fbec499669b69f6432c9 SHA512 10c7ad9a79f23dcd4708dc4f42701196af7aa11f5e9a6468ea51f7013d4caeba6c92527ba1304f6e3b2ef3b51b3b69ea1a30f81bb099a8aea49eeb30eb631e1d
diff --git a/sys-boot/efibootmgr/efibootmgr-17.ebuild b/sys-boot/efibootmgr/efibootmgr-17.ebuild
new file mode 100644
index 00000000000..a6d695bcfe7
--- /dev/null
+++ b/sys-boot/efibootmgr/efibootmgr-17.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="User-space application to modify the EFI boot manager"
+HOMEPAGE="https://github.com/rhinstaller/efibootmgr"
+SRC_URI="https://github.com/rhboot/efibootmgr/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86"
+
+RDEPEND="
+ sys-apps/pciutils
+ >=sys-libs/efivar-37:=
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-fix-efivar-37-conflict.patch"
+ "${FILESDIR}/${P}-clang.patch"
+)
+
+src_prepare() {
+ default
+ sed -i 's/-Werror //' Make.defaults || die
+}
+
+src_configure() {
+ tc-export CC
+ export EFIDIR="Gentoo"
+}
+
+src_compile() {
+ emake PKG_CONFIG="$(tc-getPKG_CONFIG)"
+}
diff --git a/sys-boot/efibootmgr/files/efibootmgr-17-clang.patch b/sys-boot/efibootmgr/files/efibootmgr-17-clang.patch
new file mode 100644
index 00000000000..687b294c333
--- /dev/null
+++ b/sys-boot/efibootmgr/files/efibootmgr-17-clang.patch
@@ -0,0 +1,82 @@
+From 97668ae0bce776a36ea2001dea63d376be8274ac Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Wed, 6 Mar 2019 13:08:33 -0500
+Subject: [PATCH] Make sure PKGS= is propogated into the submake for "make
+ deps"
+
+When we're doing make deps with "$(CC) -MF", gcc and clang have different
+behavior, both broken in different ways, which we're hitting because of a
+missing -I argument for libefivar's includes. On clang, when a header can't
+be found, it emits a rule with the header as a prerequisite without a path,
+such as efivar.h here:
+
+efibootmgr.o: efibootmgr.c fix_coverity.h efivar.h efiboot.h \
+ /home/pjones/devel/github.com/efibootmgr/master/src/include/list.h \
+ /home/pjones/devel/github.com/efibootmgr/master/src/include/efi.h \
+ /home/pjones/devel/github.com/efibootmgr/master/src/include/unparse_path.h \
+ /home/pjones/devel/github.com/efibootmgr/master/src/include/efibootmgr.h \
+ error.h
+
+Then the build that utilizes that rule will fail to find the
+prerequisite and tell you something like:
+
+make[1]: *** No rule to make target 'efivar.h', needed by 'efibootmgr.o'. Stop.
+make[1]: Leaving directory '/home/pjones/devel/github.com/efibootmgr/master/src'
+
+With gcc, when a header can't be found, it emits a rule without that header
+as a prerequisite, as such (again with efivar.h):
+
+efibootmgr.o: efibootmgr.c fix_coverity.h \
+ /home/pjones/devel/github.com/efibootmgr/master/src/include/list.h \
+ /home/pjones/devel/github.com/efibootmgr/master/src/include/efi.h \
+ /home/pjones/devel/github.com/efibootmgr/master/src/include/unparse_path.h \
+ /home/pjones/devel/github.com/efibootmgr/master/src/include/efi.h \
+ /home/pjones/devel/github.com/efibootmgr/master/src/include/efibootmgr.h \
+ error.h
+
+And then your build will fail if you haven't adjusted CFLAGS to tell it
+where to find the header.
+
+Both of these would be better just erroring, but at least gcc's doesn't
+insert a *wrong* dependency.
+
+This patch adds "PKGS=efivar efibootmgr popt" for all deps under src/.
+Technically that's overkill, as efibootmgr itself doesn't need popt, but it
+doesn't hurt anything to have the extra part there. The resulting
+.efibootmgr.d file has the prerequisites expressed correctly:
+
+efibootmgr.o: efibootmgr.c fix_coverity.h /usr/include/efivar/efivar.h \
+ /usr/include/efivar/efiboot.h \
+ /home/pjones/devel/github.com/efibootmgr/master/src/include/list.h \
+ /home/pjones/devel/github.com/efibootmgr/master/src/include/efi.h \
+ /home/pjones/devel/github.com/efibootmgr/master/src/include/unparse_path.h \
+ /home/pjones/devel/github.com/efibootmgr/master/src/include/efi.h \
+ /home/pjones/devel/github.com/efibootmgr/master/src/include/efibootmgr.h \
+ error.h
+
+This fixes the issue described in github PR #96
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+---
+ src/Makefile | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index 258bac1..32fa188 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -31,8 +31,13 @@ efibootdump : PKGS=efivar efiboot popt
+ efibootnext : $(call objects-of,$(EFIBOOTNEXT_SOURCES))
+ efibootnext : PKGS=efivar efiboot popt
+
++deps : PKGS=efivar efiboot popt
+ deps : $(ALL_SOURCES)
+- $(MAKE) -f $(TOPDIR)/Make.deps deps SOURCES="$(ALL_SOURCES)" SUBDIR_CFLAGS="$(SUBDIR_CFLAGS)"
++ $(MAKE) -f $(TOPDIR)/Make.deps \
++ SOURCES="$(ALL_SOURCES)" \
++ SUBDIR_CFLAGS="$(SUBDIR_CFLAGS)" \
++ PKGS="$(PKGS)" \
++ deps
+
+ clean :
+ @rm -rfv *.o *.a *.so $(TARGETS)
diff --git a/sys-boot/efibootmgr/files/efibootmgr-17-fix-efivar-37-conflict.patch b/sys-boot/efibootmgr/files/efibootmgr-17-fix-efivar-37-conflict.patch
new file mode 100644
index 00000000000..614195f3c99
--- /dev/null
+++ b/sys-boot/efibootmgr/files/efibootmgr-17-fix-efivar-37-conflict.patch
@@ -0,0 +1,14 @@
+diff --git a/src/efibootmgr.c b/src/efibootmgr.c
+index de38f01..4e1a680 100644
+--- a/src/efibootmgr.c
++++ b/src/efibootmgr.c
+@@ -1536,9 +1536,6 @@ parse_opts(int argc, char **argv)
+ "invalid numeric value %s\n",
+ optarg);
+ }
+- /* XXX efivar-36 accidentally doesn't have a public
+- * header for this */
+- extern int efi_set_verbose(int verbosity, FILE *errlog);
+ efi_set_verbose(opts.verbose - 2, stderr);
+ break;
+ case 'V':
diff --git a/sys-boot/grub/grub-2.04-r1.ebuild b/sys-boot/grub/grub-2.04-r2.ebuild
index d0feaf3be6a..e68f15c3a27 100644
--- a/sys-boot/grub/grub-2.04-r1.ebuild
+++ b/sys-boot/grub/grub-2.04-r2.ebuild
@@ -100,7 +100,7 @@ DEPEND="
sdl? ( media-libs/libsdl )
)
device-mapper? ( >=sys-fs/lvm2-2.02.45 )
- libzfs? ( sys-fs/zfs )
+ libzfs? ( sys-fs/zfs:= )
mount? ( sys-fs/fuse:0 )
truetype? ( media-libs/freetype:2= )
ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
diff --git a/sys-boot/grub/grub-2.05_alpha20200310.ebuild b/sys-boot/grub/grub-2.05_alpha20200310-r1.ebuild
index 89d3dd60234..c10aa3ca032 100644
--- a/sys-boot/grub/grub-2.05_alpha20200310.ebuild
+++ b/sys-boot/grub/grub-2.05_alpha20200310-r1.ebuild
@@ -91,7 +91,7 @@ DEPEND="
sdl? ( media-libs/libsdl )
)
device-mapper? ( >=sys-fs/lvm2-2.02.45 )
- libzfs? ( sys-fs/zfs )
+ libzfs? ( sys-fs/zfs:= )
mount? ( sys-fs/fuse:0 )
truetype? ( media-libs/freetype:2= )
ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index b02798b5977..4a29991e972 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -99,7 +99,7 @@ DEPEND="
sdl? ( media-libs/libsdl )
)
device-mapper? ( >=sys-fs/lvm2-2.02.45 )
- libzfs? ( sys-fs/zfs )
+ libzfs? ( sys-fs/zfs:= )
mount? ( sys-fs/fuse:0 )
truetype? ( media-libs/freetype:2= )
ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
diff --git a/sys-boot/grub/metadata.xml b/sys-boot/grub/metadata.xml
index fc870a12f54..a2fdb7a5f07 100644
--- a/sys-boot/grub/metadata.xml
+++ b/sys-boot/grub/metadata.xml
@@ -27,7 +27,6 @@
<flag name="truetype">Build and install grub-mkfont conversion utility</flag>
</use>
<upstream>
- <remote-id type="sourceforge">dejavu</remote-id>
<remote-id type="cpe">cpe:/a:gnu:grub</remote-id>
</upstream>
</pkgmetadata>
diff --git a/sys-boot/lilo/files/lilo-24.x-fix-gcc-10.patch b/sys-boot/lilo/files/lilo-24.x-fix-gcc-10.patch
new file mode 100644
index 00000000000..c46b9eebdea
--- /dev/null
+++ b/sys-boot/lilo/files/lilo-24.x-fix-gcc-10.patch
@@ -0,0 +1,51 @@
+Description: Fix ftbfs with GCC-10
+
+Author: Ryan Finnie <ryan@finnie.org>
+Bug-Debian: https://bugs.debian.org/957490
+Forwarded: no
+
+---
+
+--- a/src/raid.h
++++ b/src/raid.h
+@@ -8,7 +8,7 @@
+ * in the source directory.
+ */
+
+-int do_md_install, ndisk, md_bios;
++extern int ndisk, md_bios;
+
+ int raid_setup(void);
+ void raid_final(void);
+--- a/src/bsect.c
++++ b/src/bsect.c
+@@ -54,8 +54,6 @@
+ #endif
+
+
+-int boot_dev_nr;
+-
+ static BOOT_SECTOR bsect,bsect_orig;
+ static MENUTABLE menuparams;
+ static DESCR_SECTORS descrs;
+--- a/src/identify.c
++++ b/src/identify.c
+@@ -19,7 +19,6 @@
+ #include "common.h"
+ #include "cfg.h"
+
+-char *identify;
+ static char *opt;
+ static char *first, *dflt;
+ static int idefault;
+--- a/src/raid.c
++++ b/src/raid.c
+@@ -41,7 +41,7 @@
+ static int raid_bios[MAX_RAID+1];
+ static int device;
+ enum {MD_NULL=0, MD_PARALLEL, MD_MIXED, MD_SKEWED};
+-int do_md_install, ndisk, md_bios;
++int ndisk, md_bios;
+ static char *raid_list[MAX_RAID];
+ static int list_index[MAX_RAID];
+ static int nlist, faulty;
diff --git a/sys-boot/lilo/lilo-24.1.ebuild b/sys-boot/lilo/lilo-24.1.ebuild
index aa4787b06c1..4627ce7347c 100644
--- a/sys-boot/lilo/lilo-24.1.ebuild
+++ b/sys-boot/lilo/lilo-24.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI="7"
inherit eutils flag-o-matic toolchain-funcs
@@ -25,10 +25,14 @@ DEPEND=">=sys-devel/bin86-0.15.5"
RDEPEND="device-mapper? ( >=sys-fs/lvm2-2.02.45 )"
src_prepare() {
+ default
+
# this patch is needed when booting PXE and the device you're using
# emulates vga console via serial console.
# IE.. B.B.o.o.o.o.t.t.i.i.n.n.g.g....l.l.i.i.n.n.u.u.x.x and stair stepping.
- use pxeserial && epatch "${FILESDIR}/${P}-novga.patch"
+ use pxeserial && eapply "${FILESDIR}/${P}-novga.patch"
+
+ eapply "${FILESDIR}/${PN}-24.x-fix-gcc-10.patch"
# Do not strip and have parallel make
# FIXME: images/Makefile does weird stuff
diff --git a/sys-boot/lilo/lilo-24.2.ebuild b/sys-boot/lilo/lilo-24.2.ebuild
index 73f9ea6efbb..66ac79f0314 100644
--- a/sys-boot/lilo/lilo-24.2.ebuild
+++ b/sys-boot/lilo/lilo-24.2.ebuild
@@ -33,6 +33,7 @@ src_prepare() {
use pxeserial && eapply "${FILESDIR}/${PN}-24.1-novga.patch"
eapply "${FILESDIR}/${PN}-24.2-add-nvme-support.patch"
+ eapply "${FILESDIR}/${PN}-24.x-fix-gcc-10.patch"
# Do not strip and have parallel make
# FIXME: images/Makefile does weird stuff
diff --git a/sys-boot/palo/Manifest b/sys-boot/palo/Manifest
index d3c403304ee..cc5d02da506 100644
--- a/sys-boot/palo/Manifest
+++ b/sys-boot/palo/Manifest
@@ -1,3 +1 @@
-DIST palo-2.12.tar.gz 124911 BLAKE2B 79fa572e118e77114dcb3b888abc65163bd56cb44cf69cd25bcaa33a7c6151b8254bf00c459ad17ca1d948f9b440378133f048e2add123a757908c108b802703 SHA512 6ea20490b84bf18a1d1e8037de453f5f480cba8403b267d4d63fceceffb39e18545c6d20c8dd7b07044ff5567eedd2c58b2a626971b53d1d35c5b3a4e8fefbf0
-DIST palo-2.13.tar.gz 125108 BLAKE2B 9c73e66be7950ae6e7fd0a5dcb9cf460dfcb469580a25c121eb7ffc41aaf4a0b67d7f77ddf7a12479718c6ffc64a3a9327ab8c92cc73e79cffad07d61c6fd120 SHA512 6ecde0720fcf672cd7baf71bb04e16f2a1412d958ec35c4e2c9a7a3b372dab1a12ce6e47198ac8500aca750cbbb7190c3476ea626007c3418eb6c23f06011d37
DIST palo-2.14.tar.gz 125207 BLAKE2B fcbc7e59552d83828c07acb055429c1155b738dd12e22c9fc81759b9f84382e3ea793e957421d420c93fa5818d5ad8f12b5317cfe6d5d45d95fc15b272c6fe8c SHA512 9d22ea2826a69a9bb661a4c17aaa78d648f0684b96c2dc0f164d2086f48fc85207e40c69227dd76d153dd171574dd62f6e5e90dd415209de372b4d7d8ab40f57
diff --git a/sys-boot/palo/files/palo-2.12-gcc10.patch b/sys-boot/palo/files/palo-2.12-gcc10.patch
deleted file mode 100644
index 7832fbeac94..00000000000
--- a/sys-boot/palo/files/palo-2.12-gcc10.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/ipl/Makefile
-+++ b/ipl/Makefile
-@@ -39,7 +39,7 @@ endif
- VPATH=../lib:.
-
- AFLAGS = -I../lib
--CFLAGS = -DIPL_LOADER -I. -I../lib -I../include -O2 -mdisable-fpregs -Wall -fno-delete-null-pointer-checks
-+CFLAGS = -DIPL_LOADER -I. -I../lib -I../include -O2 -mdisable-fpregs -Wall -fno-delete-null-pointer-checks -fno-builtin
- LDFLAGS = -N --section-start .init=0x60000 -e '$$START$$'
-
- all: iplelf
diff --git a/sys-boot/palo/palo-2.12-r1.ebuild b/sys-boot/palo/palo-2.12-r1.ebuild
deleted file mode 100644
index 8e24e8531b2..00000000000
--- a/sys-boot/palo/palo-2.12-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-DESCRIPTION="PALO : PArisc Linux Loader"
-HOMEPAGE="http://parisc-linux.org/ https://parisc.wiki.kernel.org/"
-SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/deller/${PN}.git/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* hppa"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.00-toolchain.patch
- "${FILESDIR}"/${PN}-2.12-gcc10.patch
-)
-
-src_compile() {
- local target
- for target in '-C palo' '-C ipl' 'iplboot'; do
- emake AR=$(tc-getAR) CC=$(tc-getCC) LD=$(tc-getLD) ${target}
- done
-}
-
-src_install() {
- into /
- dosbin palo/palo
-
- insinto /usr/share/palo
- doins iplboot
-
- insinto /etc
- doins "${FILESDIR}"/palo.conf
-
- insinto /etc/kernel/postinst.d
- insopts -m 0744
- doins "${FILESDIR}"/99palo
-
- doman palo.8
-
- dodoc TODO debian/changelog README.html
-}
diff --git a/sys-boot/palo/palo-2.13.ebuild b/sys-boot/palo/palo-2.13.ebuild
deleted file mode 100644
index 17741656154..00000000000
--- a/sys-boot/palo/palo-2.13.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-DESCRIPTION="PALO : PArisc Linux Loader"
-HOMEPAGE="http://parisc-linux.org/ https://parisc.wiki.kernel.org/"
-SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/deller/${PN}.git/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~hppa"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.00-toolchain.patch
-)
-
-src_compile() {
- local target
- for target in '-C palo' '-C ipl' 'iplboot'; do
- emake AR=$(tc-getAR) CC=$(tc-getCC) LD=$(tc-getLD) ${target}
- done
-}
-
-src_install() {
- into /
- dosbin palo/palo
-
- insinto /usr/share/palo
- doins iplboot
-
- insinto /etc
- doins "${FILESDIR}"/palo.conf
-
- insinto /etc/kernel/postinst.d
- insopts -m 0744
- doins "${FILESDIR}"/99palo
-
- doman palo.8
-
- dodoc TODO debian/changelog README.html
-}
diff --git a/sys-boot/palo/palo-2.14.ebuild b/sys-boot/palo/palo-2.14.ebuild
index 17741656154..0a94f5679bf 100644
--- a/sys-boot/palo/palo-2.14.ebuild
+++ b/sys-boot/palo/palo-2.14.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
@@ -10,7 +10,7 @@ SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/deller/${PN}.git/snapsh
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="-* ~hppa"
+KEYWORDS="-* hppa"
PATCHES=(
"${FILESDIR}"/${PN}-2.00-toolchain.patch
diff --git a/sys-boot/raspberrypi-firmware/Manifest b/sys-boot/raspberrypi-firmware/Manifest
index 2570229caf3..e02e56bbc2f 100644
--- a/sys-boot/raspberrypi-firmware/Manifest
+++ b/sys-boot/raspberrypi-firmware/Manifest
@@ -1,3 +1,2 @@
-DIST raspberrypi-firmware-1.20190215.tar.gz 123074917 BLAKE2B cefedb5c979db7dfd47938aad37a567d91d3ad78247c7a63f789362768ab7a39a1967ac116b4b0475e3b210ab11f6474706df042af85a622e8e7905c85ec7498 SHA512 082f26caf427222d838881e5f1e9fa0136765b3eaf74a84877fc33616fd07e49085db0889226c40c655039a9d41a10566510c7d752cfc48a67b4683616a51193
-DIST raspberrypi-firmware-1.20190709.tar.gz 158835870 BLAKE2B 4e63b3308adcd75f69f66966f1c927449aa8dc65211e6ca5a27dd2a0ed6ed32cc85ad42221308f4fb3a852d9f278400cfe4f723f306abe102341568408027174 SHA512 6a0610c97db47441ede8e4f8436958899f678bf065a0fbde06de7945a1ac4d5f754a0e10d928d77759ba1cbf82654d85d9cb9c91b970c3fe9590560267033522
-DIST raspberrypi-firmware-1.20190925.tar.gz 185571086 BLAKE2B c3a9b2760fa853fbd1dd09bc4048c9e78594f88da5af608c3a761554d4046a4c869db8981c64140a24e82e0a61b8dc776bb8d895df60c6424e44780f78b18cb0 SHA512 4b7b29cc6c2a33d7a37987c492034d9afbb2220364c50cf265e0adf8e5f393c2275dcffaa77c89b3f43b2e98d199741b67590cb60ff8beae8ef677852f63b4a0
+DIST raspberrypi-firmware-1.20201022.tar.gz 189827375 BLAKE2B 94c38f60d688c8e3ebab830912daccbb6c04bdd3d88f6ca0d07d85be0a6b12c53f0266b4c258ed4694f30bad5db30fb6d30feabfd0b7668735a9a806b820d325 SHA512 876758179df27109984b6c3f4849fdcdc6bdcc2769495fcc83c97fc3ff4d07b9f3cd58086be877503f72c9e5417d2be6d6c33bce4cbb3b862055117c9cc26db8
+DIST raspberrypi-firmware-1.20201201.tar.gz 189332299 BLAKE2B b3ec91f07b4713d26c29be5412d018a220129eef7ddf7c5c09d85e645c2c5754a95f13be7e690ab40648a982e3974cc760aa5b33c76612da836227d38c4ee3a5 SHA512 a7f4591552718956bd7f2d0d377234277e2e6f18cc9714ea30fe13f26d5ae1164b982f39dcf72ae4a18663369ef06d0187d8182713763262371c13107aac4c65
diff --git a/sys-boot/raspberrypi-firmware/files/raspberrypi-firmware-0_p20130711-cmdline.txt b/sys-boot/raspberrypi-firmware/files/raspberrypi-firmware-0_p20130711-cmdline.txt
deleted file mode 100644
index 39112a2dba6..00000000000
--- a/sys-boot/raspberrypi-firmware/files/raspberrypi-firmware-0_p20130711-cmdline.txt
+++ /dev/null
@@ -1 +0,0 @@
-ipv6.disable=0 selinux=0 plymouth.enable=0 smsc95xx.turbo_mode=N dwc_otg.lpm_enable=0 console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 console=tty1 root=/dev/mmcblk0p2 rootfstype=ext4 elevator=noop rootwait
diff --git a/sys-boot/raspberrypi-firmware/files/raspberrypi-firmware-1.20201022-cmdline.txt b/sys-boot/raspberrypi-firmware/files/raspberrypi-firmware-1.20201022-cmdline.txt
new file mode 100644
index 00000000000..b815bd89db1
--- /dev/null
+++ b/sys-boot/raspberrypi-firmware/files/raspberrypi-firmware-1.20201022-cmdline.txt
@@ -0,0 +1 @@
+console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait
diff --git a/sys-boot/raspberrypi-firmware/files/raspberrypi-firmware-0_p20130711-config.txt b/sys-boot/raspberrypi-firmware/files/raspberrypi-firmware-1.20201022-config.txt
index 9401530925d..548f4accc25 100644
--- a/sys-boot/raspberrypi-firmware/files/raspberrypi-firmware-0_p20130711-config.txt
+++ b/sys-boot/raspberrypi-firmware/files/raspberrypi-firmware-1.20201022-config.txt
@@ -1,4 +1,7 @@
-#from archlinux arm sdcard image
+# For more options and information see
+# http://rpf.io/configtxt
+# Some settings may impact device functionality. See link above for details
+
# uncomment if you get no picture on HDMI for a default "safe" mode
#hdmi_safe=1
@@ -39,43 +42,24 @@
#uncomment to overclock the arm. 700 MHz is the default.
#arm_freq=800
-# for more options see http://elinux.org/RPi_config.txt
+# Uncomment some or all of these to enable the optional hardware interfaces
+#dtparam=i2c_arm=on
+#dtparam=i2s=on
+#dtparam=spi=on
-## Some over clocking settings, govenor already set to ondemand
+# Uncomment this to enable infrared communication.
+#dtoverlay=gpio-ir,gpio_pin=17
+#dtoverlay=gpio-ir-tx,gpio_pin=18
-##None
-#arm_freq=700
-#core_freq=250
-#sdram_freq=400
-#over_voltage=0
+# Additional overlays and parameters are documented /boot/overlays/README
-##Modest
-#arm_freq=800
-#core_freq=300
-#sdram_freq=400
-#over_voltage=0
-
-##Medium
-#arm_freq=900
-#core_freq=333
-#sdram_freq=450
-#over_voltage=2
-
-##High
-#arm_freq=950
-#core_freq=450
-#sdram_freq=450
-#over_voltage=6
-
-##Turbo
-#arm_freq=1000
-#core_freq=500
-#sdram_freq=500
-#over_voltage=6
-
-gpu_mem_512=316
-gpu_mem_256=128
-cma_lwm=16
-cma_hwm=32
-cma_offline_start=16
+# Enable audio (loads snd_bcm2835)
+dtparam=audio=on
+
+[pi4]
+# Enable DRM VC4 V3D driver on top of the dispmanx display stack
+dtoverlay=vc4-fkms-v3d
+max_framebuffers=2
+[all]
+#dtoverlay=vc4-fkms-v3d
diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20190709.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20190709.ebuild
deleted file mode 100644
index 4b06dfa4993..00000000000
--- a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20190709.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit mount-boot readme.gentoo-r1
-
-DESCRIPTION="Raspberry Pi (all versions) bootloader and GPU firmware"
-HOMEPAGE="https://github.com/raspberrypi/firmware"
-LICENSE="GPL-2 raspberrypi-videocore-bin"
-SLOT="0"
-
-if [[ "${PV}" == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/raspberrypi/firmware"
- EGIT_CLONE_TYPE="shallow"
-else
- SRC_URI="https://github.com/raspberrypi/firmware/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="-* ~arm"
- S="${WORKDIR}/firmware-${PV}"
-fi
-
-RESTRICT="binchecks strip"
-
-pkg_preinst() {
- if [ -z "${REPLACING_VERSIONS}" ] ; then
- local msg=""
- if [ -e "${D}"/boot/cmdline.txt -a -e /boot/cmdline.txt ] ; then
- msg+="/boot/cmdline.txt "
- fi
- if [ -e "${D}"/boot/config.txt -a -e /boot/config.txt ] ; then
- msg+="/boot/config.txt "
- fi
- if [ -n "${msg}" ] ; then
- msg="This package installs following files: ${msg}."
- msg="${msg} Please remove(backup) your copies durning install"
- msg="${msg} and merge settings afterwards."
- msg="${msg} Further updates will be CONFIG_PROTECTed."
- die "${msg}"
- fi
- fi
-}
-
-src_install() {
- insinto /boot
- cd boot || die
- doins bootcode.bin fixup*.dat start*elf
- doins *.dtb
- doins -r overlays
- newins "${FILESDIR}"/${PN}-0_p20130711-config.txt config.txt
- newins "${FILESDIR}"/${PN}-0_p20130711-cmdline.txt cmdline.txt
- newenvd "${FILESDIR}"/${PN}-0_p20130711-envd 90${PN}
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-}
-
-DOC_CONTENTS="Please configure your ram setup by editing /boot/config.txt"
diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20190215.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20201022.ebuild
index 4b06dfa4993..9ed770d2e9d 100644
--- a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20190215.ebuild
+++ b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20201022.ebuild
@@ -1,39 +1,65 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit mount-boot readme.gentoo-r1
-DESCRIPTION="Raspberry Pi (all versions) bootloader and GPU firmware"
-HOMEPAGE="https://github.com/raspberrypi/firmware"
-LICENSE="GPL-2 raspberrypi-videocore-bin"
-SLOT="0"
-
if [[ "${PV}" == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/raspberrypi/firmware"
EGIT_CLONE_TYPE="shallow"
else
SRC_URI="https://github.com/raspberrypi/firmware/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="-* ~arm"
+ KEYWORDS="-* arm arm64"
S="${WORKDIR}/firmware-${PV}"
fi
+DESCRIPTION="Raspberry Pi (all versions) bootloader and GPU firmware"
+HOMEPAGE="https://github.com/raspberrypi/firmware"
+
+LICENSE="GPL-2 raspberrypi-videocore-bin"
+SLOT="0"
RESTRICT="binchecks strip"
+DOC_CONTENTS="Please configure your ram setup by editing /boot/config.txt"
+
+src_prepare() {
+ default
+
+ cp "${FILESDIR}"/${PN}-1.20201022-config.txt "${WORKDIR}" || die
+
+ if use arm64; then
+ # Force selection of the 64-bit kernel8.img to match our userland
+ echo "arm_64bit=1" >> "${WORKDIR}"/${PN}-1.20201022-config.txt || die
+ fi
+}
+
+src_install() {
+ insinto /boot
+ cd boot || die
+ doins bootcode.bin fixup*.dat start*elf
+ newins "${WORKDIR}"/${PN}-1.20201022-config.txt config.txt
+ newins "${FILESDIR}"/${PN}-1.20201022-cmdline.txt cmdline.txt
+ newenvd "${FILESDIR}"/${PN}-0_p20130711-envd 90${PN}
+ readme.gentoo_create_doc
+}
+
pkg_preinst() {
- if [ -z "${REPLACING_VERSIONS}" ] ; then
+ if [[ -z "${REPLACING_VERSIONS}" ]] ; then
local msg=""
- if [ -e "${D}"/boot/cmdline.txt -a -e /boot/cmdline.txt ] ; then
+
+ if [[ -e "${ED}"/boot/cmdline.txt ]] && [[ -e /boot/cmdline.txt ]] ; then
msg+="/boot/cmdline.txt "
fi
- if [ -e "${D}"/boot/config.txt -a -e /boot/config.txt ] ; then
+
+ if [[ -e "${ED}"/boot/config.txt ]] && [[ -e /boot/config.txt ]] ; then
msg+="/boot/config.txt "
fi
- if [ -n "${msg}" ] ; then
+
+ if [[ -n "${msg}" ]] ; then
msg="This package installs following files: ${msg}."
- msg="${msg} Please remove(backup) your copies durning install"
+ msg="${msg} Please remove (backup) your copies durning install"
msg="${msg} and merge settings afterwards."
msg="${msg} Further updates will be CONFIG_PROTECTed."
die "${msg}"
@@ -41,20 +67,6 @@ pkg_preinst() {
fi
}
-src_install() {
- insinto /boot
- cd boot || die
- doins bootcode.bin fixup*.dat start*elf
- doins *.dtb
- doins -r overlays
- newins "${FILESDIR}"/${PN}-0_p20130711-config.txt config.txt
- newins "${FILESDIR}"/${PN}-0_p20130711-cmdline.txt cmdline.txt
- newenvd "${FILESDIR}"/${PN}-0_p20130711-envd 90${PN}
- readme.gentoo_create_doc
-}
-
pkg_postinst() {
readme.gentoo_print_elog
}
-
-DOC_CONTENTS="Please configure your ram setup by editing /boot/config.txt"
diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20190925.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20201201.ebuild
index 3b499cf2ad5..55d6595f60b 100644
--- a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20190925.ebuild
+++ b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20201201.ebuild
@@ -1,21 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit mount-boot readme.gentoo-r1
-DESCRIPTION="Raspberry Pi (all versions) bootloader and GPU firmware"
-HOMEPAGE="https://github.com/raspberrypi/firmware"
-LICENSE="GPL-2 raspberrypi-videocore-bin"
-SLOT="0"
-
-# Temporary safety measure to prevent ending up with a pair of
-# sys-kernel/raspberrypi-image and sys-boot/raspberrypi-firmware
-# none of which installed device tree files.
-# Remove when the mentioned version and all older ones are deleted.
-RDEPEND="!<=sys-kernel/raspberrypi-image-4.19.57_p20190709"
-
if [[ "${PV}" == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/raspberrypi/firmware"
@@ -26,20 +15,51 @@ else
S="${WORKDIR}/firmware-${PV}"
fi
+DESCRIPTION="Raspberry Pi (all versions) bootloader and GPU firmware"
+HOMEPAGE="https://github.com/raspberrypi/firmware"
+
+LICENSE="GPL-2 raspberrypi-videocore-bin"
+SLOT="0"
RESTRICT="binchecks strip"
+DOC_CONTENTS="Please configure your ram setup by editing /boot/config.txt"
+
+src_prepare() {
+ default
+
+ cp "${FILESDIR}"/${PN}-1.20201022-config.txt "${WORKDIR}" || die
+
+ if use arm64; then
+ # Force selection of the 64-bit kernel8.img to match our userland
+ echo "arm_64bit=1" >> "${WORKDIR}"/${PN}-1.20201022-config.txt || die
+ fi
+}
+
+src_install() {
+ insinto /boot
+ cd boot || die
+ doins bootcode.bin fixup*.dat start*elf
+ newins "${WORKDIR}"/${PN}-1.20201022-config.txt config.txt
+ newins "${FILESDIR}"/${PN}-1.20201022-cmdline.txt cmdline.txt
+ newenvd "${FILESDIR}"/${PN}-0_p20130711-envd 90${PN}
+ readme.gentoo_create_doc
+}
+
pkg_preinst() {
- if [ -z "${REPLACING_VERSIONS}" ] ; then
+ if [[ -z "${REPLACING_VERSIONS}" ]] ; then
local msg=""
- if [ -e "${D}"/boot/cmdline.txt -a -e /boot/cmdline.txt ] ; then
+
+ if [[ -e "${ED}"/boot/cmdline.txt ]] && [[ -e /boot/cmdline.txt ]] ; then
msg+="/boot/cmdline.txt "
fi
- if [ -e "${D}"/boot/config.txt -a -e /boot/config.txt ] ; then
+
+ if [[ -e "${ED}"/boot/config.txt ]] && [[ -e /boot/config.txt ]] ; then
msg+="/boot/config.txt "
fi
- if [ -n "${msg}" ] ; then
+
+ if [[ -n "${msg}" ]] ; then
msg="This package installs following files: ${msg}."
- msg="${msg} Please remove(backup) your copies durning install"
+ msg="${msg} Please remove (backup) your copies during install"
msg="${msg} and merge settings afterwards."
msg="${msg} Further updates will be CONFIG_PROTECTed."
die "${msg}"
@@ -47,18 +67,6 @@ pkg_preinst() {
fi
}
-src_install() {
- insinto /boot
- cd boot || die
- doins bootcode.bin fixup*.dat start*elf
- newins "${FILESDIR}"/${PN}-0_p20130711-config.txt config.txt
- newins "${FILESDIR}"/${PN}-0_p20130711-cmdline.txt cmdline.txt
- newenvd "${FILESDIR}"/${PN}-0_p20130711-envd 90${PN}
- readme.gentoo_create_doc
-}
-
pkg_postinst() {
readme.gentoo_print_elog
}
-
-DOC_CONTENTS="Please configure your ram setup by editing /boot/config.txt"
diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild
index 3b499cf2ad5..7fe926ad782 100644
--- a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild
+++ b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild
@@ -1,21 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit mount-boot readme.gentoo-r1
-DESCRIPTION="Raspberry Pi (all versions) bootloader and GPU firmware"
-HOMEPAGE="https://github.com/raspberrypi/firmware"
-LICENSE="GPL-2 raspberrypi-videocore-bin"
-SLOT="0"
-
-# Temporary safety measure to prevent ending up with a pair of
-# sys-kernel/raspberrypi-image and sys-boot/raspberrypi-firmware
-# none of which installed device tree files.
-# Remove when the mentioned version and all older ones are deleted.
-RDEPEND="!<=sys-kernel/raspberrypi-image-4.19.57_p20190709"
-
if [[ "${PV}" == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/raspberrypi/firmware"
@@ -26,20 +15,51 @@ else
S="${WORKDIR}/firmware-${PV}"
fi
+DESCRIPTION="Raspberry Pi (all versions) bootloader and GPU firmware"
+HOMEPAGE="https://github.com/raspberrypi/firmware"
+
+LICENSE="GPL-2 raspberrypi-videocore-bin"
+SLOT="0"
RESTRICT="binchecks strip"
+DOC_CONTENTS="Please configure your ram setup by editing /boot/config.txt"
+
+src_prepare() {
+ default
+
+ cp "${FILESDIR}"/${PN}-1.20201022-config.txt "${WORKDIR}" || die
+
+ if use arm64; then
+ # Force selection of the 64-bit kernel8.img to match our userland
+ echo "arm_64bit=1" >> "${WORKDIR}"/${PN}-1.20201022-config.txt || die
+ fi
+}
+
+src_install() {
+ insinto /boot
+ cd boot || die
+ doins bootcode.bin fixup*.dat start*elf
+ newins "${WORKDIR}"/${PN}-1.20201022-config.txt config.txt
+ newins "${FILESDIR}"/${PN}-1.20201022-cmdline.txt cmdline.txt
+ newenvd "${FILESDIR}"/${PN}-0_p20130711-envd 90${PN}
+ readme.gentoo_create_doc
+}
+
pkg_preinst() {
- if [ -z "${REPLACING_VERSIONS}" ] ; then
+ if [[ -z "${REPLACING_VERSIONS}" ]] ; then
local msg=""
- if [ -e "${D}"/boot/cmdline.txt -a -e /boot/cmdline.txt ] ; then
+
+ if [[ -e "${ED}"/boot/cmdline.txt ]] && [[ -e /boot/cmdline.txt ]] ; then
msg+="/boot/cmdline.txt "
fi
- if [ -e "${D}"/boot/config.txt -a -e /boot/config.txt ] ; then
+
+ if [[ -e "${ED}"/boot/config.txt ]] && [[ -e /boot/config.txt ]] ; then
msg+="/boot/config.txt "
fi
- if [ -n "${msg}" ] ; then
+
+ if [[ -n "${msg}" ]] ; then
msg="This package installs following files: ${msg}."
- msg="${msg} Please remove(backup) your copies durning install"
+ msg="${msg} Please remove (backup) your copies durning install"
msg="${msg} and merge settings afterwards."
msg="${msg} Further updates will be CONFIG_PROTECTed."
die "${msg}"
@@ -47,18 +67,6 @@ pkg_preinst() {
fi
}
-src_install() {
- insinto /boot
- cd boot || die
- doins bootcode.bin fixup*.dat start*elf
- newins "${FILESDIR}"/${PN}-0_p20130711-config.txt config.txt
- newins "${FILESDIR}"/${PN}-0_p20130711-cmdline.txt cmdline.txt
- newenvd "${FILESDIR}"/${PN}-0_p20130711-envd 90${PN}
- readme.gentoo_create_doc
-}
-
pkg_postinst() {
readme.gentoo_print_elog
}
-
-DOC_CONTENTS="Please configure your ram setup by editing /boot/config.txt"
diff --git a/sys-boot/refind/files/refind-0.12.0-gcc10.patch b/sys-boot/refind/files/refind-0.12.0-gcc10.patch
new file mode 100644
index 00000000000..1f2e2bc0a5d
--- /dev/null
+++ b/sys-boot/refind/files/refind-0.12.0-gcc10.patch
@@ -0,0 +1,11 @@
+--- a/Make.common
++++ b/Make.common
+@@ -60,7 +60,7 @@
+ #
+
+ # ...for both GNU-EFI and TianoCore....
+-OPTIMFLAGS = -Os -fno-strict-aliasing
++OPTIMFLAGS = -Os -fno-strict-aliasing -fno-tree-loop-distribute-patterns
+ CFLAGS = $(OPTIMFLAGS) -fno-stack-protector -fshort-wchar -Wall
+
+ # ...for GNU-EFI....
diff --git a/sys-boot/refind/refind-0.11.4.ebuild b/sys-boot/refind/refind-0.11.4.ebuild
index 139bf622501..37ad051eba4 100644
--- a/sys-boot/refind/refind-0.11.4.ebuild
+++ b/sys-boot/refind/refind-0.11.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -99,9 +99,9 @@ src_compile() {
EFILIB="/usr/$(get_libdir)"
EFICRT0="/usr/$(get_libdir)"
EDK2BASE="${UDK_WORKSPACE}"
- EDK2_DRIVER_BASENAMES="${fs_names[@]}"
- FILESYSTEMS="${fs_names[@]}"
- FILESYSTEMS_GNUEFI="${fs_names[@]}"
+ EDK2_DRIVER_BASENAMES="${fs_names[*]}"
+ FILESYSTEMS="${fs_names[*]}"
+ FILESYSTEMS_GNUEFI="${fs_names[*]}"
)
if use custom-cflags; then
make_flags=(CFLAGS="${CFLAGS}" "${make_flags[@]}")
diff --git a/sys-boot/refind/refind-0.12.0-r1.ebuild b/sys-boot/refind/refind-0.12.0-r1.ebuild
index b595a111e7e..39004c2d009 100644
--- a/sys-boot/refind/refind-0.12.0-r1.ebuild
+++ b/sys-boot/refind/refind-0.12.0-r1.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
@@ -11,14 +11,18 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz"
LICENSE="BSD GPL-2 GPL-3 FDL-1.3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
IUSE="${FS_USE} custom-cflags doc"
-DEPEND=">=sys-boot/gnu-efi-3.0.2"
+DEPEND="sys-boot/gnu-efi"
-DOCS=(README.txt)
-PATCHES=("${FILESDIR}/makefile.patch")
+PATCHES=(
+ "${FILESDIR}/makefile.patch"
+ "${FILESDIR}/${P}-gcc10.patch" # Bug 723244
+)
+
+DOCS=( README.txt )
pkg_pretend() {
if use custom-cflags; then
@@ -73,12 +77,12 @@ src_compile() {
EFILIB="/usr/$(get_libdir)"
EFICRT0="/usr/$(get_libdir)"
EDK2BASE="${UDK_WORKSPACE}"
- EDK2_DRIVER_BASENAMES="${fs_names[@]}"
- FILESYSTEMS="${fs_names[@]}"
- FILESYSTEMS_GNUEFI="${fs_names[@]}"
+ EDK2_DRIVER_BASENAMES="${fs_names[*]}"
+ FILESYSTEMS="${fs_names[*]}"
+ FILESYSTEMS_GNUEFI="${fs_names[*]}"
)
if use custom-cflags; then
- make_flags=(CFLAGS="${CFLAGS}" "${make_flags[@]}")
+ make_flags=(CFLAGS="${CFLAGS} -fno-tree-loop-distribute-patterns" "${make_flags[@]}")
fi
emake "${make_flags[@]}" all_gnuefi
diff --git a/sys-boot/refind/refind-0.12.0.ebuild b/sys-boot/refind/refind-0.12.0.ebuild
deleted file mode 100644
index 9091a88cfcb..00000000000
--- a/sys-boot/refind/refind-0.12.0.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multiprocessing toolchain-funcs
-
-DESCRIPTION="The UEFI Boot Manager by Rod Smith"
-HOMEPAGE="https://www.rodsbooks.com/refind/"
-SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz"
-
-LICENSE="BSD GPL-2 GPL-3 FDL-1.3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
-IUSE="${FS_USE} custom-cflags doc gnuefi"
-
-DEPEND="gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
- !gnuefi? ( >=sys-boot/udk-2018-r1 )"
-
-DOCS=(README.txt)
-PATCHES=("${FILESDIR}/makefile.patch")
-UDK_WORKSPACE="${T}/udk"
-
-pkg_pretend() {
- if use custom-cflags; then
- ewarn
- ewarn "You have enabled building with USE=custom-cflags. Be aware that"
- ewarn "using this can result in EFI binaries that fail to run and may"
- ewarn "fail to build at all. This is strongly advised against by upstream."
- ewarn
- ewarn "See https://bugs.gentoo.org/598587#c3 for more information"
- ewarn
- fi
-}
-
-pkg_setup() {
- if use x86; then
- export EFIARCH=ia32
- export BUILDARCH=ia32
- elif use amd64; then
- export EFIARCH=x64
- export BUILDARCH=x86_64
- fi
-}
-
-src_prepare() {
- default
-
- # bug 598647 - PIE not supported
- sed -e '/^CFLAGS/s:$: -fno-PIE:' -i Make.common || die
-
- # Prepare UDK workspace
- if ! use gnuefi; then
- mkdir "${UDK_WORKSPACE}" || die
- ln -s "${EPREFIX}/usr/lib/udk/"{Mde,IntelFramework}{,Module}Pkg \
- "${UDK_WORKSPACE}" || die "Could not link UDK files"
- fi
-}
-
-src_configure() {
- if ! use gnuefi; then
- # Use the side effect of the script which will create configuration files
- (. udk-workspace "${UDK_WORKSPACE}" || die)
- sed -e "s:^#\?\s*\(MAX_CONCURRENT_THREAD_NUMBER\s*=\).*$:\1 $(makeopts_jobs):" \
- -i "${UDK_WORKSPACE}/Conf/target.txt" || die "Failed to configure target file"
- sed -e "s:\(_\(CC\|ASM\|PP\|VFRPP\|ASLCC\|ASLPP\|DLINK\)_PATH\s*=\).*$:\1 $(tc-getCC):" \
- -e "s:\(_ASLDLINK_PATH\s*=\).*$:\1 $(tc-getLD):" \
- -e "s:\(_OBJCOPY_PATH\s*=\).*$:\1 $(tc-getOBJCOPY):" \
- -e "s:\(_RC_PATH\s*=\).*$:\1 $(tc-getOBJCOPY):" \
- -e "s:\(_SLINK_PATH\s*=\).*$:\1 $(tc-getAR):" \
- -e "s:-Werror::" \
- -i "${UDK_WORKSPACE}/Conf/tools_def.txt" \
- || die "Failed to prepare tools definition file"
- fi
-}
-
-src_compile() {
- # Update fs targets depending on uses
- local fs fs_names=()
- for fs in ${FS_USE}; do
- fs=${fs#+}
- if use "${fs}"; then
- fs_names+=(${fs})
- fi
- done
- use gnuefi && fs_names=("${fs_names[@]/%/_gnuefi}")
-
- # Prepare flags
- local make_flags=(
- ARCH="${BUILDARCH}"
- CC="$(tc-getCC)"
- AS="$(tc-getAS)"
- LD="$(tc-getLD)"
- AR="$(tc-getAR)"
- RANLIB="$(tc-getRANLIB)"
- OBJCOPY="$(tc-getOBJCOPY)"
- GNUEFILIB="/usr/$(get_libdir)"
- EFILIB="/usr/$(get_libdir)"
- EFICRT0="/usr/$(get_libdir)"
- EDK2BASE="${UDK_WORKSPACE}"
- EDK2_DRIVER_BASENAMES="${fs_names[@]}"
- FILESYSTEMS="${fs_names[@]}"
- FILESYSTEMS_GNUEFI="${fs_names[@]}"
- )
- if use custom-cflags; then
- make_flags=(CFLAGS="${CFLAGS}" "${make_flags[@]}")
- fi
-
- emake "${make_flags[@]}" all_$(usex gnuefi gnuefi edk2)
-}
-
-src_install() {
- exeinto "/usr/lib/${PN}"
- doexe refind-install
- dosym "../lib/${PN}/refind-install" "/usr/sbin/refind-install"
-
- if use doc; then
- doman "docs/man/"*
- DOCS+=(NEWS.txt docs/refind docs/Styles)
- fi
- einstalldocs
-
- insinto "/usr/lib/${PN}/refind"
- doins "refind/refind_${EFIARCH}.efi"
- doins "refind.conf-sample"
- doins -r images icons fonts banners
-
- if [[ -d "drivers_${EFIARCH}" ]]; then
- doins -r "drivers_${EFIARCH}"
- fi
-
- insinto "/usr/lib/${PN}/refind/tools_${EFIARCH}"
- doins "gptsync/gptsync_${EFIARCH}.efi"
-
- insinto "/etc/refind.d"
- doins -r "keys"
-
- dosbin "mkrlconf"
- dosbin "mvrefind"
- dosbin "refind-mkdefault"
-}
-
-pkg_postinst() {
- elog "rEFInd has been built and installed into ${EROOT}/usr/lib/${PN}"
- elog "You will need to use the command 'refind-install' to install"
- elog "the binaries into your EFI System Partition"
- elog ""
- elog "refind-install requires additional packages to be fully functional:"
- elog " app-crypt/sbsigntools for binary signing for use with SecureBoot"
- elog " sys-boot/efibootmgr for writing to NVRAM"
- elog " sys-apps/gptfdisk for ESP management"
- elog ""
- elog "refind-mkdefault requires >=dev-lang/python-3"
- elog ""
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- elog "A sample configuration can be found at"
- elog "${EROOT}/usr/lib/${PN}/refind/refind.conf-sample"
- else
- if ver_test "${REPLACING_VERSIONS}" -lt "0.12.0"; then
- ewarn "This new version uses sys-apps/gptfdisk instead of sys-block/parted"
- ewarn "to manage ESP"
- ewarn ""
- fi
- ewarn "Note that this installation will not update any EFI binaries"
- ewarn "on your EFI System Partition - this needs to be done manually"
- fi
-}
diff --git a/sys-boot/silo/Manifest b/sys-boot/silo/Manifest
index 70de039c957..21a7b23314e 100644
--- a/sys-boot/silo/Manifest
+++ b/sys-boot/silo/Manifest
@@ -1,4 +1 @@
-DIST silo-1.4.14_p20170829.tar.gz 183612 BLAKE2B 88fb4b0ce4e9b8fa9518bcb6226f4fe9ec7011bf3f73d9f0f1562ff837217ca8d54ee783eed0b50096b009fc56527be8e4211623f5b0e4ef5372c38c0fe304f1 SHA512 bda31084ba2ee5b01d331fd390cbccf039dc812debe25f3af97dd5d2855668cbe7e160dee4ca45c16af1fa4aa86224daf3b474fd49b22a8b7f453584a12f3c2b
DIST silo-1.4.14_p20200602.tar.gz 183668 BLAKE2B e229cdb9fbc5f0111aa49919f4b3b91c0770492fa06f91bda15c65af160b728b9409365c3ff0a93091b1e3011c60d0b0bec1101ffabaddbaef7e1083158830b1 SHA512 7a70fe25c1bb3ce655e4fbb85b00fe0d29fe0a6f98b80c1b8267b72bc9324ac0749cd050921163cc286e094f7d9bc81315d63ff02d2442b5c30ce350a537fcc1
-DIST silo_1.4.14+git20120819-1.diff.gz 10711 BLAKE2B c44a0204e3aece4eec8355f88b3a195c1ba7019c0aa648cc4e28ff6cb85fc6d96634bd282e5aaea9123dbc5835820acf2fc15054c91842d6b1040fc13cb0033b SHA512 60719b672a0f1dd2a005e763efd232bbf7aeb00198e0b46827208b78f1b32acc3a730d43944382dec4b95fddfbb373b1eb69dc911ad28ec9d1d1e6c45d84db20
-DIST silo_1.4.14+git20120819.orig.tar.gz 755510 BLAKE2B f1185086671c12c901704c2aa1f582a4e983d2d4a2d5ec18194aebcd43a7bdf9e7ad329efebaf4911d40f8a417ff8c8566b61be4eac5fea13235ac44d0edf852 SHA512 2d1dd8f805fb0a272877b5e8e19e5a645aa9fe02cf2b5ef43b5d2894c0c6a5a82483a0e41556af50f01dc795dc5e43350ae92139485c19d64cda75c2aca01a38
diff --git a/sys-boot/silo/silo-1.4.14_p20120819-r1.ebuild b/sys-boot/silo/silo-1.4.14_p20120819-r1.ebuild
deleted file mode 100644
index 946707a2947..00000000000
--- a/sys-boot/silo/silo-1.4.14_p20120819-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mount-boot flag-o-matic toolchain-funcs eutils
-
-DEB_PL="1"
-MY_PV="${PV##*_p}"
-MY_GIT="git${MY_PV%%_*}"
-MY_PV="${PV%%_*}"
-MY_P="${PN}_${MY_PV}+${MY_GIT}"
-
-DESCRIPTION="SPARC/UltraSPARC Improved Loader, a boot loader for sparc"
-SRC_URI="mirror://debian/pool/main/s/${PN}/${MY_P}.orig.tar.gz
- mirror://debian/pool/main/s/${PN}/${MY_P}-${DEB_PL}.diff.gz"
-HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/davem/silo.git;a=summary"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="-* sparc"
-IUSE=""
-
-DEPEND="sys-fs/e2fsprogs
- sys-apps/sparc-utils"
-RDEPEND=""
-
-ABI_ALLOW="sparc32"
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=(
- "${FILESDIR}"/${P}-gnu90-inline.patch
-)
-
-src_prepare() {
- default
-
- #Set the correct version
- sed -i -e "s/1.4.14/1.4.14_git20120819_p1/g" Rules.make || die
-
- # Fix build failure
- # -fno-PIC is needed to shrink silo size back to manageable on
- # profiles where gcc has -fPIC default (via --enable-default-pie).
- sed -i -e "s/-fno-strict-aliasing/-fno-strict-aliasing -U_FORTIFY_SOURCE -mcpu=v9 -fno-PIC/g" Rules.make || die
-}
-
-src_compile() {
- filter-flags "-fstack-protector"
-
- emake CC="$(tc-getCC)"
-}
-
-src_install() {
- default
-
- dodoc first-isofs/README.SILO_ISOFS docs/README*
-
- # Fix maketilo manpage
- rm "${D}"/usr/share/man/man1/maketilo.1
- dosym tilo.1 /usr/share/man/man1/maketilo.1
-}
-
-pkg_postinst() {
- mount-boot_pkg_postinst
- ewarn "NOTE: If this is an upgrade to an existing SILO install,"
- ewarn " you will need to re-run silo as the /boot/second.b"
- ewarn " file has changed, else the system will fail to load"
- ewarn " SILO at the next boot."
- ewarn
-}
diff --git a/sys-boot/silo/silo-1.4.14_p20170829.ebuild b/sys-boot/silo/silo-1.4.14_p20170829.ebuild
deleted file mode 100644
index 9fe244c7d56..00000000000
--- a/sys-boot/silo/silo-1.4.14_p20170829.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mount-boot flag-o-matic toolchain-funcs vcs-snapshot
-
-MY_SNAPSHOT="${PN}-2506051d55dd5cb9fe10b4e978e22fa00363044b"
-
-DESCRIPTION="SPARC/UltraSPARC Improved Loader, a boot loader for sparc"
-SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/davem/silo.git/snapshot/${MY_SNAPSHOT}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/davem/silo.git;a=summary"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="-* sparc"
-IUSE=""
-
-DEPEND="sys-fs/e2fsprogs
- sys-apps/sparc-utils"
-RDEPEND=""
-
-ABI_ALLOW="sparc32"
-
-src_prepare() {
- default
-
- # Set the correct version
- sed -i -e "s/1.4.14/1.4.14_git20170829/g" Rules.make || die
-
- # Fix build failure
- # -fno-PIC is needed to shrink silo size back to manageable on
- # profiles where gcc has -fPIC default (via --enable-default-pie).
- sed -i -e "s/-fno-strict-aliasing/-fno-strict-aliasing -U_FORTIFY_SOURCE -mcpu=v9 -fno-PIC/g" Rules.make || die
-
- # Don't strip ieee32.b during compile
- sed -i -e '/^ $(STRIP) ieee32.b/d' first/Makefile || die
-}
-
-src_compile() {
- filter-flags "-fstack-protector"
-
- emake CC="$(tc-getCC)" \
- STRIP="$(tc-getSTRIP)" \
- NM="$(tc-getNM)" \
- LD="$(tc-getLD)"
-}
-
-src_install() {
- default
-
- dodoc first-isofs/README.SILO_ISOFS docs/README*
-
- # Fix maketilo manpage
- rm "${D}"/usr/share/man/man1/maketilo.1
- dosym tilo.1 /usr/share/man/man1/maketilo.1
-}
-
-pkg_postinst() {
- mount-boot_pkg_postinst
- ewarn "NOTE: If this is an upgrade to an existing SILO install,"
- ewarn " you will need to re-run silo as the /boot/second.b"
- ewarn " file has changed, else the system will fail to load"
- ewarn " SILO at the next boot."
- ewarn
-}
diff --git a/sys-boot/silo/silo-1.4.14_p20200602.ebuild b/sys-boot/silo/silo-1.4.14_p20200602.ebuild
index deeed7b293d..bb1eadd65f2 100644
--- a/sys-boot/silo/silo-1.4.14_p20200602.ebuild
+++ b/sys-boot/silo/silo-1.4.14_p20200602.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/davem/silo.git;a=summary"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="-* ~sparc"
+KEYWORDS="-* sparc"
IUSE="tilo-only"
DEPEND="sys-fs/e2fsprogs
@@ -33,24 +33,30 @@ src_prepare() {
sed -i -e '/^ $(STRIP) ieee32.b/d' first/Makefile || die
}
+_emake() {
+ # We inject '-m32' / '-m elf32_sparc' to follow 'Rules.make' defaults.
+
+ emake \
+ HOSTCC="$(tc-getBUILD_CC)" \
+ CC="$(tc-getCC) -m32" \
+ STRIP="$(tc-getSTRIP)" \
+ NM="$(tc-getNM)" \
+ LD="$(tc-getLD) -m elf32_sparc" \
+ TILO_ONLY=$(usex tilo-only yes no) \
+ \
+ "$@"
+}
+
src_compile() {
filter-flags "-fstack-protector"
- CC="$(tc-getCC)" \
- STRIP="$(tc-getSTRIP)" \
- NM="$(tc-getNM)" \
- LD="$(tc-getLD)" \
- emake $(usex tilo-only '-C tilo' '')
+ _emake
}
src_install() {
- default
+ _emake DESTDIR="${D}" install
dodoc first-isofs/README.SILO_ISOFS docs/README*
-
- # Fix maketilo manpage
- rm "${D}"/usr/share/man/man1/maketilo.1
- dosym tilo.1 /usr/share/man/man1/maketilo.1
}
pkg_postinst() {
diff --git a/sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild b/sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild
index 415672bbf77..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
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
-}
diff --git a/sys-boot/unetbootin/Manifest b/sys-boot/unetbootin/Manifest
index 27e5e95bad9..fd507164f4d 100644
--- a/sys-boot/unetbootin/Manifest
+++ b/sys-boot/unetbootin/Manifest
@@ -1,6 +1 @@
-DIST unetbootin-661-qt5.patch.tar.xz 8060 BLAKE2B 58cb323166e344ecabf5d372e80ff0367a1344866a6e8dea4b2677a85ea6ae0b5591480a3bcbbfc3a51d391b07adf0d5f370ee77e4c7e1d6f2b727aedf274cf0 SHA512 c1226575484fa63c94ca4da875a26c7bd64bcb27d8e07ea5b67bb3f2546f31d1360d10c363cd7301476811e332c9524c96d6ba482c894b86a5b28ca8a1c8b385
-DIST unetbootin-661.tar.gz 16257579 BLAKE2B 2f92cf286c8010a80d4d4cc48a7ece55e159af9f3729277d97eb99ef2ebe8945023d03c51d6e97d7101d8547240e3c2152004222ec4c825ef4ab954c4018e7b0 SHA512 bbf74a4c4ca9b52f4da672eb54524b7fcb796c65ba80700dc3c6f2677bde37574f42a11c213cc4d4eee38783aed650beee1e2894f60185745e509a2e9571f70a
-DIST unetbootin-675-qt5.patch.xz 7636 BLAKE2B f8c475491e6cf0557a192380726376c1dadba2e52478139d42023e867de86c5c1727719fa123fb412dbb20fca5763a3192889618e75ef6d8bba2d20eb1cf9403 SHA512 da636a3f6cd6a45d6786d92e94741d74f6c5de7d74570af45eac08718a822cdef5baac6c62d7ed68a788e9518e050f3a48a46f8f374c07e0b4c0d90c3613185d
-DIST unetbootin-675.tar.gz 23221792 BLAKE2B fb3a6fce9d2a47b83e2e4c1a579d20594a637215b7c6456d6b0a59a592da660b13bdbea52aa5a4f902e410e9d0e2d447d085f040d321029a96b7ff957a59d11e SHA512 7cb5da4a876125ff010fc6a5aab2b5bb6eeec0f1ac6f2dd86efa2c3eaebaedff8c2167f9dc77053936955703cd2a98dd11a84b8de930dcfc1c2b0f6aeaf7ee61
-DIST unetbootin-677.tar.gz 23479226 BLAKE2B b5a5b111c5f96cc603975f535b55dd8e6191cc92972f54591ae6673394abae15e2652f737b8dc02f8b26a1247a9663cbda3b0d2d7b8b8dfe9eb117711f08d053 SHA512 f86b25dabc27f12bdb65a590c4ffa25aa509a78aa29cecde73918d8bc36dc3e6597b2b7e1803f7fa86a884347506e9c25b361ce89c26e0f6449e0c1ef29355d1
-DIST unetbootin-681.tar.gz 23481527 BLAKE2B b8c75156539a07bdacf1185ed898867b1e3df91a87486b7291e4bffc0c754c1ea3fe8a13a2ade5507a886e05904daa90877d29bd72ae1c353cb20dd64264e391 SHA512 9ac8c51f3b65bd6f051caa0270c239ec8aaabb2d3b92bec7b18803d3dcfdbe2bbca4e25124477f4e7b83ee10ba2aa08cdf055e8c9bb042cbebcd3ff6a96315b9
+DIST unetbootin-700.tar.gz 16694955 BLAKE2B d8c00b56c5ae2daac696b62ef207c62dc91f67699c8823e2a751eff536d03fd0a50a931e9a4598b05d99be968b7e895ab521f605b4e0080d591a34c9e67f685e SHA512 0d1b23dddf0e0e3eca81f8ef07fe375f0867ee3fa631c3a3cfe33a846b8d704b36e0efe4c947d7c68e5c1bff370ba87c34aa52c5bf8fc414cd89777f9f1858b7
diff --git a/sys-boot/unetbootin/files/unetbootin-581-desktop.patch b/sys-boot/unetbootin/files/unetbootin-581-desktop.patch
deleted file mode 100644
index ab1912b2e8a..00000000000
--- a/sys-boot/unetbootin/files/unetbootin-581-desktop.patch
+++ /dev/null
@@ -1,24 +0,0 @@
- * unetbootin.desktop: error: key "GenericName[en_US]" in group "Desktop Entry"
- is a localized key, but there is no non-localized key "GenericName"
- * unetbootin.desktop: warning: value "Application;System;" for key
- "Categories" in group "Desktop Entry" contains a deprecated value
- * "Application"
-
-
-
---- a/unetbootin.desktop
-+++ b/unetbootin.desktop
-@@ -2,11 +2,11 @@
- Version=1.0
- Name=UNetbootin
- Comment=Tool for creating Live USB drives
--Categories=Application;System;
-+Categories=System;
- Exec=/usr/bin/unetbootin
- Terminal=false
- Type=Application
- Name[en_US]=UNetbootin
--GenericName[en_US]=UNetbootin
-+GenericName=UNetbootin
- Comment[en_US]=Tool for creating Live USB drives
- Icon=unetbootin
diff --git a/sys-boot/unetbootin/metadata.xml b/sys-boot/unetbootin/metadata.xml
index 91ac6550733..191fd609ce6 100644
--- a/sys-boot/unetbootin/metadata.xml
+++ b/sys-boot/unetbootin/metadata.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>jer@gentoo.org</email>
- <name>Jeroen Roovers</name>
- </maintainer>
+ <!-- maintainer-needed -->
<upstream>
<remote-id type="sourceforge">unetbootin</remote-id>
<remote-id type="github">unetbootin/unetbootin</remote-id>
diff --git a/sys-boot/unetbootin/unetbootin-661.ebuild b/sys-boot/unetbootin/unetbootin-661.ebuild
deleted file mode 100644
index e91aabaaf4d..00000000000
--- a/sys-boot/unetbootin/unetbootin-661.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PATCHSET="${P}-qt5.patch.tar.xz"
-inherit desktop qmake-utils
-
-DESCRIPTION="UNetbootin installs Linux/BSD distributions to a partition or USB drive"
-HOMEPAGE="https://github.com/unetbootin/unetbootin"
-SRC_URI="https://github.com/unetbootin/unetbootin/archive/${PV}.tar.gz -> ${P}.tar.gz
- https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-
-UNBI_LINGUAS="
- am ar ast be bg bn ca cs da de el eo es et eu fa fi fo fr gl he hr hu id it
- ja lt lv ml ms nan nb nl nn pl pt_BR pt ro ru si sk sl sr sv sw tr uk ur vi
- zh_CN zh_TW
-"
-
-for lingua in ${UNBI_LINGUAS}; do
- IUSE="${IUSE} l10n_${lingua/_/-}"
-done
-
-S=${WORKDIR}/${P}/src/${PN}
-
-COMMON_DEPEND="
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtwidgets:5
-"
-DEPEND="${COMMON_DEPEND}
- dev-qt/linguist-tools:5
-"
-RDEPEND="${COMMON_DEPEND}
- app-arch/p7zip
- sys-boot/syslinux
- sys-fs/mtools
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-581-desktop.patch"
- "${WORKDIR}"/${PATCHSET/.tar.xz/}
-)
-
-src_prepare() {
- default
-
- # QA check in case linguas are added or removed
- enum() {
- echo ${#}
- }
- [[ $(enum ${UNBI_LINGUAS}) -eq $(( $(enum $(echo ${PN}_*.ts) ) -1 )) ]] \
- || die "Numbers of recorded and actual linguas do not match"
- unset enum
-
- # Remove localisations
- local lingua
- for lingua in ${UNBI_LINGUAS}; do
- if ! use l10n_${lingua/_/-}; then
- sed -i ${PN}.pro -e "/\.*${PN}_${lingua}\.ts.*/d" || die
- rm ${PN}_${lingua}.ts || die
- fi
- done
-}
-
-src_configure() {
- sed -i -e '/^RESOURCES/d' unetbootin.pro || die
-
- UNBN_QTPATH="$(qt5_get_bindir)/"
- "${UNBN_QTPATH}"lrelease ${PN}.pro || die
-
- eqmake5 ${PN}.pro || die
-}
-
-src_install() {
- dobin ${PN}
-
- domenu ${PN}.desktop
-
- for file in ${PN}*.png; do
- size="${file/${PN}_}"
- size="${size/.png}x${size/.png}"
- insinto /usr/share/icons/hicolor/${size}/apps
- newins ${file} ${PN}.png
- done
-
- local lingua
- for lingua in ${UNBI_LINGUAS}; do
- if use l10n_${lingua/_/-}; then
- insinto /usr/share/${PN}
- doins ${PN}_${lingua}.qm
- fi
- done
-}
diff --git a/sys-boot/unetbootin/unetbootin-675.ebuild b/sys-boot/unetbootin/unetbootin-675.ebuild
deleted file mode 100644
index 627b3c0182a..00000000000
--- a/sys-boot/unetbootin/unetbootin-675.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop flag-o-matic qmake-utils
-
-DESCRIPTION="UNetbootin installs Linux/BSD distributions to a partition or USB drive"
-HOMEPAGE="https://github.com/unetbootin/unetbootin"
-SRC_URI="
- https://github.com/unetbootin/unetbootin/archive/${PV}.tar.gz -> ${P}.tar.gz
- https://dev.gentoo.org/~jer/${P}-qt5.patch.xz
-"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-UNBI_LINGUAS="
- am ar ast be bg bn ca cs da de el eo es et eu fa fi fo fr gl he hr hu id it
- ja lt lv ml ms nan nb nl nn pl pt_BR pt ro ru si sk sl sr sv sw tr uk ur vi
- zh_CN zh_TW
-"
-
-for lingua in ${UNBI_LINGUAS}; do
- IUSE="${IUSE} l10n_${lingua/_/-}"
-done
-
-S=${WORKDIR}/${P}/src/${PN}
-
-COMMON_DEPEND="
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtwidgets:5
-"
-BDEPEND="
- ${COMMON_DEPEND}
- dev-qt/linguist-tools:5
-"
-RDEPEND="
- ${COMMON_DEPEND}
- app-arch/p7zip
- sys-boot/syslinux
- sys-fs/mtools
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-675-desktop.patch
- "${WORKDIR}"/${PN}-675-qt5.patch
-)
-
-src_prepare() {
- default
-
- # QA check in case linguas are added or removed
- enum() {
- echo ${#}
- }
- [[ $(enum ${UNBI_LINGUAS}) -eq $(( $(enum $(echo ${PN}_*.ts) ) -1 )) ]] \
- || die "Numbers of recorded and actual linguas do not match"
- unset enum
-
- # Remove localisations
- local lingua
- for lingua in ${UNBI_LINGUAS}; do
- if ! use l10n_${lingua/_/-}; then
- sed -i ${PN}.pro -e "/\.*${PN}_${lingua}\.ts.*/d" || die
- rm ${PN}_${lingua}.ts || die
- fi
- done
- append-cflags -DNOSTATIC
- append-cxxflags -DNOSTATIC
-}
-
-src_configure() {
- sed -i -e '/^RESOURCES/d' unetbootin.pro || die
-
- UNBN_QTPATH="$(qt5_get_bindir)/"
- "${UNBN_QTPATH}"lrelease ${PN}.pro || die
-
- eqmake5 ${PN}.pro || die
-}
-
-src_install() {
- dobin ${PN}
-
- domenu ${PN}.desktop
-
- for file in ${PN}*.png; do
- size="${file/${PN}_}"
- size="${size/.png}x${size/.png}"
- insinto /usr/share/icons/hicolor/${size}/apps
- newins ${file} ${PN}.png
- done
-
- local lingua
- for lingua in ${UNBI_LINGUAS}; do
- if use l10n_${lingua/_/-}; then
- insinto /usr/share/${PN}
- doins ${PN}_${lingua}.qm
- fi
- done
-}
diff --git a/sys-boot/unetbootin/unetbootin-677-r1.ebuild b/sys-boot/unetbootin/unetbootin-677-r1.ebuild
deleted file mode 100644
index 0a9a25ac467..00000000000
--- a/sys-boot/unetbootin/unetbootin-677-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop flag-o-matic qmake-utils xdg-utils
-
-DESCRIPTION="UNetbootin installs Linux/BSD distributions to a partition or USB drive"
-HOMEPAGE="https://github.com/unetbootin/unetbootin"
-SRC_URI="
- https://github.com/unetbootin/unetbootin/archive/${PV}.tar.gz -> ${P}.tar.gz
- https://dev.gentoo.org/~jer/${PN}-675-qt5.patch.xz
-"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-UNBI_LINGUAS="
- am ar ast be bg bn ca cs da de el eo es et eu fa fi fo fr gl he hr hu id it
- ja lt lv ml ms nan nb nl nn pl pt_BR pt ro ru si sk sl sr sv sw tr uk ur vi
- zh_CN zh_TW
-"
-
-for lingua in ${UNBI_LINGUAS}; do
- IUSE="${IUSE} l10n_${lingua/_/-}"
-done
-
-S=${WORKDIR}/${P}/src/${PN}
-
-COMMON_DEPEND="
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtwidgets:5
-"
-BDEPEND="
- ${COMMON_DEPEND}
- dev-qt/linguist-tools:5
-"
-RDEPEND="
- ${COMMON_DEPEND}
- app-arch/p7zip
- sys-boot/syslinux
- sys-fs/mtools
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-675-desktop.patch
- "${WORKDIR}"/${PN}-675-qt5.patch
-)
-
-src_prepare() {
- default
-
- # QA check in case linguas are added or removed
- enum() {
- echo ${#}
- }
- [[ $(enum ${UNBI_LINGUAS}) -eq $(( $(enum $(echo ${PN}_*.ts) ) -1 )) ]] \
- || die "Numbers of recorded and actual linguas do not match"
- unset enum
-
- # Remove localisations
- local lingua
- for lingua in ${UNBI_LINGUAS}; do
- if ! use l10n_${lingua/_/-}; then
- sed -i ${PN}.pro -e "/\.*${PN}_${lingua}\.ts.*/d" || die
- rm ${PN}_${lingua}.ts || die
- fi
- done
- append-cflags -DNOSTATIC
- append-cxxflags -DNOSTATIC
-}
-
-src_configure() {
- sed -i -e '/^RESOURCES/d' unetbootin.pro || die
-
- UNBN_QTPATH="$(qt5_get_bindir)/"
- "${UNBN_QTPATH}"lrelease ${PN}.pro || die
-
- eqmake5 ${PN}.pro || die
-}
-
-src_install() {
- dobin ${PN}
-
- domenu ${PN}.desktop
-
- for file in ${PN}*.png; do
- size="${file/${PN}_}"
- size="${size/.png}x${size/.png}"
- insinto /usr/share/icons/hicolor/${size}/apps
- newins ${file} ${PN}.png
- done
-
- local lingua
- for lingua in ${UNBI_LINGUAS}; do
- if use l10n_${lingua/_/-}; then
- insinto /usr/share/${PN}
- doins ${PN}_${lingua}.qm
- fi
- done
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
diff --git a/sys-boot/unetbootin/unetbootin-681.ebuild b/sys-boot/unetbootin/unetbootin-700.ebuild
index 4f0db3c3d74..59c833f0e6d 100644
--- a/sys-boot/unetbootin/unetbootin-681.ebuild
+++ b/sys-boot/unetbootin/unetbootin-700.ebuild
@@ -2,18 +2,16 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+
inherit desktop flag-o-matic qmake-utils xdg-utils toolchain-funcs
DESCRIPTION="UNetbootin installs Linux/BSD distributions to a partition or USB drive"
HOMEPAGE="https://github.com/unetbootin/unetbootin"
-SRC_URI="
- https://github.com/unetbootin/unetbootin/archive/${PV}.tar.gz -> ${P}.tar.gz
- https://dev.gentoo.org/~jer/${PN}-675-qt5.patch.xz
-"
+SRC_URI="https://github.com/unetbootin/unetbootin/archive/${PV}.tar.gz -> ${P}.tar.gz"
-SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+SLOT="0"
+KEYWORDS="amd64 x86"
UNBI_LINGUAS="
am ar ast be bg bn ca cs da de el eo es et eu fa fi fo fr gl he hr hu id it
@@ -27,27 +25,20 @@ done
S=${WORKDIR}/${P}/src/${PN}
-COMMON_DEPEND="
+BDEPEND="dev-qt/linguist-tools:5"
+DEPEND="
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5
dev-qt/qtwidgets:5
"
-BDEPEND="
- ${COMMON_DEPEND}
- dev-qt/linguist-tools:5
-"
-RDEPEND="
- ${COMMON_DEPEND}
+RDEPEND="${DEPEND}
app-arch/p7zip
sys-boot/syslinux
sys-fs/mtools
"
-PATCHES=(
- "${FILESDIR}"/${PN}-675-desktop.patch
- "${WORKDIR}"/${PN}-675-qt5.patch
-)
+PATCHES=( "${FILESDIR}"/${PN}-675-desktop.patch )
src_prepare() {
default
@@ -68,19 +59,19 @@ src_prepare() {
rm ${PN}_${lingua}.ts || die
fi
done
+
+ sed -i -e '/^RESOURCES/d' unetbootin.pro || die
+
append-cflags -DNOSTATIC
append-cxxflags -DNOSTATIC
}
src_configure() {
- sed -i -e '/^RESOURCES/d' unetbootin.pro || die
-
export QMAKE_CXX="$(tc-getCXX)"
- UNBN_QTPATH="$(qt5_get_bindir)/"
- "${UNBN_QTPATH}"lrelease ${PN}.pro || die
+ "$(qt5_get_bindir)/"lrelease ${PN}.pro || die
- eqmake5 ${PN}.pro || die
+ eqmake5
}
src_install() {
diff --git a/sys-boot/yaboot/files/yaboot-nopiessp-gcc4.patch b/sys-boot/yaboot/files/yaboot-nopiessp-gcc4.patch
deleted file mode 100644
index ed1755b72b3..00000000000
--- a/sys-boot/yaboot/files/yaboot-nopiessp-gcc4.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-disable ssp usage in yaboot itself
-
-unfortunately, since we link against external libs that themselves were built
-with ssp turned on, we have to provide stubs to keep the linking from failing
-
---- yaboot-1.3.13/Config.gentoo
-+++ yaboot-1.3.13/Config.gentoo
-@@ -0,0 +1,6 @@
-+check_gcc=$(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; \
-+ then echo "$(1)"; else echo "$(2)"; fi)
-+
-+CFLAGS += $(call check_gcc, -fno-stack-protector)
-+CFLAGS += $(call check_gcc, --nopie)
-+
---- yaboot-1.3.13/Makefile
-+++ yaboot-1.3.13/Makefile
-@@ -1,6 +1,7 @@
- ## Setup
-
- include Config
-+include Config.gentoo
-
- VERSION = 1.3.13
- # Debug mode (spam/verbose)
-@@ -79,7 +80,7 @@ HOSTCFLAGS = -O2 $(CFLAGS) -Wall -I/usr/
- OBJS = second/crt0.o second/yaboot.o second/cache.o second/prom.o second/file.o \
- second/partition.o second/fs.o second/cfg.o second/setjmp.o second/cmdline.o \
- second/fs_of.o second/fs_ext2.o second/fs_iso.o second/iso_util.o \
-- lib/nosys.o lib/string.o lib/strtol.o lib/vsprintf.o lib/ctype.o lib/malloc.o lib/strstr.o
-+ lib/nosys.o lib/string.o lib/strtol.o lib/vsprintf.o lib/ctype.o lib/malloc.o lib/strstr.o lib/ssp.o
-
- ifeq ($(USE_MD5_PASSWORDS),y)
- OBJS += second/md5.o
---- yaboot-1.3.14/lib/ssp.c
-+++ yaboot-1.3.14/lib/ssp.c
-@@ -0,0 +1,2 @@
-+void __stack_chk_fail(void) {}
-+void __stack_chk_fail_local(void) {}