summaryrefslogtreecommitdiff
path: root/sys-boot
diff options
context:
space:
mode:
Diffstat (limited to 'sys-boot')
-rw-r--r--sys-boot/Manifest.gzbin5907 -> 5901 bytes
-rw-r--r--sys-boot/aboot/Manifest2
-rw-r--r--sys-boot/aboot/aboot-1.0_pre20040408-r3.ebuild6
-rw-r--r--sys-boot/dvhtool/Manifest2
-rw-r--r--sys-boot/dvhtool/dvhtool-1.0.1-r2.ebuild9
-rw-r--r--sys-boot/elilo/Manifest2
-rw-r--r--sys-boot/elilo/elilo-3.16-r6.ebuild (renamed from sys-boot/elilo/elilo-3.16-r5.ebuild)8
-rw-r--r--sys-boot/gnu-efi/Manifest7
-rw-r--r--sys-boot/gnu-efi/files/gnu-efi-3.0.18-refind.patch126
-rw-r--r--sys-boot/gnu-efi/files/gnu-efi-3.0.18-remove-linux-headers.patch14
-rw-r--r--sys-boot/gnu-efi/gnu-efi-3.0.18-r1.ebuild90
-rw-r--r--sys-boot/gnu-efi/gnu-efi-3.0.18-r2.ebuild2
-rw-r--r--sys-boot/gnu-efi/gnu-efi-3.0.18-r3.ebuild (renamed from sys-boot/gnu-efi/gnu-efi-3.0.18.ebuild)26
-rw-r--r--sys-boot/grub/Manifest7
-rw-r--r--sys-boot/grub/files/grub.default-46
-rw-r--r--sys-boot/grub/grub-2.12-r4.ebuild2
-rw-r--r--sys-boot/grub/grub-2.12-r5.ebuild435
-rw-r--r--sys-boot/grub/grub-9999.ebuild88
-rw-r--r--sys-boot/makebootfat/Manifest2
-rw-r--r--sys-boot/makebootfat/makebootfat-1.4.ebuild1
-rw-r--r--sys-boot/milo/Manifest2
-rw-r--r--sys-boot/milo/milo-2.4.18.ebuild7
-rw-r--r--sys-boot/plymouth-openrc-plugin/Manifest2
-rw-r--r--sys-boot/plymouth-openrc-plugin/plymouth-openrc-plugin-0.2.0-r1.ebuild (renamed from sys-boot/plymouth-openrc-plugin/plymouth-openrc-plugin-0.2.0.ebuild)2
-rw-r--r--sys-boot/refind/Manifest3
-rw-r--r--sys-boot/refind/files/refind-0.14.2-fix-gnu-efi-3.0.18.patch77
-rw-r--r--sys-boot/refind/refind-0.14.2-r1.ebuild (renamed from sys-boot/refind/refind-0.14.2.ebuild)25
-rw-r--r--sys-boot/sgibootcd/Manifest2
-rw-r--r--sys-boot/sgibootcd/sgibootcd-0.13.ebuild7
-rw-r--r--sys-boot/uefi-mkconfig/Manifest8
-rw-r--r--sys-boot/uefi-mkconfig/uefi-mkconfig-2.1.ebuild (renamed from sys-boot/uefi-mkconfig/uefi-mkconfig-1.4.ebuild)1
-rw-r--r--sys-boot/uefi-mkconfig/uefi-mkconfig-2.2.ebuild (renamed from sys-boot/uefi-mkconfig/uefi-mkconfig-1.5.ebuild)1
32 files changed, 681 insertions, 291 deletions
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 7025f5830ee3..e431b076a64e 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
Binary files differ
diff --git a/sys-boot/aboot/Manifest b/sys-boot/aboot/Manifest
index 02d4d9c1ff79..e19a4d005f73 100644
--- a/sys-boot/aboot/Manifest
+++ b/sys-boot/aboot/Manifest
@@ -8,7 +8,7 @@ DIST aboot-1.0_pre20040408.tar.bz2 115062 BLAKE2B 49f1b45abcd4726fd036e24709d10b
DIST aboot-2.0_pre20210801.tar.gz 173477 BLAKE2B 54c38a98b9e3e956f08b4fcca6a4f3351364d7774a915916aae8af67237982635a2686c1df0628fc28dcc2443da8ad57be822c8530e1580261c60dde73f00519 SHA512 57181897147bba65e8b216af262bf2d2e57cb76bd809d8207439dbfbe84ff550cf9a43c0f10f9925e54ca21660cfe9441c7607743ff3f7613c1e22e219708081
DIST aboot_gentoo.diff.bz2 9527 BLAKE2B 2492b456f7411630b6ecfb19db775969b69a35c0ef31b2146fd353aac78cf4d3c9ef2162cf54ab4ac025c65607219b3a33a74d2105be196e6dda54dd2509c1f8 SHA512 868a73fee56e9bf6d986175a6a4dc321ed12fb78d74dfb8f1a3e35274577ddc9ea0820768b44836403587b3976ad8dacdcf6562a9ce5c45981c752670901155f
DIST gentoo-headers-base-2.6.22.tar.bz2 4700338 BLAKE2B a264d7999ed7735e42ea21f8cf96b60ca1bdbfcb76dbdfcba14a849043e1f6a9109cd72bf5b91b9ab877dc3025ce6a9270ea914cf277b8f77cecff703646a7ec SHA512 99849928eede0c4b101ddc9179c0974cac6b4f18803dc98b72dcbe80cea88d3062f709beaa1b890edbed9c147be0dd516065d4cee945164b5d9f19f7a3cf249d
-EBUILD aboot-1.0_pre20040408-r3.ebuild 2649 BLAKE2B 5bd3349ee67f9f3f6b5254386cc20da80bdebe08e6815e03c614231cdce59442677248c82674351be86838d9e39664d063f55b29231f72bc75a6812d6f069f6a SHA512 ce7545633ba5322d5f0f272973837bda883326f60cb9384922f419ef3061e70075aa0b7e737b9386ae42612bb1c2dc488ed73f20b0afa300012e3cf8228d0581
+EBUILD aboot-1.0_pre20040408-r3.ebuild 2619 BLAKE2B c4ad0c5f96bd7ba1c00a00a69e1d459250ea388ad664017f5d993a340f2f3d0031158845060fc26a88ae6923632d6e83c533ec6e041d28c7fa04f08b231d5167 SHA512 726a4f2f2c95abac3b63e49e0bc6e1f551f227ece092096f09f17165de6264acd342765e48aa6a76852efee5fae7abc967f83e27d06aa18d6cc279a0eec8e5fc
EBUILD aboot-2.0_pre20210801.ebuild 2022 BLAKE2B 0a60c519407661b734146b9e4204714d9ad68d9675b0c1de15eac9e8eef6b5db219c98d9abc1b7127739b127835618e3ac74c300751fc3735a1183debd580bf1 SHA512 841d1ed7e6f98020632443da011f1ace98dec2fb71f02a27f1c7ed320f3fb37d34b481cd946675855e5fb820b1d3aa25e62635c2e3200cecf708a1bc319c57cb
EBUILD aboot-9999.ebuild 1926 BLAKE2B 788056e318b044ac1b5f16bf864908f0faa8eaf3e9060ba5bb46f942f48bb313c95fd290c1b76c2775d97a79cfafbb3041cad3fa22fd8ad97863ad6ec7de6bde SHA512 4c9414846549d9405099d37fb697a48a2d29042f12fa06d42cb621675ad807a045ebb6c81f5591b3b660262d5d4beeb7a5248d806d0212bbe5d9e69a3bd2ee34
MISC metadata.xml 386 BLAKE2B cc554fc4d2a279797d696e72872fc78bf58af8a99aa76d72fcc61672e011121e7253911f57101c34daf02fd14bce6c61143aeeabb0d2b44ec6b3c6fadf9168e2 SHA512 2a7a7483e20736b6670cfb9f0a6de9088c0e7e6087a8157d5edbafa6256b9b8ddf04511d7cb815bf6acc96428120ad36551ae0a86f5c2bb451e08665d0552907
diff --git a/sys-boot/aboot/aboot-1.0_pre20040408-r3.ebuild b/sys-boot/aboot/aboot-1.0_pre20040408-r3.ebuild
index 80ae29b8a244..a14b4ee280ba 100644
--- a/sys-boot/aboot/aboot-1.0_pre20040408-r3.ebuild
+++ b/sys-boot/aboot/aboot-1.0_pre20040408-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -17,10 +17,6 @@ SRC_URI="http://aboot.sourceforge.net/tarballs/${P}.tar.bz2
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="-* ~alpha"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
src_unpack() {
unpack ${A}
diff --git a/sys-boot/dvhtool/Manifest b/sys-boot/dvhtool/Manifest
index 2e86cc694f5e..793b67c49e2d 100644
--- a/sys-boot/dvhtool/Manifest
+++ b/sys-boot/dvhtool/Manifest
@@ -3,5 +3,5 @@ AUX dvhtool-1.0.1-debian-warn_type_guess.diff 296 BLAKE2B 294ee95edf5b4c853287d1
AUX dvhtool-1.0.1-debian-xopen_source.diff 208 BLAKE2B 825bf31d2ca44127b77caa7f011b2f7306bc5c8bbc88c6ca7ca4221d5f418148ece4157723ed4ed3ebb28737caa9fb811f66eb64292e0aece3ebcfbb62f695a0 SHA512 500a25a70f94af2911387729cc7fc4320904049f15c437b85030b3bb8694d798dd55a839df141823947b53758888a8e47eb02d24643209401406e50d68196ab1
AUX dvhtool-1.0.1-debian.diff 4724 BLAKE2B dd170f76faadff4dd575eb2bac62cdb86874807bf4a6c92bf0a85df00db6cfde99c92904580d1002833be8485dffb735ebdcdb7e0292be283230e35a1e2cbede SHA512 e495f03249b9b026cee2caa68653630216e7884bd7cb441d7d3939f9cf1d9a48892bad15416cdd205c5e28e6d0a31442aba888cf1cc4900b2c098decdce5ac14
DIST dvhtool_1.0.1.orig.tar.gz 53283 BLAKE2B 7268d3bda57988ab9432d88c3c220a450a4726fd5b2560315e731b50d9088f66821a2629f7d0059305c880e429b77f40f609ea0798d362fb7b5831002a453967 SHA512 e81c4427f98a7aa79b9e8cee6fad35822d5fa48fda17f656407d1d6de50658ff2c8b6c3a890ae07afafebf126b5388c98ebf63af4a93bf1091161a27ea09d140
-EBUILD dvhtool-1.0.1-r2.ebuild 898 BLAKE2B 8f699bc867844d38e90e12144c306296c8227884a79c0bb30892ea2a198869d7f662886dfef0218065b696df2a02c2326963489470286d611304f06931bdae87 SHA512 92b3acbd9149fd72cbed0b932dd8d95f61b1d16fa3d9595b70b13ac41444a79da5010d92ce8015a087ec9699b8d5c91e7ecaa8f3ca24ee62e19759b08e55825d
+EBUILD dvhtool-1.0.1-r2.ebuild 867 BLAKE2B 42a6847dc90c4c1e93484effe8def7b43ab520145d862a59221b037f3140a9af63acbecf5762d59e50bd57880de91402c8468d51379686b6a0676f93fd7aca96 SHA512 2b53f2bbb0e8f789a2a22eb013dc0a11bad689759cc662c748e1419ee216fe1cace58a20557d98a4760fe776448f8b9dd32d26e2039dfbec4eeac06724fe3e17
MISC metadata.xml 255 BLAKE2B 38f74d4046b8cadf4d1f04a3c35a7b1dc04a47c8658533c1bc8e2d69da08458084cd52dd84757f3e9fd8368c98f47cbbbf1e4fa24a800aacb55bbed34b83f1f6 SHA512 08802a1297d8dbe5915854d495674e1d9835e664ecb645908b90490c57ab7fc2f6a1ee9b994c45716465dc450ff4dcedf51e575498ec0d6b5a31176c58de1775
diff --git a/sys-boot/dvhtool/dvhtool-1.0.1-r2.ebuild b/sys-boot/dvhtool/dvhtool-1.0.1-r2.ebuild
index ba84fd2db50a..ac542155c604 100644
--- a/sys-boot/dvhtool/dvhtool-1.0.1-r2.ebuild
+++ b/sys-boot/dvhtool/dvhtool-1.0.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,17 +8,12 @@ inherit autotools toolchain-funcs
DESCRIPTION="Tool to copy kernel(s) into the volume header on SGI MIPS-based workstations"
HOMEPAGE="http://packages.debian.org/unstable/utils/dvhtool"
SRC_URI="mirror://debian/pool/main/d/dvhtool/dvhtool_${PV}.orig.tar.gz"
+S="${S}.orig"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~mips ~x86"
-IUSE=""
-DEPEND=""
-RDEPEND=""
-
-S="${S}.orig"
-
PATCHES=(
"${FILESDIR}/${P}-debian.diff"
"${FILESDIR}/${P}-debian-warn_type_guess.diff"
diff --git a/sys-boot/elilo/Manifest b/sys-boot/elilo/Manifest
index 2762353ee62d..e608e0d6e2b2 100644
--- a/sys-boot/elilo/Manifest
+++ b/sys-boot/elilo/Manifest
@@ -6,5 +6,5 @@ AUX elilo-3.16-strncpy-clash.patch 744 BLAKE2B 421530303406aa819e07883d4b80a27da
AUX elilo.conf.sample 150 BLAKE2B d823113e1fcdaf08398f09b6fe9b4b2284004be2886799a69fd776bfaab194413c51969c65d1d81607c0a46699e84132b88bdd2a82f6f41a65ae6fbb061d9356 SHA512 3f99527724759f5c03a5f244b957bc6d50ca378f2b66cbcb19f73fa721d2fd76119ae90669e4cce045f5bc66a80d46b21e76e8c4895d23b22df23ec69262b0e0
DIST elilo-3.16-all.tar.gz 485844 BLAKE2B 813762ffef32a640c074973a07d886e0de137be10ff08e9375cd894b0d83dd8bc96cc33f80da1e698db49cc9f105a905abb2fa04048eaca394d3d70e79cb8534 SHA512 4289b45f2e40b2a12167f2efd9a482cf97baedb13fc24813f360f375296d0d3f107d6c980b4b31262816f664a2536353fa124e689cbd65093da9b16fdddaf842
DIST elilo_3.14-3.debian.tar.gz 32179 BLAKE2B 84f8055d3e33b99ce91079768da80a8800c3c2f569ce5619641a983efb943055dfd9a8fb2fda8e5e6d60009ffefbcc1573098f022f06635d4d5304bc3bfddf1e SHA512 b2d5927bf84d61cc432fc916301ddb3be74db16d3e5ba4f13039e2925606b8870991fbb17f837005d8f2b655b7dcd2b2311dfacd7f02183762caf7081ede638f
-EBUILD elilo-3.16-r5.ebuild 2263 BLAKE2B 0591a65f7041e68564886707cb61353d693b20ecf0251f4c603f6e6c0cee8d3cfea862f1c17ff62cdc8c33b588d8ada1419f0ffa3692971ae4bdb65b05420b4a SHA512 c284e993fecfca9c028c9e33e639ff90fe0955a0f9e354abe1725f81e410a5d8adc3c331bce27188580d92bdc5e1e9d7a297baa07863494495128c5cbf9e9f77
+EBUILD elilo-3.16-r6.ebuild 2299 BLAKE2B 91222881c0919f2d01d636084bd0edaa5105f0bd27b9fa3f78b1ebb37959b6b720d5a3a4e9dec95eb711d2a0330f17d53c3fc5433a42fb14eb78eb2b286a978d SHA512 82ba25dc800d55820ba1ced27ba7e413d50c64eccc6a7d52e1c01b5d28619bf7a97aa61dacb3ffce56a599717c6fab1c5b9a1e8acb05157f93d004030523289c
MISC metadata.xml 243 BLAKE2B 66e62c67d6277e9e807057685d0ee4ad0b2078abcc66b35beeb189c4f049c67c25829a0ec1c6a259888ed559fb2a46e7587c46dd6faebf4689a61d3eb8c08125 SHA512 2d4d88b896e79aa0028444a091a3d4b3b2c8bad11f99b55afc2a849d174ebb3932d9bca6bc56315660a7add8aed7964a5dd86ed8b0c5d730c5a14b1ac0d007bb
diff --git a/sys-boot/elilo/elilo-3.16-r5.ebuild b/sys-boot/elilo/elilo-3.16-r6.ebuild
index f7c1659896c8..6d1f82ca9369 100644
--- a/sys-boot/elilo/elilo-3.16-r5.ebuild
+++ b/sys-boot/elilo/elilo-3.16-r6.ebuild
@@ -3,17 +3,17 @@
EAPI=8
-inherit toolchain-funcs
+inherit secureboot toolchain-funcs
DESCRIPTION="Linux boot loader for EFI-based systems such as IA-64"
HOMEPAGE="https://sourceforge.net/projects/elilo/"
SRC_URI="https://downloads.sourceforge.net/elilo/${P}-all.tar.gz
mirror://debian/pool/main/e/elilo/elilo_3.14-3.debian.tar.gz"
+S="${WORKDIR}/${P}-source"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ia64 ~x86"
-IUSE=""
# gnu-efi contains only static libs, so there's no run-time dep on it
DEPEND=">=sys-boot/gnu-efi-3.0g
@@ -22,8 +22,6 @@ DEPEND=">=sys-boot/gnu-efi-3.0g
RDEPEND="sys-boot/efibootmgr
sys-fs/dosfstools[compat]"
-S="${WORKDIR}/${P}-source"
-
PATCHES=(
"${FILESDIR}"/${PN}-3.16-elilo-loop.patch #299665
"${FILESDIR}"/${PN}-3.16-gnu-efi-3.0.6-ia64.patch
@@ -91,4 +89,6 @@ src_install() {
dodoc docs/* "${FILESDIR}"/elilo.conf.sample
doman debian/*.[0-9]
+
+ secureboot_auto_sign --in-place
}
diff --git a/sys-boot/gnu-efi/Manifest b/sys-boot/gnu-efi/Manifest
index dc3139e67ad1..121364a2282c 100644
--- a/sys-boot/gnu-efi/Manifest
+++ b/sys-boot/gnu-efi/Manifest
@@ -1,12 +1,11 @@
AUX gnu-efi-3.0.18-clang.patch 904 BLAKE2B dd7c2aed740e9ecfcd918ab4ce4ab05090792f7c77493dbd401b3a54aa966748bb4aaad44d5787125c5e931506b529e91829924822413f00ab2768ef78f37bdb SHA512 9464474ec0c945d2546549f78ab38e30eaf9108dcca2ece33c3c83b3ab3bc471c8cea08197c9ffb0fcd1aa45b8544e2e57d988ca05127e5dc0dc8e945d323033
-AUX gnu-efi-3.0.18-refind.patch 3134 BLAKE2B 22c9f9b35c51dc0a6f3860d30c327b9ece84fa47bd7d867eda7d21f09a6020b200147ee4842440b43ca3b3069ef216eda7fe4e853506a6593c129aed19db3d49 SHA512 6caa3816ca98f5bdcac1204420eccf3911b1ba1faad41a8a080264a177b0f5ded60238fbb76cce279671b46776a483b696a0d51e2eebcef387a35c0330f7d58a
+AUX gnu-efi-3.0.18-remove-linux-headers.patch 360 BLAKE2B 2000100455634cfc6244ac1a54e1318b37efc0e411f9780d520cff7d30524f0e61e2980f0067cc27450375745f948671b3e4b4674d87db6f6675f93b590570f0 SHA512 1eb9d2299fd078c5616bbb4e9323544ef70039992cc5262c1bf9e41f4f9c40de70ad4aee973e9d5d665a1b7cc2d2a6b721d13b17326af0cd7cd0b735a7fd8c7e
AUX gnu-efi-3.0.9-fix-clang-build.patch 691 BLAKE2B 5b3f60e27982cd9e2cfb385851af4840d0301c1fb590d34b029e18a239a232ecca6a62431e10138d4e12cb44a5f64b415936935c1bdaf601dcf605ebe892de54 SHA512 1f77f4a5dcd2f1589cd6950da3462f2508d0ac51c2d2268400414c336ddd41fcf430e79fb702fd5aa99cb4be0bf0fc6eabe9362d736a1223b1c53c2c0b319584
DIST gnu-efi-3.0.15.tar.bz2 159399 BLAKE2B 0df93d8cacfa1e6d4b7731e32287d4386da9375c5e5c5847df8a29c99d70f5c24b14abc5e44ab9d0a39a6ec96682eb2b5e84d81a5a142d44a50a522a4ae0e3c2 SHA512 64d408b6d115bdc6eebae12fbd6cd907ed5f847f54e506c1e8f8ea5de38a95cf6fac66ab1009bd1d0bd2d54ad45ad598d29bcc303926a5899bf5cc25448cbb2f
DIST gnu-efi-3.0.17.tar.bz2 165568 BLAKE2B 27f8171b411a6a8a138d44d91c7e4e4291aa399562825d51a398913572119482ffeb303d7508ae13eacd2cd10b8f5098405ab16eb56243587efe93235f661285 SHA512 0893ca234272584f889b1ae1c75341a9ceee60acfd32765daa5d704191ba00450536a287b949304c6d055d1bf125cc29e24fc41df8e5230e0da4f9d944876512
DIST gnu-efi-3.0.18.tar.bz2 167567 BLAKE2B e080fa4c57a281452a6473304871304d1b5c30d42ee728b4c0c084258ed2f6f2099c068ec5841cee81ecf664dd658dee3b94d68324ebaa498cb49cec4f7f7df9 SHA512 39f9fa14b880441a94a04400ff8850efdd9474929e5501dfd05af06e7747b4d0f7cb742ac811c7026cf52d00508efb73018be4d61d63a1211de0cd931cbc473d
EBUILD gnu-efi-3.0.15.ebuild 1923 BLAKE2B 754b9d84be37fa39d42a752c8ea63754d7acc111403dc22c9531f665ae78796ce6a2d004de4e8c1eacff4e5456091af6987a42732bc1200e4b73041079beb491 SHA512 22508b5c37a49ed29cddd57e08565bf79c5c6620921e8b262b9f930298f583ed24c5958a4862984ed5f1a9f286a7eecdc3c7f5f45ee4508b3e6ffd14b307fbd3
EBUILD gnu-efi-3.0.17.ebuild 1954 BLAKE2B 03313137ea41a1a8ad4880076296e7dbc38e1276ff3a46187c8c5fe0db7b833c437e21fb86e15a992ec45824a23798bdd53d16770b0bb1117c9a1afec578ed3d SHA512 c113cdd429bdb6c86641b8e76c859f4e28d377d7f2d441857d077cca0b7b6bc1e54071f4354cef2fc5d17ae2cf7e4312b0a76b622f6428a51ce4a02413c2bc41
-EBUILD gnu-efi-3.0.18-r1.ebuild 1971 BLAKE2B 5fa0fb8a40c59b33a2b8bdbae2f4304460bb84bb1eafae0b210aa6394e111ed11461f9ad38fb7cbf43a3a8086eb2aa4b2712b6d098f7d63c77ae7deafd671a02 SHA512 d8e47be2281373c720c0851580e36afdc255dca6402bb759c416b456244e29c78a6c8032bb89fb021a1a82deadff05b19b41bdae8ebdd7b49b0110233a1086d1
-EBUILD gnu-efi-3.0.18-r2.ebuild 1942 BLAKE2B 95e0ad4afa13a39990120c277d3b2dd31d02f15b539e5355593ca642f82810d080bb6074e45bef28f503cc3c070bbdba8fb110f05514f2b778511a0f54fddcbd SHA512 c3b7cc45ef9a57bcc569a6396b77fe9389cfb52fc0a644199afd545ae3bdb3cf6017949bb8db4e88b91d50a2473e5bd92206369b8d5940dc8d10441453f2e81e
-EBUILD gnu-efi-3.0.18.ebuild 1897 BLAKE2B c2bf428fc4688807ea1cb6db1fce16119abd72ec9aae861f87d6bf700f1a22d040ab744cf874998dddce460680af380884066d50172ea55e79c24ade528fe037 SHA512 5ad5f279e6bb93f0f13dbcad88026f1420c23fc802224fa6db676544679e9dbd09810659bc6f0102e9ced30c88a5b6095041781a5d5b1be6e8bef9b9957d50a6
+EBUILD gnu-efi-3.0.18-r2.ebuild 1938 BLAKE2B 18a2d294be0f855a8302806af7c893c6febbe598bd993e8036ef763ed9e5cac353a7ed87f5c572d3d6e9db8f8ab28eace207e14059493e656364c7c1b8248ca1 SHA512 7344022247b0cc0107f695893e20da5b62519e7f36dbd5b98d2195ade76f32e83e0e756cff8b877f14a9860743cc148380168de780c58b36eaf22a1c415e0bce
+EBUILD gnu-efi-3.0.18-r3.ebuild 2472 BLAKE2B a2f6d030c89b88d0afbf895678e8b13105e873616ac73cfb468f9d57000207475d54fd63144befff3255d13b1e0e226cdb236f8aa13cfa87cb82198db8aa47cb SHA512 d9b73839447277aea53e2bf57b52b188bc314324c4a1006871bd34159aceb642f223def6d6dc2a84b03b693774de997cc8c21ffafcdf814a7eb8c3e79b3301fb
MISC metadata.xml 381 BLAKE2B a3cbadc2ae97d29ac87c04f3209cd7f4879ef70903907f319b425f038f07fd6bbc357a0291e70909a3b0b2097de6b63daf0f568d0fd7097c7bd2d9c9c7f3a963 SHA512 abbdda69a47f94442977af7491596e40873767256f5e75c3c06b614a369ec8cb7103a132e77a95c99ba24e4b205e5c3fc267039c920c1268a19b17e4ac779b79
diff --git a/sys-boot/gnu-efi/files/gnu-efi-3.0.18-refind.patch b/sys-boot/gnu-efi/files/gnu-efi-3.0.18-refind.patch
deleted file mode 100644
index d198426c4635..000000000000
--- a/sys-boot/gnu-efi/files/gnu-efi-3.0.18-refind.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-https://github.com/ncroxon/gnu-efi/commit/f5bb548df572c992fe3389a586bec3a19b092c18
-https://github.com/ncroxon/gnu-efi/commit/6b9dae0bef0fab82230a6672eaadd38d739e3e1e
-
-From f5bb548df572c992fe3389a586bec3a19b092c18 Mon Sep 17 00:00:00 2001
-From: Callum Farmer <gmbr3@opensuse.org>
-Date: Thu, 25 Apr 2024 15:27:26 +0100
-Subject: [PATCH] Align RTLIB CopyMem/SetMem with normal versions
-
-Looks like 699e452654df6de53890ae994756b0d47237e3ac broke rEFInd
-(https://sourceforge.net/p/refind/code/ci/189e405630293445df8565e36b831bba56e87093/)
---- a/inc/efirtlib.h
-+++ b/inc/efirtlib.h
-@@ -45,6 +45,7 @@ RtZeroMem (
- );
-
- VOID
-+EFIAPI
- RUNTIMEFUNCTION
- RtSetMem (
- IN VOID *Buffer,
-@@ -53,10 +54,11 @@ RtSetMem (
- );
-
- VOID
-+EFIAPI
- RUNTIMEFUNCTION
- RtCopyMem (
- IN VOID *Dest,
-- IN CONST VOID *Src,
-+ IN VOID *Src,
- IN UINTN len
- );
-
---- a/lib/runtime/efirtlib.c
-+++ b/lib/runtime/efirtlib.c
-@@ -42,6 +42,7 @@ RtZeroMem (
- #pragma RUNTIME_CODE(RtSetMem)
- #endif
- VOID
-+EFIAPI
- RUNTIMEFUNCTION
- RtSetMem (
- IN VOID *Buffer,
-@@ -61,10 +62,11 @@ RtSetMem (
- #pragma RUNTIME_CODE(RtCopyMem)
- #endif
- VOID
-+EFIAPI
- RUNTIMEFUNCTION
- RtCopyMem (
- IN VOID *Dest,
-- IN CONST VOID *Src,
-+ IN VOID *Src,
- IN UINTN len
- )
- {
-
-From 6b9dae0bef0fab82230a6672eaadd38d739e3e1e Mon Sep 17 00:00:00 2001
-From: Callum Farmer <gmbr3@opensuse.org>
-Date: Sat, 27 Apr 2024 13:14:28 +0100
-Subject: [PATCH] Fixup string functions for new CopyMem
-
-Signed-off-by: Callum Farmer <gmbr3@opensuse.org>
---- a/lib/runtime/rtstr.c
-+++ b/lib/runtime/rtstr.c
-@@ -69,10 +69,13 @@ RtStrnCpy (
- )
- // copy strings
- {
-+ CHAR16 CopySrc = *Src;
-+ CHAR16 *PCopySrc = &CopySrc;
-+
- UINTN Size = RtStrnLen(Src, Len);
- if (Size != Len)
- RtSetMem(Dest + Size, (Len - Size) * sizeof(CHAR16), '\0');
-- RtCopyMem(Dest, Src, Size * sizeof(CHAR16));
-+ RtCopyMem(Dest, PCopySrc, Size * sizeof(CHAR16));
- }
-
- #ifndef __GNUC__
-@@ -105,10 +108,13 @@ RtStpnCpy (
- )
- // copy strings
- {
-+ CHAR16 CopySrc = *Src;
-+ CHAR16 *PCopySrc = &CopySrc;
-+
- UINTN Size = RtStrnLen(Src, Len);
- if (Size != Len)
- RtSetMem(Dest + Size, (Len - Size) * sizeof(CHAR16), '\0');
-- RtCopyMem(Dest, Src, Size * sizeof(CHAR16));
-+ RtCopyMem(Dest, PCopySrc, Size * sizeof(CHAR16));
- return Dest + Size;
- }
-
-@@ -137,10 +143,12 @@ RtStrnCat (
- )
- {
- UINTN DestSize, Size;
-+ CHAR16 CopySrc = *Src;
-+ CHAR16 *PCopySrc = &CopySrc;
-
- DestSize = RtStrLen(Dest);
- Size = RtStrnLen(Src, Len);
-- RtCopyMem(Dest + DestSize, Src, Size * sizeof(CHAR16));
-+ RtCopyMem(Dest + DestSize, PCopySrc, Size * sizeof(CHAR16));
- Dest[DestSize + Size] = '\0';
- }
-
---- a/lib/str.c
-+++ b/lib/str.c
-@@ -201,11 +201,13 @@ StrDuplicate (
- {
- CHAR16 *Dest;
- UINTN Size;
-+ CHAR16 CopySrc = *Src;
-+ CHAR16 *PCopySrc = &CopySrc;
-
- Size = StrSize(Src);
- Dest = AllocatePool (Size);
- if (Dest) {
-- CopyMem (Dest, (void *)Src, Size);
-+ CopyMem (Dest, PCopySrc, Size);
- }
- return Dest;
- }
diff --git a/sys-boot/gnu-efi/files/gnu-efi-3.0.18-remove-linux-headers.patch b/sys-boot/gnu-efi/files/gnu-efi-3.0.18-remove-linux-headers.patch
new file mode 100644
index 000000000000..e997aae58836
--- /dev/null
+++ b/sys-boot/gnu-efi/files/gnu-efi-3.0.18-remove-linux-headers.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/888829
+
+--- a/apps/Makefile
++++ b/apps/Makefile
+@@ -41,9 +41,7 @@
+
+ include $(SRCDIR)/../Make.defaults
+
+-LINUX_HEADERS = /usr/src/sys/build
+ APPSDIR = $(LIBDIR)/gnuefi/apps
+-CPPFLAGS += -D__KERNEL__ -I$(LINUX_HEADERS)/include
+ CRTOBJS = $(TOPDIR)/$(ARCH)/gnuefi/crt0-efi-$(ARCH).o
+
+ LDSCRIPT = $(TOPDIR)/gnuefi/elf_$(ARCH)_efi.lds
diff --git a/sys-boot/gnu-efi/gnu-efi-3.0.18-r1.ebuild b/sys-boot/gnu-efi/gnu-efi-3.0.18-r1.ebuild
deleted file mode 100644
index 4261653d9664..000000000000
--- a/sys-boot/gnu-efi/gnu-efi-3.0.18-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 2004-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Library for build EFI Applications"
-HOMEPAGE="https://sourceforge.net/projects/gnu-efi/"
-SRC_URI="https://downloads.sourceforge.net/gnu-efi/${P}.tar.bz2"
-
-# inc/, lib/ dirs (README.efilib)
-# - BSD-2
-# gnuefi dir:
-# - BSD (3-cluase): crt0-efi-ia32.S
-# - GPL-2+ : setjmp_ia32.S
-LICENSE="GPL-2+ BSD BSD-2"
-SLOT="0"
-KEYWORDS="-* amd64 arm arm64 ~ia64 ~riscv x86"
-IUSE="abi_x86_32 abi_x86_64 custom-cflags"
-REQUIRED_USE="
- amd64? ( || ( abi_x86_32 abi_x86_64 ) )
- x86? ( || ( abi_x86_32 abi_x86_64 ) )
-"
-
-# These objects get run early boot (i.e. not inside of Linux),
-# so doing these QA checks on them doesn't make sense.
-QA_EXECSTACK="usr/*/lib*efi.a:* usr/*/crt*.o"
-RESTRICT="strip"
-
-PATCHES=(
- "${FILESDIR}"/${P}-clang.patch
- "${FILESDIR}"/${P}-refind.patch
-)
-
-src_prepare() {
- default
- sed -i -e "s/-Werror//" Make.defaults || die
-}
-
-efimake() {
- local arch=
- case ${CHOST} in
- arm*) arch=arm ;;
- aarch64*) arch=aarch64 ;;
- ia64*) arch=ia64 ;;
- i?86*) arch=ia32 ;;
- riscv64*) arch=riscv64;;
- x86_64*) arch=x86_64 ;;
- *) die "Unknown CHOST" ;;
- esac
-
- local args=(
- ARCH="${arch}"
- HOSTCC="${BUILD_CC}"
- CC="${CC}"
- AS="${AS}"
- LD="${LD}"
- AR="${AR}"
- OBJCOPY="${OBJCOPY}"
- PREFIX="${EPREFIX}/usr"
- LIBDIR='$(PREFIX)'/$(get_libdir)
- )
- emake -j1 "${args[@]}" "$@"
-}
-
-src_compile() {
- tc-export BUILD_CC AR AS CC LD OBJCOPY
-
- if ! use custom-cflags; then
- unset CFLAGS CPPFLAGS LDFLAGS
- fi
-
- if use amd64 || use x86; then
- use abi_x86_32 && CHOST=i686 ABI=x86 efimake
- use abi_x86_64 && CHOST=x86_64 ABI=amd64 efimake
- else
- efimake
- fi
-}
-
-src_install() {
- if use amd64 || use x86; then
- use abi_x86_32 && CHOST=i686 ABI=x86 efimake INSTALLROOT="${D}" install
- use abi_x86_64 && CHOST=x86_64 ABI=amd64 efimake INSTALLROOT="${D}" install
- else
- efimake INSTALLROOT="${D}" install
- fi
- einstalldocs
-}
diff --git a/sys-boot/gnu-efi/gnu-efi-3.0.18-r2.ebuild b/sys-boot/gnu-efi/gnu-efi-3.0.18-r2.ebuild
index 32be646c8652..4a3db4824f5b 100644
--- a/sys-boot/gnu-efi/gnu-efi-3.0.18-r2.ebuild
+++ b/sys-boot/gnu-efi/gnu-efi-3.0.18-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://downloads.sourceforge.net/gnu-efi/${P}.tar.bz2"
# - GPL-2+ : setjmp_ia32.S
LICENSE="GPL-2+ BSD BSD-2"
SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~ia64 ~riscv ~x86"
+KEYWORDS="-* amd64 arm arm64 ~ia64 ~riscv x86"
IUSE="abi_x86_32 abi_x86_64 custom-cflags"
REQUIRED_USE="
amd64? ( || ( abi_x86_32 abi_x86_64 ) )
diff --git a/sys-boot/gnu-efi/gnu-efi-3.0.18.ebuild b/sys-boot/gnu-efi/gnu-efi-3.0.18-r3.ebuild
index bfee671f37fb..5e1f208f9dba 100644
--- a/sys-boot/gnu-efi/gnu-efi-3.0.18.ebuild
+++ b/sys-boot/gnu-efi/gnu-efi-3.0.18-r3.ebuild
@@ -23,11 +23,37 @@ REQUIRED_USE="
x86? ( || ( abi_x86_32 abi_x86_64 ) )
"
+# for ld.bfd and objcopy
+BDEPEND="sys-devel/binutils"
+
# These objects get run early boot (i.e. not inside of Linux),
# so doing these QA checks on them doesn't make sense.
QA_EXECSTACK="usr/*/lib*efi.a:* usr/*/crt*.o"
RESTRICT="strip"
+PATCHES=(
+ "${FILESDIR}"/${P}-clang.patch
+ "${FILESDIR}"/${PN}-3.0.18-remove-linux-headers.patch
+)
+
+check_and_set_objcopy() {
+ if [[ ${MERGE_TYPE} != "binary" ]]; then
+ # bug #931792
+ # llvm-objcopy does not support EFI target, try to use binutils objcopy or fail
+ tc-export OBJCOPY
+ OBJCOPY="${OBJCOPY/llvm-/}"
+ LANG=C LC_ALL=C "${OBJCOPY}" --help | grep -q '\<pei-' || die "${OBJCOPY} (objcopy) does not support EFI target"
+ fi
+}
+
+pkg_pretend() {
+ check_and_set_objcopy
+}
+
+pkg_setup() {
+ check_and_set_objcopy
+}
+
src_prepare() {
default
sed -i -e "s/-Werror//" Make.defaults || die
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 9401eb4edc47..cc2cffac98ce 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -2,13 +2,14 @@ AUX gfxpayload.patch 1118 BLAKE2B 4104fc696535b1c3feba5876bccc64f9b2e52319ee992c
AUX grub-2.02_beta2-KERNEL_GLOBS.patch 2355 BLAKE2B c120f06d3597a2ff9566778afd69d80a814904726e47766b7582626d182a2703e54fd69ecf00b54bcc5541e22a3d93ff8b85c9cf8d0440623454e8e7da3aaa91 SHA512 23416ac17838f101ed73103af6aa7305609667f47288bfa3bd5ae80d1123da664ba6f9b518451b0bd5f528e069893a51444d203953be0b0644790cea0b4b9cf0
AUX grub-2.06-test-words.patch 2553 BLAKE2B 21d6167945b461be7cc73198451ae0dc15ce0dfe2a301342f1a3bb75d6fcb5d73da9997fb8a93f36dffb43a351f056a1a4db9eed3147b0f3e77c65034b805c64 SHA512 627422377bdad97d0197f178814d6616a0f7ec07357182b00166a455d38ba0c5a60185c5febf4dfb7a11b35f26c7af607508cb5f418acdb7290517240fbd99e4
AUX grub-2.12-fwsetup.patch 1156 BLAKE2B 0a2097c324351ba00c9cb375401a4e06701572d7b000888ff202ab3a6b701dfd4d89314d190b1992ddbebe8b57701de760cf656b847f39ac70280b87e557f3b0 SHA512 3b2ea63a35fce6d375e1e6ed5979f93acc80e2512d4b4fbee72b4a26f67a1a41c20e18ecab81d5250b61c3f41831e421cb8a29b38cd0a4f40694e7e1a6e565c5
-AUX grub.default-4 2644 BLAKE2B a954461f46df2ea1be2b6a6ae0ba3c023bd72f75d1998ee3f124eadd4bdc05de86fba77b3f693cb567e85daa1cdf39aa1f9f75ec3ad4b0e67cf93608c73e3721 SHA512 4d9004f9d93ca8cf0918c587df29a423d4122c86bc6ae6b08438e094e5276c5a21d30688c99f4b52ce40df78739a72dbddbb2bcefbcdd582374a62f565d057bf
+AUX grub.default-4 2631 BLAKE2B fc81f26d599320776999ccef0c20d5cdac0034ba6cd7f5451c8eee590847008aedab272250a6c9bf9610a7e2d2942713e9fbec73d12ee893d7a304fef8d351fd SHA512 16d2060f75d3d31cd980d3fce330bd10165daf50bde89d962ffdbeb3c2434eff7544f593e42fc38f95c40b579725093514d5344696865fab012ec2855fb3dccf
AUX sbat.csv 208 BLAKE2B e7d4fa4662344f94225abfb6fd9517663e15e124ddf5df4d3e3cece7cd1594f6805f5c7ef3ff6d5a6adda2a175b7d7a4b7fd8ab773b322c968d43138c74fd5e2 SHA512 e53f552355cc5f07535513d76c0b39d37349fc5662feca9d4193e9379760cad3c6926a9541358b197d97786ab01cfe1e043cb4e86a087e0f37f5039e85ee4bd4
DIST dejavu-sans-ttf-2.37.zip 417746 BLAKE2B c8904f3cd5a49370a7dc10e456684c88aeae998a99090bf4d0a5baa4f36cc8fb8f70586cf6d610a5ffeee97261d28c80f55bbe9dcfc3ed796d5c2d60e79adb58 SHA512 ede5899daa1984c5aa8cacb1c850eb53f189dddef3d9bb78bf9774d8976b7c0d6eb0bcf86237cd7d11f5b36cf5b5058d42cd94d3bd76f2bd0931c7ceb1271fae
DIST grub-2.12-bash-completion.patch.gz 3627 BLAKE2B 6ba80fd4fb4b28ae2e5a2387133d815da126a4eaa4b5cb24b13f4ba5a2499ab4099d10ada366ed39f84be2c38774122f48e1a1894768c5bee29149528610d095 SHA512 a9ee6d2253ae48d7f90907a9e975a3a1d01346bc621d8b8cddf7cc815cd91e078f6c61392724d13556ee64f099fa15c94fcb88a49ff02d4a90ebd376252cea5c
DIST grub-2.12.tar.xz 6675608 BLAKE2B a678f7fafb945d325c8cf47aa086f48357a8f6335b762f77038c30a3896b3b05491598d9931d5335841d224fffcbe4a9a43ca1479057c1f1ce52b8d2a952c431 SHA512 761c060a4c3da9c0e810b0ea967e3ebc66baa4ddd682a503ae3d30a83707626bccaf49359304a16b3a26fc4435fe6bea1ee90be910c84de3c2b5485a31a15be3
DIST grub-2.12.tar.xz.sig 566 BLAKE2B 9b77fe53041b99f1196743aa6d9fc9c727b17c6512129bab2b35005f2c70f371e30521ddd804bf0c666e36cf2667247980f385ca1ac911fa9b8e0311427dc01c SHA512 fbe971d8c382578b49d33902234edd9cbd084b70820a1a56a59df4ec30874c0dd4fe27f8dc44bb380716bb7480ca68a87d120a25b92a6a10ff6c8ec1b60548d3
DIST unifont-15.0.06.pcf.gz 1358322 BLAKE2B 81811e3de390ca35d1a2dc1f1dee73464e97f44907ba522c218ba9c5e39ca3c9d767552780a257a97c156eb623c17786d9c0d2b67786d61df5ca33a1e10db7ca SHA512 0a28a406629c604f5cbf51f501528239a7ed50d19f93ea505bc5bdc72639e4b926b03f4b8782a5733041f7cdb4aebb9948ac7cfd5a8ad9a0fe309944e595517b
-EBUILD grub-2.12-r4.ebuild 9373 BLAKE2B 45ea454cac91bfd1316735c41bbb6b4cae4ef5ca3194c7f6f29b456c58bdd571eb3a654e82b086c602b470c98cf3cf0e42a1477f07f6cbb6f6282569468415a0 SHA512 bd507daa4e596b2069988cb2469dc6339ac9f019edc8f82f78e7b1e77da14d62738bcc944e8ddbfc08ada537e55cc97fcf5177c50c114a52b0ba69c5bc0d5c1b
-EBUILD grub-9999.ebuild 9041 BLAKE2B 6d186ada2fc481c4c9a9718a93756860c0ffed8f5dc8d16bcde50e6590d653cf5ade561a582339bf91cce462b71773cacb2b0a849a152b7ce226a4bd32c9187b SHA512 c385e7704c581d789ead0e2beda14993eb0ad8cc5686465df4a40c9240cf9dccf898967648208a336f966c510f07e07ddde7a4d75fcd33b74ed1d024b653af41
+EBUILD grub-2.12-r4.ebuild 9387 BLAKE2B 391d0e5f4c9cf092420ba5a175683585a794c0318cc24d38bc039d9080d9ff9cb43cb6f9e5b6222d559b68a1cb4f9e8fe5cb1d409e4078a6aa5294f84dc79da2 SHA512 18f50ba5120eb0173aed591e746d43208b2e6233d1e94dce6a18caaaf13b93a349c8cdc14e2a505e758bfc72efcd9d88f15ac5498ea871c4cb178214e38d1254
+EBUILD grub-2.12-r5.ebuild 12203 BLAKE2B 484f55ba3ff326ba1f6462dc88b20b66a0bb62772bcaa1acb0bc5484f4ce3dd3a02fc5a5cd833334f191dbbe57dd780f1870c64c1703149381a5407ca7e463b0 SHA512 e6bf3497f6175e5b23df0cd0129717f2d7658097aaecc5ec5d0d32a955c9ff9feb8d5ec6a3d5c569cad4d00731a71f6680cba0ec90e562a09ec48b96545f50fd
+EBUILD grub-9999.ebuild 11864 BLAKE2B 85472b605827f236279740012f16c18fd3a6d6356391828f22fbf353fe26aaa9d656071eb5edf530cbc440f781b14a394c41a4eaacd63a3f0db66fec270f66a4 SHA512 f5c194a90201de73366597b2ce60fd6d3c081f121fe0c8645f4afa55ee27d6bb868024a4efe50bd1f2850fed52a59a45b92807203d3fc15af2a1d3d7b01d0b13
MISC metadata.xml 986 BLAKE2B 7c03fac1bf235c1d82e435926c5a9079a21eb16e9937c0ac4e6297bc2f129bc9022efa11c099df07fd9e3b6c47a13246e25ae1c4cc390878ead82394c9b9ed11 SHA512 eb62f4b746c87bf2756669d57e76e60f24cea493948b19429a45e52d02fc1a501b4465ba52940757409258f7ad0ceef0e0f473aeb80cbd9b693b866ae015f13c
diff --git a/sys-boot/grub/files/grub.default-4 b/sys-boot/grub/files/grub.default-4
index 35d3060137a9..74f5d10aea3b 100644
--- a/sys-boot/grub/files/grub.default-4
+++ b/sys-boot/grub/files/grub.default-4
@@ -34,9 +34,9 @@ GRUB_DISTRIBUTOR="Gentoo"
# Uncomment to disable graphical terminal (grub-pc only)
#GRUB_TERMINAL=console
-# The resolution used on graphical terminal.
-# Note that you can use only modes which your graphic card supports via VBE.
-# You can see them in real GRUB with the command `vbeinfo'.
+# Resolution used on graphical terminal.
+# The list of valid modes may be obtained using the 'vbeinfo' (PC BIOS) or
+# 'videoinfo' (EFI) command from a GRUB boot prompt.
#GRUB_GFXMODE=640x480
# Set to 'text' to force the Linux kernel to boot in normal text
diff --git a/sys-boot/grub/grub-2.12-r4.ebuild b/sys-boot/grub/grub-2.12-r4.ebuild
index 66b37086f92f..5ce4953d88c4 100644
--- a/sys-boot/grub/grub-2.12-r4.ebuild
+++ b/sys-boot/grub/grub-2.12-r4.ebuild
@@ -334,7 +334,7 @@ pkg_postinst() {
else
elog
optfeature "detecting other operating systems (grub-mkconfig)" sys-boot/os-prober
- optfeature "creating rescue media (grub-mkrescue)" dev-libs/libisoburn
+ optfeature "creating rescue media (grub-mkrescue)" dev-libs/libisoburn sys-fs/mtools
optfeature "enabling RAID device detection" sys-fs/mdadm
optfeature "automatically updating GRUB's configuration on each kernel installation" "sys-kernel/installkernel[grub]"
fi
diff --git a/sys-boot/grub/grub-2.12-r5.ebuild b/sys-boot/grub/grub-2.12-r5.ebuild
new file mode 100644
index 000000000000..1e22477b727a
--- /dev/null
+++ b/sys-boot/grub/grub-2.12-r5.ebuild
@@ -0,0 +1,435 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# This ebuild uses 3 special global variables:
+# GRUB_BOOTSTRAP: Depend on python and invoke bootstrap (gnulib).
+# GRUB_AUTOGEN: Depend on python and invoke autogen.sh.
+# GRUB_AUTORECONF: Inherit autotools and invoke eautoreconf.
+#
+# When applying patches:
+# If gnulib is updated, set GRUB_BOOTSTRAP=1
+# If gentpl.py or *.def is updated, set GRUB_AUTOGEN=1
+# If gnulib, gentpl.py, *.def, or any autotools files are updated, set GRUB_AUTORECONF=1
+#
+# If any of the above applies to a user patch, the user should set the
+# corresponding variable in make.conf or the environment.
+
+GRUB_AUTORECONF=1
+PYTHON_COMPAT=( python3_{10..12} )
+WANT_LIBTOOL=none
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/dkiper.gpg
+
+if [[ -n ${GRUB_AUTORECONF} ]]; then
+ inherit autotools
+fi
+
+inherit bash-completion-r1 flag-o-matic multibuild optfeature python-any-r1
+inherit secureboot toolchain-funcs
+
+DESCRIPTION="GNU GRUB boot loader"
+HOMEPAGE="https://www.gnu.org/software/grub/"
+
+MY_P=${P}
+if [[ ${PV} != 9999 ]]; then
+ inherit verify-sig
+
+ if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
+ # The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860
+ MY_P=${P/_/'~'}
+ SRC_URI="
+ https://alpha.gnu.org/gnu/${PN}/${MY_P}.tar.xz
+ verify-sig? ( https://alpha.gnu.org/gnu/${PN}/${MY_P}.tar.xz.sig )
+ "
+ S=${WORKDIR}/${MY_P}
+ else
+ SRC_URI="
+ mirror://gnu/${PN}/${P}.tar.xz
+ https://dev.gentoo.org/~floppym/dist/${P}-bash-completion.patch.gz
+ verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )
+ "
+ S=${WORKDIR}/${P%_*}
+ fi
+ BDEPEND="verify-sig? ( sec-keys/openpgp-keys-danielkiper )"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+else
+ inherit git-r3
+ EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git"
+fi
+
+DEJAVU=dejavu-sans-ttf-2.37
+UNIFONT=unifont-15.0.06
+SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
+ themes? ( https://downloads.sourceforge.net/dejavu/${DEJAVU}.zip )"
+
+# Includes licenses for dejavu and unifont
+LICENSE="GPL-3+ BSD MIT fonts? ( GPL-2-with-font-exception ) themes? ( CC-BY-SA-3.0 BitstreamVera )"
+SLOT="2/${PVR}"
+IUSE="device-mapper doc efiemu +fonts mount nls sdl test +themes truetype libzfs"
+
+GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot
+ qemu qemu-mips pc uboot xen xen-32 xen-pvh )
+IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
+
+REQUIRED_USE="
+ grub_platforms_coreboot? ( fonts )
+ grub_platforms_qemu? ( fonts )
+ grub_platforms_ieee1275? ( fonts )
+ grub_platforms_loongson? ( fonts )
+"
+
+BDEPEND+="
+ ${PYTHON_DEPS}
+ >=sys-devel/flex-2.5.35
+ sys-devel/bison
+ sys-apps/help2man
+ sys-apps/texinfo
+ fonts? (
+ media-libs/freetype:2
+ virtual/pkgconfig
+ )
+ test? (
+ app-admin/genromfs
+ app-alternatives/cpio
+ app-arch/lzop
+ app-emulation/qemu
+ dev-libs/libisoburn
+ sys-apps/miscfiles
+ sys-block/parted
+ sys-fs/squashfs-tools
+ )
+ themes? (
+ app-arch/unzip
+ media-libs/freetype:2
+ virtual/pkgconfig
+ )
+ truetype? ( virtual/pkgconfig )
+"
+DEPEND="
+ app-arch/xz-utils
+ >=sys-libs/ncurses-5.2-r5:0=
+ grub_platforms_emu? (
+ sdl? ( media-libs/libsdl2 )
+ )
+ device-mapper? ( >=sys-fs/lvm2-2.02.45 )
+ libzfs? ( sys-fs/zfs:= )
+ mount? ( sys-fs/fuse:3 )
+ truetype? ( media-libs/freetype:2= )
+ ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
+ ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
+"
+RDEPEND="${DEPEND}
+ kernel_linux? (
+ grub_platforms_efi-32? ( sys-boot/efibootmgr )
+ grub_platforms_efi-64? ( sys-boot/efibootmgr )
+ )
+ !sys-boot/grub:0
+ nls? ( sys-devel/gettext )
+"
+
+RESTRICT="!test? ( test ) test? ( userpriv )"
+
+QA_EXECSTACK="usr/bin/grub-emu* usr/lib/grub/*"
+QA_PRESTRIPPED="usr/lib/grub/.*"
+QA_MULTILIB_PATHS="usr/lib/grub/.*"
+QA_WX_LOAD="usr/lib/grub/*"
+
+pkg_setup() {
+ :
+}
+
+src_unpack() {
+ if [[ ${PV} == 9999 ]]; then
+ git-r3_src_unpack
+ pushd "${P}" >/dev/null || die
+ local GNULIB_URI="https://git.savannah.gnu.org/git/gnulib.git"
+ local GNULIB_REVISION=$(source bootstrap.conf >/dev/null; echo "${GNULIB_REVISION}")
+ git-r3_fetch "${GNULIB_URI}" "${GNULIB_REVISION}"
+ git-r3_checkout "${GNULIB_URI}" gnulib
+ popd >/dev/null || die
+ elif use verify-sig; then
+ verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.sig}
+ fi
+ default
+}
+
+src_prepare() {
+ local PATCHES=(
+ "${FILESDIR}"/gfxpayload.patch
+ "${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
+ "${FILESDIR}"/grub-2.06-test-words.patch
+ "${FILESDIR}"/grub-2.12-fwsetup.patch
+ "${WORKDIR}"/grub-2.12-bash-completion.patch
+ )
+
+ default
+
+ python_setup
+
+ if [[ -n ${GRUB_BOOTSTRAP} ]]; then
+ eautopoint --force
+ AUTOPOINT=: AUTORECONF=: ./bootstrap || die
+ elif [[ -n ${GRUB_AUTOGEN} ]]; then
+ FROM_BOOTSTRAP=1 ./autogen.sh || die
+ fi
+
+ if [[ -n ${GRUB_AUTORECONF} ]]; then
+ eautoreconf
+ fi
+
+ # Avoid error due to extra_deps.lst missing from source tarball:
+ # make[3]: *** No rule to make target 'grub-core/extra_deps.lst', needed by 'syminfo.lst'. Stop.
+ echo "depends bli part_gpt" > grub-core/extra_deps.lst || die
+}
+
+grub_do() {
+ multibuild_foreach_variant run_in_build_dir "$@"
+}
+
+grub_do_once() {
+ multibuild_for_best_variant run_in_build_dir "$@"
+}
+
+grub_configure() {
+ local platform
+
+ case ${MULTIBUILD_VARIANT} in
+ efi*) platform=efi ;;
+ xen-pvh) platform=xen_pvh ;;
+ xen*) platform=xen ;;
+ guessed) ;;
+ *) platform=${MULTIBUILD_VARIANT} ;;
+ esac
+
+ case ${MULTIBUILD_VARIANT} in
+ *-32)
+ if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
+ local CTARGET=i386
+ fi ;;
+ *-64)
+ if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then
+ local CTARGET=x86_64
+ local -x TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
+ local -x TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
+ fi ;;
+ esac
+
+ local myeconfargs=(
+ --disable-werror
+ --program-prefix=
+ --libdir="${EPREFIX}"/usr/lib
+ $(use_enable device-mapper)
+ $(use_enable mount grub-mount)
+ $(use_enable nls)
+ $(use_enable themes grub-themes)
+ $(use_enable truetype grub-mkfont)
+ $(use_enable libzfs)
+ --enable-grub-emu-sdl=no
+ $(use_enable sdl grub-emu-sdl2)
+ ${platform:+--with-platform=}${platform}
+
+ # Let configure detect this where supported
+ $(usex efiemu '' '--disable-efiemu')
+ )
+
+ if use fonts; then
+ ln -rs "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
+ fi
+
+ if use themes; then
+ ln -rs "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
+ fi
+
+ local ECONF_SOURCE="${S}"
+ econf "${myeconfargs[@]}"
+}
+
+src_configure() {
+ # Bug 508758.
+ replace-flags -O3 -O2
+
+ # Workaround for bug 829165.
+ filter-ldflags -pie
+
+ # We don't want to leak flags onto boot code.
+ export HOST_CCASFLAGS=${CCASFLAGS}
+ export HOST_CFLAGS=${CFLAGS}
+ export HOST_CPPFLAGS=${CPPFLAGS}
+ export HOST_LDFLAGS=${LDFLAGS}
+ unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
+
+ tc-ld-disable-gold #439082 #466536 #526348
+ export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}"
+ unset LDFLAGS
+
+ tc-export CC NM OBJCOPY RANLIB STRIP
+ tc-export BUILD_CC BUILD_PKG_CONFIG
+
+ # Force configure to use flex & bison, bug 887211.
+ export LEX=flex
+ unset YACC
+
+ MULTIBUILD_VARIANTS=()
+ local p
+ for p in "${GRUB_ALL_PLATFORMS[@]}"; do
+ use "grub_platforms_${p}" && MULTIBUILD_VARIANTS+=( "${p}" )
+ done
+ [[ ${#MULTIBUILD_VARIANTS[@]} -eq 0 ]] && MULTIBUILD_VARIANTS=( guessed )
+ grub_do grub_configure
+}
+
+src_compile() {
+ # Sandbox bug 404013.
+ use libzfs && { addpredict /etc/dfs; addpredict /dev/zfs; }
+
+ grub_do emake
+ use doc && grub_do_once emake -C docs html
+}
+
+src_test() {
+ # The qemu dependency is a bit complex.
+ # You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform.
+ local SANDBOX_WRITE=${SANDBOX_WRITE}
+ addwrite /dev
+ grub_do emake -j1 check
+}
+
+grub_mkstandalone_secureboot() {
+ use secureboot || return
+
+ if tc-is-cross-compiler; then
+ ewarn "USE=secureboot is not supported when cross-compiling."
+ ewarn "No standalone EFI executable will be built."
+ return 1
+ fi
+
+ local standalone_targets
+
+ case ${CTARGET:-${CHOST}} in
+ i?86* | x86_64*)
+ use grub_platforms_efi-32 && standalone_targets+=( i386-efi )
+ use grub_platforms_efi-64 && standalone_targets+=( x86_64-efi )
+ ;;
+ arm* | aarch64*)
+ use grub_platforms_efi-32 && standalone_targets+=( arm-efi )
+ use grub_platforms_efi-64 && standalone_targets+=( arm64-efi )
+ ;;
+ riscv*)
+ use grub_platforms_efi-32 && standalone_targets+=( riscv32-efi )
+ use grub_platforms_efi-64 && standalone_targets+=( riscv64-efi )
+ ;;
+ ia64*)
+ use grub_platforms_efi-64 && standalone_targets+=( ia64-efi )
+ ;;
+ loongarch64*)
+ use grub_platforms_efi-64 && standalone_targets+=( loongarch64-efi )
+ ;;
+ esac
+
+ if [[ ${#standalone_targets[@]} -eq 0 ]]; then
+ ewarn "USE=secureboot is enabled, but no suitable EFI target in GRUB_PLATFORMS."
+ ewarn "No standalone EFI executable will be built."
+ return 1
+ fi
+
+ local target mkstandalone_args
+
+ # grub-mkstandalone embeds a config file, make this config file chainload
+ # a config file in the same directory grub is installed in. This requires
+ # pre-loading the part_gpt and part_msdos modules.
+ echo 'configfile ${cmdpath}/grub.cfg' > "${T}/grub.cfg" || die
+ for target in "${standalone_targets[@]}"; do
+ ebegin "Building standalone EFI executable for ${target}"
+ mkstandalone_args=(
+ --verbose
+ --directory="${ED}/usr/lib/grub/${target}"
+ --locale-directory="${ED}/usr/share/locale"
+ --format="${target}"
+ --modules="part_gpt part_msdos"
+ --sbat="${ED}/usr/share/grub/sbat.csv"
+ --output="${ED}/usr/lib/grub/grub-${target%-efi}.efi"
+ "boot/grub/grub.cfg=${T}/grub.cfg"
+ )
+
+ "${ED}/usr/bin/grub-mkstandalone" "${mkstandalone_args[@]}"
+ eend ${?} || die "grub-mkstandalone failed to build EFI executable"
+ done
+
+ secureboot_auto_sign
+}
+
+src_install() {
+ grub_do emake install DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)"
+ use doc && grub_do_once emake -C docs install-html DESTDIR="${D}"
+
+ einstalldocs
+
+ insinto /etc/default
+ newins "${FILESDIR}"/grub.default-4 grub
+
+ # https://bugs.gentoo.org/231935
+ dostrip -x /usr/lib/grub
+
+ sed -e "s/%PV%/${PV}/" "${FILESDIR}/sbat.csv" > "${T}/sbat.csv" || die
+ insinto /usr/share/grub
+ doins "${T}/sbat.csv"
+
+ if use elibc_musl; then
+ # https://bugs.gentoo.org/900348
+ QA_CONFIG_IMPL_DECL_SKIP=( re_{compile_pattern,match,search,set_syntax} )
+ fi
+
+ grub_mkstandalone_secureboot
+}
+
+pkg_postinst() {
+ elog "For information on how to configure GRUB2 please refer to the guide:"
+ elog " https://wiki.gentoo.org/wiki/GRUB2_Quick_Start"
+
+ if [[ -n ${REPLACING_VERSIONS} ]]; then
+ local v
+ for v in ${REPLACING_VERSIONS}; do
+ if ver_test -gt ${v}; then
+ ewarn
+ ewarn "Re-run grub-install to update installed boot code!"
+ ewarn "Re-run grub-mkconfig to update grub.cfg!"
+ ewarn
+ break
+ fi
+ done
+ else
+ elog
+ optfeature "detecting other operating systems (grub-mkconfig)" sys-boot/os-prober
+ optfeature "creating rescue media (grub-mkrescue)" dev-libs/libisoburn sys-fs/mtools
+ optfeature "enabling RAID device detection" sys-fs/mdadm
+ optfeature "automatically updating GRUB's configuration on each kernel installation" "sys-kernel/installkernel[grub]"
+ fi
+
+ if has_version 'sys-boot/grub:0'; then
+ elog "A migration guide for GRUB Legacy users is available:"
+ elog " https://wiki.gentoo.org/wiki/GRUB2_Migration"
+ fi
+
+ if has_version sys-boot/os-prober; then
+ ewarn "Due to security concerns, os-prober is disabled by default."
+ ewarn "Set GRUB_DISABLE_OS_PROBER=false in /etc/default/grub to enable it."
+ fi
+
+ if use secureboot; then
+ elog
+ elog "The signed standalone grub EFI executable(s) are available in:"
+ elog " /usr/lib/grub/grub-<target>.efi(.signed)"
+ elog "These EFI executables should be copied to the usual location at:"
+ elog " ESP/EFI/Gentoo/grub<arch>.efi"
+ elog "Note that 'grub-install' does not install these images."
+ elog
+ elog "These standalone grub executables read the grub config file from"
+ elog "the grub.cfg in the same directory instead of the default"
+ elog "/boot/grub/grub.cfg. When sys-kernel/installkernel[grub] is used,"
+ elog "the location of the grub.cfg may be overridden by setting the"
+ elog "GRUB_CFG environment variable:"
+ elog " GRUB_CFG=ESP/EFI/Gentoo/grub.cfg"
+ elog
+ fi
+}
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 1061d6ebe58d..2b24a0433912 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -29,7 +29,8 @@ if [[ -n ${GRUB_AUTORECONF} ]]; then
inherit autotools
fi
-inherit bash-completion-r1 flag-o-matic multibuild optfeature python-any-r1 toolchain-funcs
+inherit bash-completion-r1 flag-o-matic multibuild optfeature python-any-r1
+inherit secureboot toolchain-funcs
DESCRIPTION="GNU GRUB boot loader"
HOMEPAGE="https://www.gnu.org/software/grub/"
@@ -291,6 +292,70 @@ src_test() {
grub_do emake -j1 check
}
+grub_mkstandalone_secureboot() {
+ use secureboot || return
+
+ if tc-is-cross-compiler; then
+ ewarn "USE=secureboot is not supported when cross-compiling."
+ ewarn "No standalone EFI executable will be built."
+ return 1
+ fi
+
+ local standalone_targets
+
+ case ${CTARGET:-${CHOST}} in
+ i?86* | x86_64*)
+ use grub_platforms_efi-32 && standalone_targets+=( i386-efi )
+ use grub_platforms_efi-64 && standalone_targets+=( x86_64-efi )
+ ;;
+ arm* | aarch64*)
+ use grub_platforms_efi-32 && standalone_targets+=( arm-efi )
+ use grub_platforms_efi-64 && standalone_targets+=( arm64-efi )
+ ;;
+ riscv*)
+ use grub_platforms_efi-32 && standalone_targets+=( riscv32-efi )
+ use grub_platforms_efi-64 && standalone_targets+=( riscv64-efi )
+ ;;
+ ia64*)
+ use grub_platforms_efi-64 && standalone_targets+=( ia64-efi )
+ ;;
+ loongarch64*)
+ use grub_platforms_efi-64 && standalone_targets+=( loongarch64-efi )
+ ;;
+ esac
+
+ if [[ ${#standalone_targets[@]} -eq 0 ]]; then
+ ewarn "USE=secureboot is enabled, but no suitable EFI target in GRUB_PLATFORMS."
+ ewarn "No standalone EFI executable will be built."
+ return 1
+ fi
+
+ local target mkstandalone_args
+
+ # grub-mkstandalone embeds a config file, make this config file chainload
+ # a config file in the same directory grub is installed in. This requires
+ # pre-loading the part_gpt and part_msdos modules.
+ echo 'configfile ${cmdpath}/grub.cfg' > "${T}/grub.cfg" || die
+ for target in "${standalone_targets[@]}"; do
+ ebegin "Building standalone EFI executable for ${target}"
+ mkstandalone_args=(
+ --verbose
+ --directory="${ED}/usr/lib/grub/${target}"
+ --locale-directory="${ED}/usr/share/locale"
+ --format="${target}"
+ --modules="part_gpt part_msdos"
+ --sbat="${ED}/usr/share/grub/sbat.csv"
+ --output="${ED}/usr/lib/grub/grub-${target%-efi}.efi"
+ "boot/grub/grub.cfg=${T}/grub.cfg"
+ )
+
+ "${ED}/usr/bin/grub-mkstandalone" "${mkstandalone_args[@]}"
+ eend ${?} || die "grub-mkstandalone failed to build EFI executable"
+ done
+
+ secureboot_auto_sign
+}
+
src_install() {
grub_do emake install DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)"
use doc && grub_do_once emake -C docs install-html DESTDIR="${D}"
@@ -311,6 +376,8 @@ src_install() {
# https://bugs.gentoo.org/900348
QA_CONFIG_IMPL_DECL_SKIP=( re_{compile_pattern,match,search,set_syntax} )
fi
+
+ grub_mkstandalone_secureboot
}
pkg_postinst() {
@@ -331,7 +398,7 @@ pkg_postinst() {
else
elog
optfeature "detecting other operating systems (grub-mkconfig)" sys-boot/os-prober
- optfeature "creating rescue media (grub-mkrescue)" dev-libs/libisoburn
+ optfeature "creating rescue media (grub-mkrescue)" dev-libs/libisoburn sys-fs/mtools
optfeature "enabling RAID device detection" sys-fs/mdadm
optfeature "automatically updating GRUB's configuration on each kernel installation" "sys-kernel/installkernel[grub]"
fi
@@ -345,4 +412,21 @@ pkg_postinst() {
ewarn "Due to security concerns, os-prober is disabled by default."
ewarn "Set GRUB_DISABLE_OS_PROBER=false in /etc/default/grub to enable it."
fi
+
+ if use secureboot; then
+ elog
+ elog "The signed standalone grub EFI executable(s) are available in:"
+ elog " /usr/lib/grub/grub-<target>.efi(.signed)"
+ elog "These EFI executables should be copied to the usual location at:"
+ elog " ESP/EFI/Gentoo/grub<arch>.efi"
+ elog "Note that 'grub-install' does not install these images."
+ elog
+ elog "These standalone grub executables read the grub config file from"
+ elog "the grub.cfg in the same directory instead of the default"
+ elog "/boot/grub/grub.cfg. When sys-kernel/installkernel[grub] is used,"
+ elog "the location of the grub.cfg may be overridden by setting the"
+ elog "GRUB_CFG environment variable:"
+ elog " GRUB_CFG=ESP/EFI/Gentoo/grub.cfg"
+ elog
+ fi
}
diff --git a/sys-boot/makebootfat/Manifest b/sys-boot/makebootfat/Manifest
index 931c2e39aaa2..9b36c96f166d 100644
--- a/sys-boot/makebootfat/Manifest
+++ b/sys-boot/makebootfat/Manifest
@@ -1,3 +1,3 @@
DIST makebootfat-1.4.tar.gz 146722 BLAKE2B 00ad12565951691df2e7af90ae1777c6c6e2253efc61350046cc3ece3342054267f8bdf7ec2303ee203f7af757e7bbda7843104480fb4529eeed2a33456b7f22 SHA512 638356c951670187960d0050d963116391d4b494bc9b082b3d4673188450e47f22fda5733aa09b15cfbb1640807676f5f8743dd094b9931f150b445eb8d335dd
-EBUILD makebootfat-1.4.ebuild 549 BLAKE2B 2292d742c2b261425bd6d646c38469b42a860d53d4ad01327cfb06f37426b12fa1c77a262b6f4f0fe0ab76c45bb3398a913eecc307747a1e259e9f1eab6133e3 SHA512 23991a958db861e47b258860150fd3d70f2aaa9fc84eda887b094c76e34d438c756f005384dcc5e0654a24c3c48d33e968e687accdd6a86a8d00920865589a8d
+EBUILD makebootfat-1.4.ebuild 541 BLAKE2B 989ac78c326224903c894d31bc8418e52c24b5ba731ef065cf35b4fe6e79a0fcb0d16882fed53fac10eab98d34a97f79b6c332cbf08f1dd3b7fe74d562c172a5 SHA512 87807104e79583992d4bd72c54d71d2d0a43c770b47afae095c9aa05c522946b500baf676de07e82082629246f4c63b633916f853cb7c4f90c5e7808a983f17c
MISC metadata.xml 249 BLAKE2B 137f951bf52f9d3e971d45ba8607ee1ece384e5c0131a0844a5f75e488e09482aa6960bce9dc68a4772bfc116080985617cab33d29e4b6ee2cec132338550e9e SHA512 71cd4500e1f5ec5270ec510a9104ce7ab4407e439979bce3be15c34038b6f842149e7150f6b796002919c2723b93a4c31d0d8e834fbcf4e1601b01ed744f7f67
diff --git a/sys-boot/makebootfat/makebootfat-1.4.ebuild b/sys-boot/makebootfat/makebootfat-1.4.ebuild
index af8e752ccda4..f4c60fb48e9d 100644
--- a/sys-boot/makebootfat/makebootfat-1.4.ebuild
+++ b/sys-boot/makebootfat/makebootfat-1.4.ebuild
@@ -10,7 +10,6 @@ SRC_URI="https://downloads.sourceforge.net/advancemame/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
RDEPEND="sys-boot/syslinux"
DEPEND="${RDEPEND}"
diff --git a/sys-boot/milo/Manifest b/sys-boot/milo/Manifest
index 0387a98821d6..3797cced8d11 100644
--- a/sys-boot/milo/Manifest
+++ b/sys-boot/milo/Manifest
@@ -9,5 +9,5 @@ DIST linload.exe 7168 BLAKE2B 393696c987b771a75c5c0a04a6f82999189ecb60067464e807
DIST linux-2.2.20-reiserfs-3.5.35.diff.bz2 154943 BLAKE2B 6226321438bed88bc31fb151a28157dda811a2c7ce6c543564f2ef183489b20f2b7f6df903f63aadaa8196ba10bd54df4c7069e448bb456474bccf64770a666e SHA512 b63d03d605d65cb7a15020ad38b80d77b810963edbdc0b5ccaf1706347de5026e390d8c2a5315f1d2734b793903c1a407b4db4129d11b7d5ff2ad9dc8f2137aa
DIST linux-2.2.25.tar.bz2 15791211 BLAKE2B 5b4b416c41b2277c4e509e7c0003d1ba0bd26e1bbb03a30bdb9d44f9211f6edb593bbca158379ea565e2f35d01e128590971ea85220baec06c23ae15e3942f1b SHA512 63e83f4f184cdd09f39c24e2023fce3562ea550db7182ae94e36ce30c6b2415bac970306cd60c1d1a89a1a3b54ad957094629557a5782f181939efb219ad41bb
DIST milo-2.2-18.tar.bz2 1074725 BLAKE2B 7e7cac8ec2ee8246f21f5ea0f1d497dd6234ed67dad0a340e0183abec2f7a4f694b48eb87ba65ef97e967918c55c9fbfdd56e502f21fc47f8d053d0353758f1c SHA512 1ccc86c83d520d07040ba44d14e7e9353cf364bf5b83ba4df14b0560769643ce07f89feeab468144fe17b7bf482beb7480f5dad1a0e9b574e6e6150bb72aae93
-EBUILD milo-2.4.18.ebuild 7807 BLAKE2B 9f30726c8747302fc469d5b00e1f5002c2a2b24bcf306c267243e81efefb7e96624cdd5bc768355a82d43fa5d3465978e66272aef5e6b77813f4cca8406235d7 SHA512 e4c7061968130b9645b5c7b9e4fd652f9fd3305c2f08433469631e253c04b935737cb955925513253d756bf5faecba80903c188a03075c1f693be190578829fa
+EBUILD milo-2.4.18.ebuild 7799 BLAKE2B 315c95381ddbe920ff7e37e7d0745b69b5dbbdc3399511e550ebee7bf812bbdde86cdbea42bc2a4b3d7718655d3b9a531b8637740e9c141e02b1657246daa555 SHA512 8a6504b166623f4dc7a50a45aa48f770cbaddb3f493c78a56266d80dc2e0096b3d408dca987cc6efa9df81fabf69c6510d0c388caf4b69d2fcb54640bbf3020f
MISC metadata.xml 784 BLAKE2B 04b2bfb1c5fc57f933d3b9fa2323e9458a4cf27fde89f822839b4f363ee6303eee877427aab9158eac8190aaf9feb2e2f33715184084662ad3aa9407997d3158 SHA512 ab14a9cf41cdae29a05e710025ebcf0ea0c95597902fd490b38bfa6f5b893dae1725b3421b54003cea7f5e60cc57ad88d04d0e03b77048eb0d494208d0c33605
diff --git a/sys-boot/milo/milo-2.4.18.ebuild b/sys-boot/milo/milo-2.4.18.ebuild
index 9ee907054222..b5eb77a8628e 100644
--- a/sys-boot/milo/milo-2.4.18.ebuild
+++ b/sys-boot/milo/milo-2.4.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -32,6 +32,7 @@ SRC_URI="http://www.suse.de/~stepan/source/milo-${milo_version}.tar.bz2
http://ftp.namesys.com/pub/reiserfs-for-2.2/linux-2.2.20-reiserfs-3.5.35.diff.bz2
https://dev.gentoo.org/~taviso/milo/linload.exe
http://www.ibiblio.org/pub/Linux/docs/HOWTO/MILO-HOWTO"
+S="${WORKDIR}/milo-${milo_version}"
#
# milo license is dec palcode license, dec bios emulation license, and gpl-2 rolled
@@ -44,15 +45,11 @@ SRC_URI="http://www.suse.de/~stepan/source/milo-${milo_version}.tar.bz2
LICENSE="MILO"
SLOT="0"
-
KEYWORDS="-* ~alpha"
-IUSE=""
DEPEND="sys-apps/kbd"
RDEPEND="sys-fs/mtools"
-S=${WORKDIR}/milo-${milo_version}
-
# You can change the default MILO serial
# number here, the MILO default is "Linux_is_Great!".
# There are some below that i have made you can
diff --git a/sys-boot/plymouth-openrc-plugin/Manifest b/sys-boot/plymouth-openrc-plugin/Manifest
index ec813eeefd23..3b022f2f2c41 100644
--- a/sys-boot/plymouth-openrc-plugin/Manifest
+++ b/sys-boot/plymouth-openrc-plugin/Manifest
@@ -1,5 +1,5 @@
DIST plymouth-openrc-plugin-0.1.3.tar.gz 9404 BLAKE2B 809cfab881ef47565badfc330b77ae07a8bbbddf822cbdb50f2d1d2a0c95f915ac5024e02400ab2ea9d8f98dc466a8a3cbad92805587f77a00e58c9f9d78d388 SHA512 b07a4d9d56c8f49d5b0a91799fe0100eac705cd2a266674539948fdc661876474a93d8ed5f329f097a1fc5dc571f3b3c00322191fb77d2a7e32b1ff192ca0a6b
DIST plymouth-openrc-plugin-0.2.0.tar.gz 10325 BLAKE2B ee66b158d366f5bf12504d1546ec00906f9e73760308975dbc4ea26e5622ee10ab877b47a13269ae11576c7d3e8b4c9484ca0dc61efce0f78f38344515ce4c5e SHA512 4156b291c49cf5c55c78071439530a35f5ec03b1e022bb022839e1b89567653ebb70bf3471b82ae0ecec8fc84c3f41ee2cc6b3de1fa52811a96d0812a6ada772
EBUILD plymouth-openrc-plugin-0.1.3.ebuild 747 BLAKE2B 8e572b805ec906c17ef5640b44ec7a518d447f5db15995206f59cf170bb6f61ef1f2517c2ebee6b7b223e63492b934394bbe4c10e2b04f053c51e1047a7d000d SHA512 57c074f4e83ad7866bbd6f971b9866d072fc1f948238cfd377dc2ee397e811aceea32c9145d34743888e3e59f4416746b0dd3b6dfd51c4556e4b382a8120e8af
-EBUILD plymouth-openrc-plugin-0.2.0.ebuild 791 BLAKE2B f6e3e0971386c92e841b27371c521c0367f67239ad04ca25842ce35cf8a95b464999bc84d746025a61d2f0ae110705959c8719acd531e7a336f3464838c3d385 SHA512 016195872da5d279e437941c8780309b06e58d77ae2f36c42f7d61458eb5f81be118e7f35e9a225035de9b2ae8e97ca244c210dcc1fb48449156864362e71876
+EBUILD plymouth-openrc-plugin-0.2.0-r1.ebuild 819 BLAKE2B b5df35e2682a9bb58ce102686392d1b1e83696ae1daa43248dc676de3c4e450ee03ffb77822fed54e0f2f2947262ba760fc04ed55d7d931069665b0b68e49048 SHA512 452325a73b38586bda5531cfe4bacc837ae0ab3581d7871fe2ef965fe9ce4ee34abf8970fe30253f262610282f5211d2220b2849652c31c30013000f01215cb3
MISC metadata.xml 448 BLAKE2B 9ac1f7e0f16731cf3b61581d4700c2337671d3c299a617816e0e44e3ad330b1763e765b52ba970ef65abdf8ebfd832cf932b671ed3a4602d0acb0aec175a212d SHA512 2e42ea8aaf4ed4703c0f7c2318002f5edf470bfe51bad1578054832ccacd283de9f3d7b1d8e8864a7ab9365214ebd9c3d4a3978ba1fce951ae7a231910cf21fe
diff --git a/sys-boot/plymouth-openrc-plugin/plymouth-openrc-plugin-0.2.0.ebuild b/sys-boot/plymouth-openrc-plugin/plymouth-openrc-plugin-0.2.0-r1.ebuild
index 6d409e02a6d6..cec7b6155dfc 100644
--- a/sys-boot/plymouth-openrc-plugin/plymouth-openrc-plugin-0.2.0.ebuild
+++ b/sys-boot/plymouth-openrc-plugin/plymouth-openrc-plugin-0.2.0-r1.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="debug"
-DEPEND="sys-apps/openrc"
+DEPEND="|| ( sys-apps/openrc sys-apps/openrc-navi )"
RDEPEND="${DEPEND}
sys-boot/plymouth
!sys-apps/systemd"
diff --git a/sys-boot/refind/Manifest b/sys-boot/refind/Manifest
index 96acfd4ea6e1..18448d9090df 100644
--- a/sys-boot/refind/Manifest
+++ b/sys-boot/refind/Manifest
@@ -1,8 +1,9 @@
AUX refind-0.14.0.2-clang.patch 1346 BLAKE2B 09221bd26f2add12831faba093e3704174be4e1ebe42eac4d55d4e2d8181798ecfa8bf4eb17e1cc68e90096896e1ea5cc56f7b86bd391e5839788ac7e1934f40 SHA512 b04d721667500a17d35702454d4f0597a6fb8a89734533598aed31d3c69edbfec0ceb3a1a1f9a510c499ff74d95ed9a4e56d86979d65cc671f4a7f49df733a68
+AUX refind-0.14.2-fix-gnu-efi-3.0.18.patch 3055 BLAKE2B 716b96eb846267a0916d531d04da07ddd594eba7b2b09b924d09bd602772f4830610b10f3a8331437021ad74e6686688d4ed975c55a1705ffd1b19347fa2280d SHA512 ebbdb81767f3fcb0deba791d8b3cb29c7e246c101679e8e1c23d38805db69c7eaafd674a7d74450a4ca5f8873218791968949de44405cd41d3375a9806622445
AUX refind-sbat-gentoo-0.14.0.2.csv 246 BLAKE2B 8a16eb928f587aaaa680098c660de4e0930a6cc3b5719eb5085f843933c7e3863e8ff0517a596574ffff7bc2d8a2f89f1fa3606c7c618e9ff303edac5f0f5673 SHA512 b8e1a49ed408c6e57f4c8c5a012857b6a5024463eeba33070665dcf95f310cf30d62e2767409ad19d3a41b6ab346804bc7f5d34b92d2dd35aa44406df016bb91
AUX refind-sbat-gentoo-0.14.2.csv 246 BLAKE2B 75623624efe360288ef14bb09f9f024b0baa7485ee250cf923558296f258bdea3f4de0aac3d40fe83b168611d0e907d0a6a0462a54d0126233f0a6c370c0991d SHA512 e2665765ea7d9abb07a5b0b6ca752b53987ef79028bb6df1396a6afc0ea3183e8af326ac81b40fd4a0f84d20e7b47d7c45118bd35df8b1107512670e23ac92e1
DIST refind-src-0.14.0.2.tar.gz 4648958 BLAKE2B 02019ddb872ce44d2a2119902edebd633f925d49634e3bcc6bfb2c9dedb8ce213166909395a333d3a37e95c67720e31b1f5fcf25083801c17d645372aa54a06a SHA512 41c120c1afec37c508aa5c0ec09a6563c3047ef84932308c91701795b950431dfad17d25cf664039b490a302d475add98441b75f90ff71cadce41febedc68a9e
DIST refind-src-0.14.2.tar.gz 4628173 BLAKE2B 987acb29d4d81c01db245cd8e1c9761072e34cf3dfaa3e4fa77e549ee2c1dc4c3f8cbd9218f42e4eb77478df3453095dba8b36324c289c6a10b81f1ecb202743 SHA512 76a52ed422ab3d431e6530fae4d13a51e8ed100568d4290207aaee87a84700b077bb79c4f4917027f5286de422954e1872fca288252ec756072d6c075b102e1e
EBUILD refind-0.14.0.2-r1.ebuild 4230 BLAKE2B fb1a4cdb037a3a0bbec2de9f8c50bc2f0b76f0a445640fa054cea0200eaaaac983f5e8c91a6c8941d5cd722eacb578973e5830bb0035ae4d91bf5db59241412f SHA512 a96ea9925121827a65a187865e55cd547e81cbf13738e2f8377583c440c77dae87b10ffc41fd5d1fae4d2a1f3826078df26a1908764c625a203e238e3716ec85
-EBUILD refind-0.14.2.ebuild 4773 BLAKE2B 465f42f8f991d379c86704eb8130193fce08047ac445b76b6a6ba3ec866e7a5ca8f83341057c0cacc56365499e7a462365ffba0046068cc7afc856dec1ad5e5b SHA512 3d8ccb53e157526b4d4d0e9a1aac4fa139d7f6b7ca579d603c1e7b444f1ca212004aa990741417b0e1dbb3ea522775e768e4415e009495e32089846e5683e493
+EBUILD refind-0.14.2-r1.ebuild 4316 BLAKE2B 49af3ce308582ffa90dafc0105a241356effee9e18ba9538afffd0749af673f4f5f0fc91b67843567a74941756b5d80db7d30380b0e9cada9a148a9653635c17 SHA512 fa4917991e486768866b5ee167052933937bd716b13874cf60e68d9c4eba9c61702897f7299444196dfb57da3864b577db086eea2f451d402ac53aac5910bf39
MISC metadata.xml 3809 BLAKE2B a2cf074c3c572fff3bdb1679b505cf3a9de4489acacdbc2b015fed91e7f37157fa7e3124438ad8af0788cc90f464b217c4fe05294c2c69ef637648cc68825885 SHA512 4b289982bbfda2697dd13b4c1fc020842a0fa06672e5d7f4b48cd39ef4348b1a17989686c55c96d220f682c8c95a340901fb3968d051aef8c8e5cf944bbcb4e4
diff --git a/sys-boot/refind/files/refind-0.14.2-fix-gnu-efi-3.0.18.patch b/sys-boot/refind/files/refind-0.14.2-fix-gnu-efi-3.0.18.patch
new file mode 100644
index 000000000000..b5d9d2692883
--- /dev/null
+++ b/sys-boot/refind/files/refind-0.14.2-fix-gnu-efi-3.0.18.patch
@@ -0,0 +1,77 @@
+The same commit from gnu-efi that changed CopyMem in a way that broke refind also changed SetMem.
+This patch attempts to fix it in the same way upstream fixed CopyMem.
+
+The commit: https://sourceforge.net/p/gnu-efi/code/ci/deb8a7f267d96299b9aa41300539f617db54c2a9/
+The bug: https://bugs.gentoo.org/934474
+
+--- a/gptsync/gptsync.c
++++ b/gptsync/gptsync.c
+@@ -164,7 +164,7 @@ static UINTN write_mbr(VOID)
+ }
+ if (!have_bootcode) {
+ // no boot code found in the MBR, add the syslinux MBR code
+- SetMem(sector, MBR_BOOTCODE_SIZE, 0);
++ refit_call3_wrapper(gBS->SetMem, sector, MBR_BOOTCODE_SIZE, 0);
+ refit_call3_wrapper(gBS->CopyMem, sector, syslinux_mbr, SYSLINUX_MBR_SIZE);
+ }
+
+--- a/libeg/lodepng_xtra.c
++++ b/libeg/lodepng_xtra.c
+@@ -87,7 +87,7 @@ int MyStrlen(const char *InString) {
+ } // int MyStrlen()
+
+ VOID *MyMemSet(VOID *s, int c, size_t n) {
+- SetMem(s, c, n);
++ MySetMem(s, c, n);
+ return s;
+ }
+
+--- a/refind/config.c
++++ b/refind/config.c
+@@ -667,7 +667,7 @@ VOID ReadConfig(CHAR16 *FileName)
+ HandleStrings(TokenList, TokenCount, &(GlobalConfig.DriverDirs));
+
+ } else if (MyStriCmp(TokenList[0], L"showtools")) {
+- SetMem(GlobalConfig.ShowTools, NUM_TOOLS * sizeof(UINTN), 0);
++ MySetMem(GlobalConfig.ShowTools, NUM_TOOLS * sizeof(UINTN), 0);
+ GlobalConfig.HiddenTags = FALSE;
+ for (i = 1; (i < TokenCount) && (i < NUM_TOOLS); i++) {
+ FlagName = TokenList[i];
+--- a/refind/launch_legacy.c
++++ b/refind/launch_legacy.c
+@@ -114,7 +114,7 @@ static EFI_STATUS ActivateMbrPartition(IN EFI_BLOCK_IO *BlockIO, IN UINTN Partit
+ }
+ if (!HaveBootCode) {
+ // no boot code found in the MBR, add the syslinux MBR code
+- SetMem(SectorBuffer, MBR_BOOTCODE_SIZE, 0);
++ MySetMem(SectorBuffer, MBR_BOOTCODE_SIZE, 0);
+ MyCopyMem(SectorBuffer, syslinux_mbr, SYSLINUX_MBR_SIZE);
+ }
+
+--- a/refind/lib.c
++++ b/refind/lib.c
+@@ -651,7 +651,7 @@ static VOID SetFilesystemData(IN UINT8 *Buffer, IN UINTN BufferSize, IN OUT REFI
+
+ LOG(2, LOG_LINE_NORMAL, L"Identifying filesystem types....");
+ if ((Buffer != NULL) && (Volume != NULL)) {
+- SetMem(&(Volume->VolUuid), sizeof(EFI_GUID), 0);
++ MySetMem(&(Volume->VolUuid), sizeof(EFI_GUID), 0);
+ Volume->FSType = FS_TYPE_UNKNOWN;
+
+ if (BufferSize >= (1024 + 100)) {
+--- a/refind/lib.h
++++ b/refind/lib.h
+@@ -133,10 +133,13 @@ VOID MyFreePool(IN OUT VOID *Pointer);
+
+ // When using GNU-EFI, call the EFI's built-in gBS->CopyMem() function, because
+ // GNU-EFI 3.0.18 changed its CopyMem() definition in a way that broke rEFInd.
++// Same for SetMem
+ #ifdef __MAKEWITH_GNUEFI
+ #define MyCopyMem(Dest, Src, len) refit_call3_wrapper(gBS->CopyMem, Dest, Src, len)
++#define MySetMem(Dest, Src, len) refit_call3_wrapper(gBS->SetMem, Dest, Src, len)
+ #else
+ #define MyCopyMem(Dest, Src, len) CopyMem(Dest, Src, len)
++#define MySetMem(Dest, Src, len) SetMem(Dest, Src, len)
+ #endif
+
+ BOOLEAN EjectMedia(VOID);
diff --git a/sys-boot/refind/refind-0.14.2.ebuild b/sys-boot/refind/refind-0.14.2-r1.ebuild
index f280380cf1c4..d3866389c5cb 100644
--- a/sys-boot/refind/refind-0.14.2.ebuild
+++ b/sys-boot/refind/refind-0.14.2-r1.ebuild
@@ -11,8 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PV}/${PN}-src-${PV}.t
LICENSE="BSD CC-BY-SA-3.0 CC-BY-SA-4.0 FDL-1.3 GPL-2+ GPL-3+ LGPL-3+"
SLOT="0"
-# Unkeyworded for now because of bug #934474
-#KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
IUSE="${FS_USE} doc"
@@ -23,7 +22,10 @@ BDEPEND="sys-devel/binutils"
DOCS=( README.txt NEWS.txt )
-PATCHES=( "${FILESDIR}"/${PN}-0.14.0.2-clang.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.14.0.2-clang.patch
+ "${FILESDIR}"/${P}-fix-gnu-efi-3.0.18.patch
+)
checktools() {
if [[ ${MERGE_TYPE} != "binary" ]]; then
@@ -42,28 +44,11 @@ checktools() {
fi
}
-check-gnu-efi() {
- if [[ ${MERGE_TYPE} != "binary" ]]; then
- local efi=sys-boot/gnu-efi
-
- local broken=3.0.18-r1
- has_version -d "=${efi}-${broken}" && die "This version of refind does not boot if compiled with =${efi}-${broken}"
-
- broken=3.0.18
- if has_version -d ">=${efi}-${broken}"; then
- ewarn "This version of refind does not display jpegs correctly if compiled with >=${efi}-${broken} (bug #934474)"
- fi
- fi
-}
-
pkg_pretend() {
- check-gnu-efi
checktools
}
pkg_setup() {
- check-gnu-efi
-
if use x86; then
export EFIARCH=ia32
export BUILDARCH=ia32
diff --git a/sys-boot/sgibootcd/Manifest b/sys-boot/sgibootcd/Manifest
index 87a98186be6a..f8983de0bb9b 100644
--- a/sys-boot/sgibootcd/Manifest
+++ b/sys-boot/sgibootcd/Manifest
@@ -1,3 +1,3 @@
DIST sgibootcd-0.13.tar.xz 3736 BLAKE2B 793825c9ad88449b187ceab28d474e5676d45d3ea2c649dbbf669f00cf6dc9d55bc1e9900a4bf321a7dfddd8f5bc65e5e2fbc61fe913e7be43df9064118efcac SHA512 aa7780e360e0b5d4c9c0d6b5894897fa5f6ff13b1a389ba913f27cbdf8173db123e59426391d2a0e154f836277a780dc004617608adb88e7e6f3e8b6348729f9
-EBUILD sgibootcd-0.13.ebuild 1090 BLAKE2B cbd1aaabf8161e8b7b21a4844ac6f1317752feb9651aa13aace5eddfeacd862d95a2c934585795b4c5704fa767d6b31efc289b5c669f1f30353316bd9f6905eb SHA512 f81d517eb1cd9a63202f77cd68778cc492ad5c096675e91e2899f4a68c13293c4d28a813d5573a35427c86884d5fdc3ec35e03aefb55518f22ff522d627227bf
+EBUILD sgibootcd-0.13.ebuild 1048 BLAKE2B 1f55e7b5af06816aa09a15297c67189bc4bc00b6d8f5c180a733fb32f9aa238d64c537bbc6d254e7441a4acf3b51eacf21add2225682377849ccada34a1c6c80 SHA512 2fd802996852f2ee5e4e78cbae1df55127ca283355b3d7499c49f0901004719bad3c3b02f4e8dc584481679c0f557e1a53a8893acc852ec43dcdd1635310dd8b
MISC metadata.xml 416 BLAKE2B edb7cb09967b542fdaea40c35fd85b5d4977eec6c274e26b3f037933b51745001c2d0bbb33d82c35d73aefff1c0670d9a04ae7cb665f4d984f0824ac1ce4a934 SHA512 0b7ef2783c65cd15922d9b35e79af0572578695f786e19f133f981954701c9c8bcb3d09c099ef1d50f9b2460b07226a0f3d1c1b265b06610f9a93c388d1a5e71
diff --git a/sys-boot/sgibootcd/sgibootcd-0.13.ebuild b/sys-boot/sgibootcd/sgibootcd-0.13.ebuild
index 4ecf329c44a2..2fc4abc1a48a 100644
--- a/sys-boot/sgibootcd/sgibootcd-0.13.ebuild
+++ b/sys-boot/sgibootcd/sgibootcd-0.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2005-2021 Gentoo Authors
+# Copyright 2005-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="8"
@@ -12,11 +12,6 @@ LICENSE="all-rights-reserved"
SLOT="0"
KEYWORDS="-* ~mips"
-IUSE=""
-RDEPEND=""
-DEPEND=""
-RESTRICT=""
-
# sgibootcd is a small utility used to build the image that is burned to a
# CD and used to boot SGI systems. Its compilation does not involve the
# external linker, 'ld', and thus this makes it difficult to reliably pass
diff --git a/sys-boot/uefi-mkconfig/Manifest b/sys-boot/uefi-mkconfig/Manifest
index 32388c61994f..ff762682f084 100644
--- a/sys-boot/uefi-mkconfig/Manifest
+++ b/sys-boot/uefi-mkconfig/Manifest
@@ -1,7 +1,7 @@
-DIST uefi-mkconfig-1.4.tar.gz 7844 BLAKE2B 4266c8c934f665c85d54699ebdd11648692b1eff2e0d4111de8329e01dee3342c760d772da27a8862e0427fcbecb38a9c0499ee482aa1ee0dcf72d0f30be97ef SHA512 47e096571899c18decd24c65df9bdd9da964e1e47120504d8c9761b7c2b80172b17a9259f229c267c95d7ee4ac24a1e79a3d0f13d15fc2effee7fcee8b1ce3ea
-DIST uefi-mkconfig-1.5.tar.gz 8299 BLAKE2B f06ec90f298f2dcc5c3001f603b50c7521b5568272ba263b87f19ed45f5d10aec162b8ad909c9c5bbe72638559b9346f586063e7e25c33c7b41b3fe881bab35f SHA512 244d280a0b2b8e197b9d9a46e4db729efb5d568a0907c538aa1e27e0491eb12e2105bfc6d7b52c2a06f7fd53f7c5d339d680124a9dbfb5bd451b8659ea23752f
DIST uefi-mkconfig-1.6.tar.gz 8620 BLAKE2B 57a48be15a976cc628f04e263fcbc1c56296f9d2b8ff11e70ab9239723f168e08775042fa86ab49e85d212aa719e6465acf883debe46f4a7f3d57edf3d07dd09 SHA512 df4595f5c05b812e7199fc19564bd899b345952f23014f9f0851e7da4b812b93583d52b9955edde3f7d05c182f29b120b7201d69493931813b2caf8ffd2e6f14
-EBUILD uefi-mkconfig-1.4.ebuild 939 BLAKE2B b5c54503a23ed7b7959d4e9840fd9a087d812e6540d1db613c1880bcc1a54038feedb6a3274f557b9cc151644e14303da26b131e22cc212ba2e95db9bee9b7af SHA512 d068b0f70fe9d0eb489c65b90aa187dd259b68542d850a6a715dfc9a3a5101b98d79d41e702fed6c8f632495c79ae958b3a224867046bed263a1bfaf036875b8
-EBUILD uefi-mkconfig-1.5.ebuild 939 BLAKE2B b5c54503a23ed7b7959d4e9840fd9a087d812e6540d1db613c1880bcc1a54038feedb6a3274f557b9cc151644e14303da26b131e22cc212ba2e95db9bee9b7af SHA512 d068b0f70fe9d0eb489c65b90aa187dd259b68542d850a6a715dfc9a3a5101b98d79d41e702fed6c8f632495c79ae958b3a224867046bed263a1bfaf036875b8
+DIST uefi-mkconfig-2.1.tar.gz 10083 BLAKE2B c78a2f38b66c643c23442c5159d70272099babea9dc5bc7eb68628ff09cf307375a32e7886ed8e597dc05233aa49d6aa13ec86466b0aaebd33663667848867fe SHA512 466f4d902e84ec19d17f4b43bacced6372c5c0a469c245e267a5166b0a2d2a3ee2c1409d83129cc5088305367e0a53249990f45119b8c5522235fd65a19dc5fb
+DIST uefi-mkconfig-2.2.tar.gz 10176 BLAKE2B 7078c23d39dc4e6b80785502c0d186ec1c8ca4ad4b758bcfdf4b74df38e47cef23952e5139d185a9b2b1253cd69f018145c63254f3a421952c70371e33fb1911 SHA512 5489aacc869afb57dc4d48deba4306b141ea08fa5763b8486f156b3b01aecf987f7927b70e7acbb1abe9e145b1d1d4ef57cd93e12d78bec10cc9e61a37ccf02c
EBUILD uefi-mkconfig-1.6.ebuild 939 BLAKE2B b5c54503a23ed7b7959d4e9840fd9a087d812e6540d1db613c1880bcc1a54038feedb6a3274f557b9cc151644e14303da26b131e22cc212ba2e95db9bee9b7af SHA512 d068b0f70fe9d0eb489c65b90aa187dd259b68542d850a6a715dfc9a3a5101b98d79d41e702fed6c8f632495c79ae958b3a224867046bed263a1bfaf036875b8
+EBUILD uefi-mkconfig-2.1.ebuild 1036 BLAKE2B 928d199609af5078df3dff9df2e11f81a44b54071ea019007870cff7896532c9458cecfb3a2d8426db418068f840b475c8676d57226041684b3eaeb42d860b3d SHA512 ab998c6557bd2a0d62860834df7a85524a252a27e8f99f2cd78e809a0c818083945af489d12b54055079be92848697fbc29cea8aea8a362df5615e87412fcbbd
+EBUILD uefi-mkconfig-2.2.ebuild 1036 BLAKE2B 928d199609af5078df3dff9df2e11f81a44b54071ea019007870cff7896532c9458cecfb3a2d8426db418068f840b475c8676d57226041684b3eaeb42d860b3d SHA512 ab998c6557bd2a0d62860834df7a85524a252a27e8f99f2cd78e809a0c818083945af489d12b54055079be92848697fbc29cea8aea8a362df5615e87412fcbbd
MISC metadata.xml 547 BLAKE2B fb91c84c4c6542e1f61e428d43a16253053892f1d2588f1732ffcb62695afe6c1ef94ddb5a71157caae8b4ec98a760143263b1d5768143403d9910bbd1ea8def SHA512 f0f49933219ebedda34a856089e1be5642608c2464ba6d7819da00ce25bd5a19ac41a1cbfd927937a4bbbf0d500e4271394da28d31428fc8482c35bcf61cc3e7
diff --git a/sys-boot/uefi-mkconfig/uefi-mkconfig-1.4.ebuild b/sys-boot/uefi-mkconfig/uefi-mkconfig-2.1.ebuild
index 8e426c062c9c..8b272798d1ff 100644
--- a/sys-boot/uefi-mkconfig/uefi-mkconfig-1.4.ebuild
+++ b/sys-boot/uefi-mkconfig/uefi-mkconfig-2.1.ebuild
@@ -30,6 +30,7 @@ pkg_postinst() {
elog "Run uefi-mkconfig while having all efi partitions mounted"
elog "Please use with care, this package was tested on a limited number of machines"
elog "Some problems may arise due to different implementations of UEFI"
+ elog "Don't forget to add kernel commands to the configuration file before using this package!"
elog
optfeature "Add UEFI entries on kernel installation " \ "sys-kernel/installkernel[-systemd,efistub]"
}
diff --git a/sys-boot/uefi-mkconfig/uefi-mkconfig-1.5.ebuild b/sys-boot/uefi-mkconfig/uefi-mkconfig-2.2.ebuild
index 8e426c062c9c..8b272798d1ff 100644
--- a/sys-boot/uefi-mkconfig/uefi-mkconfig-1.5.ebuild
+++ b/sys-boot/uefi-mkconfig/uefi-mkconfig-2.2.ebuild
@@ -30,6 +30,7 @@ pkg_postinst() {
elog "Run uefi-mkconfig while having all efi partitions mounted"
elog "Please use with care, this package was tested on a limited number of machines"
elog "Some problems may arise due to different implementations of UEFI"
+ elog "Don't forget to add kernel commands to the configuration file before using this package!"
elog
optfeature "Add UEFI entries on kernel installation " \ "sys-kernel/installkernel[-systemd,efistub]"
}