summaryrefslogtreecommitdiff
path: root/sys-boot
diff options
context:
space:
mode:
Diffstat (limited to 'sys-boot')
-rw-r--r--sys-boot/Manifest.gzbin7235 -> 7238 bytes
-rw-r--r--sys-boot/grub/Manifest3
-rw-r--r--sys-boot/grub/files/2.04-sparc64-bios-boot.patch50
-rw-r--r--sys-boot/grub/grub-2.04-r1.ebuild (renamed from sys-boot/grub/grub-2.04.ebuild)1
-rw-r--r--sys-boot/woeusb/Manifest6
-rw-r--r--sys-boot/woeusb/woeusb-3.1.5.ebuild58
-rw-r--r--sys-boot/woeusb/woeusb-3.2.12.ebuild58
-rw-r--r--sys-boot/woeusb/woeusb-3.3.0.ebuild2
8 files changed, 55 insertions, 123 deletions
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 528f749051f1..a191bd431d7d 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
Binary files differ
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 68fe0f5c76bc..4de5ecca8e06 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -5,6 +5,7 @@ AUX 2.02-freetype-pkg-config.patch 7359 BLAKE2B 86ee01b2cb833354377aec3db0dcc05c
AUX 2.02-gcc8.patch 2514 BLAKE2B 5eb8210441a41a44c4e0c73120d201c4ec5a8db27d0dbf37f991599ee6c2bb3aaf771a201d02829597f34f9a1af76f70dffcc9e25fa079c3e2eb72702d704692 SHA512 8eae4bfdbe595685961ed8f491b8dc8f30632d5d9e338612346a928318d4e4b811c5ffeb38354f698e40dbaa8449fd540a33ff2ca0e2af604cbe08988fc11238
AUX 2.02-multiple-early-initrd.patch 6771 BLAKE2B 088d1178c51ea7526bd7620ae0f8160c10d3673afd0ae3407e35673cb438875e24e13f8455245c36792814751995df1235d975eb036e97813e677250af403a9d SHA512 41450b475fb83ade629d165ae2c30682e5beb2edbfd148c6388bb720241f0682b20aa0456bc624d5e9f5605616ea27fab32a829ede6c8c673e1c88e6b774a5a8
AUX 2.02-xfs-sparse-inodes.patch 2548 BLAKE2B c3333b82b678bc0a2bfc6594719c89982f97b14b7a2f012814ce2f75e004cda46b8b7c2d4e668c5a52aee7814114a763c4d853d9c75b4322535096ba3c22e256 SHA512 4723c5dd9fd6e9b6c8677e32e4906c7995d695c7e85e834b1b29eb1d9a024678f8fa75846c7b929d1db9b5911b604c69c1b0379cb3b9adc98d5bb6d6719eb2c4
+AUX 2.04-sparc64-bios-boot.patch 1600 BLAKE2B be98526db413307f7f704c68c332ce8d76f41baa80e6372d293cbb74acb5fb07c2bf6d34315196ea03e62e18d847b068819a19a97b294e8e29453651df3bd49c SHA512 07a222dcb2c73cd5c2fc10eb154597e751e7b6d73e726ead280b1773ece6b2a3f1698dece876f7ed5cc764cf0bc12c664ea643638c203068fea25778cedffb92
AUX gfxpayload.patch 1118 BLAKE2B 4104fc696535b1c3feba5876bccc64f9b2e52319ee992c59e7f17b8310cc9addf7545630fff78c73ca3f4b0dcd44e1bf69f4df5264d6f58777f7e5aeae93cbcb SHA512 00324825c369902a0383b792cd21e161853eadccbdc5abe2420f2d443bf6a74f72be6c15243107b936acd38c3547387c3771dc2cb566003c4c754c9260b4aa00
AUX grub-2.02_beta2-KERNEL_GLOBS.patch 2121 BLAKE2B 398195f59537d40a4f61eadf5be974b8f9eb56a4eb07b798f0dc18e29588b3a9f8daa8d6e64980a835ec1960fab60b8c96d6552ef2920fe6604170abf7d5e7da SHA512 f85bc538ae647c46efbe07d7b87acf49daa7b07e9752af3aa3f77019f48ea24cd1b6a095a6f9c19d50128701753f453c531b9b068e11ee22a259f3fdf8ac205e
AUX grub.default-3 2532 BLAKE2B f59b8e862b7069603a975327d51507aae4568bfc80d7aa237f620008b00520a5a14b0c95e3f9c277360e1dfafc83bcc815970b47a69bf469ad7e594956f47c60 SHA512 2faf5e730331b7d04045ee64d990227ef02f1b14a1cf88b5b71a18c91a9a8cba773a601eb3f5442092f6937935efed02629a278bd6822fac60f9c72045e4b13d
@@ -16,7 +17,7 @@ DIST unifont-12.0.01.pcf.gz 1360857 BLAKE2B ab87e58aee2295e52dc49b7bb131793ad775
DIST unifont-12.1.02.pcf.gz 1335424 BLAKE2B 97080312468e3f3c8aa6f49cef08f5622641e8c9c035f3ede1e09d8d98de4e78d3b23c8aba2e8070eb46cbebd2d55e8568e467d7f15f35aa8fc8db792b7e5f14 SHA512 b280b2db7cf5f480b0668c331130dede2c0cc87d5e02e44566b77787113d0f6604d0105522858288f2ac6b8e77df7a2d9878725013a6c778dc5bfb183156e2f0
DIST unifont-9.0.06.pcf.gz 1360354 BLAKE2B 09b96e1711c729ef159d62e3ea7b289ca2d01dc0ea417e35a18b73dc02a23f62ce7821d9761bceee4002d9eeaabd91cfb69bbacc6fbdfdfa00445d18fe8f1d66 SHA512 dd0a1afa72f5204c62055d83f22750c74af38ffafdb8eda8e1f1cf7292e572a14969b8a9a6a2cb336d5bed4ab633f6b5a962c59117a590e4238788959cb82774
EBUILD grub-2.02-r4.ebuild 7961 BLAKE2B 9484b4fe31527dd587d0c754e21030d7f6e6d1d712502081045e0b9c0c33df2b99540a568f0df785239636c3a1e0acfbece0212f15ac84ae6780e9ca8b31a278 SHA512 4354a12788262ec4f3daba4932b3306a5a9eac1f8f1b7209f91d65abb591bad71680d166e3b3ea81aff95561500bdb02c1a742291f7efe9b63958fc8ff6111fc
-EBUILD grub-2.04.ebuild 7503 BLAKE2B d6ff3d9ab69d7085fd206d202d1dcabf4d4a97d887384a52128bbe66fae127270833b1c82e8b208ae364e19c847735d5198e464e5930d4c175be920970444fc1 SHA512 9fb7068fe9e83e71aa3adf69233bdf23fa3a7eacb779db47f5358d8b43ae93d2f5f5eb31663e97dc16d23e6f754fc62880b3a5b31a02f384c75fdf26c7c079ff
+EBUILD grub-2.04-r1.ebuild 7547 BLAKE2B 7236633e180b7956d7722c251b36c497e7de66d2c59fde2f56581c13dcff5a68c75caa2119711ae9febecfa1e474d3bdfb6a3ce34efe7a00bf23ebc707bf5acf SHA512 25cd0ab315360707b63223d25073ea24c2bde94ccd99bba606563ec14cc7efbfe2fbd6265fff64b763a5cd2b34c507a4e607c2ae910e62c06c3aa4f9b079b539
EBUILD grub-2.04_rc1.ebuild 7700 BLAKE2B f599f7d2f7c428ce6f36434a11506b3c34655d2a90ff654b65b5cd595a063ec9ebfcac96434347803721e03219780bb4986289014f08f48364f376528c4a6cb9 SHA512 6626e04c7c95227448c91145e3dc42bfd9c3c587094b8ff923824aa4a456833842be1c29df8bddb1d76d962ccdff323c6ea2fe0419b8999e73a07097a63ca158
EBUILD grub-9999.ebuild 7503 BLAKE2B d6ff3d9ab69d7085fd206d202d1dcabf4d4a97d887384a52128bbe66fae127270833b1c82e8b208ae364e19c847735d5198e464e5930d4c175be920970444fc1 SHA512 9fb7068fe9e83e71aa3adf69233bdf23fa3a7eacb779db47f5358d8b43ae93d2f5f5eb31663e97dc16d23e6f754fc62880b3a5b31a02f384c75fdf26c7c079ff
MISC metadata.xml 1149 BLAKE2B c0a364b1d8139f26f7dd09ba49dd68d591c7532e2eec25dae97caea49be8bfc92c8d5c69dcc77d89f58367fa04a73526cc55768f93222effc6c6e47a52b53500 SHA512 45d0425236957395e275bd340aeabfcd03451b037c616c54cf8babdc3bdee6aa3706fa7565f595ba4391773d331353b8920a627094c01289935a1a9aedc1f7bf
diff --git a/sys-boot/grub/files/2.04-sparc64-bios-boot.patch b/sys-boot/grub/files/2.04-sparc64-bios-boot.patch
new file mode 100644
index 000000000000..8fd00d497ad8
--- /dev/null
+++ b/sys-boot/grub/files/2.04-sparc64-bios-boot.patch
@@ -0,0 +1,50 @@
+From 4e75b2ae313b13b5bfb54cc5e5c53368d6eb2a08 Mon Sep 17 00:00:00 2001
+From: James Clarke <jrtc27@jrtc27.com>
+Date: Thu, 18 Jul 2019 14:31:55 +0200
+Subject: [PATCH] sparc64: Fix BIOS Boot Partition support
+
+Currently, gpt_offset is uninitialised when using a BIOS Boot Partition
+but is used unconditionally inside save_blocklists. Instead, ensure it
+is always initialised to 0 (note that there is already separate code to
+do the equivalent adjustment after we call save_blocklists on this code
+path).
+
+This patch has been tested on a T5-2 LDOM.
+
+Signed-off-by: James Clarke <jrtc27@jrtc27.com>
+Tested-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
+Reviewed-by: Vladimir Serbinenko <phcoder@gmail.com>
+Reviewed-by: Eric Snowberg <eric.snowberg@oracle.com>
+
+---
+ util/setup.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+---
+ util/setup.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/util/setup.c b/util/setup.c
+index 6f88f3c..3be88aa 100644
+--- a/util/setup.c
++++ b/util/setup.c
+@@ -271,6 +271,9 @@ SETUP (const char *dir,
+ bl.current_segment =
+ GRUB_BOOT_I386_PC_KERNEL_SEG + (GRUB_DISK_SECTOR_SIZE >> 4);
+ #endif
++#ifdef GRUB_SETUP_SPARC64
++ bl.gpt_offset = 0;
++#endif
+ bl.last_length = 0;
+
+ /* Read the boot image by the OS service. */
+@@ -730,7 +733,6 @@ unable_to_embed:
+ #ifdef GRUB_SETUP_SPARC64
+ {
+ grub_partition_t container = root_dev->disk->partition;
+- bl.gpt_offset = 0;
+
+ if (grub_strstr (container->partmap->name, "gpt"))
+ bl.gpt_offset = grub_partition_get_start (container);
+--
+cgit v1.0-41-gc330
+
diff --git a/sys-boot/grub/grub-2.04.ebuild b/sys-boot/grub/grub-2.04-r1.ebuild
index 07f21fac6705..81bd769728c9 100644
--- a/sys-boot/grub/grub-2.04.ebuild
+++ b/sys-boot/grub/grub-2.04-r1.ebuild
@@ -39,6 +39,7 @@ fi
PATCHES=(
"${FILESDIR}"/gfxpayload.patch
"${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
+ "${FILESDIR}"/2.04-sparc64-bios-boot.patch
)
DEJAVU=dejavu-sans-ttf-2.37
diff --git a/sys-boot/woeusb/Manifest b/sys-boot/woeusb/Manifest
index 1ca3a13e15c8..3d73ae53d702 100644
--- a/sys-boot/woeusb/Manifest
+++ b/sys-boot/woeusb/Manifest
@@ -1,7 +1,3 @@
-DIST woeusb-3.1.5.tar.gz 399712 BLAKE2B d52b29249af680577299a02cb9a2c1436aef73a0240bff2525c494657c197a2fc0709e0ff6f35eb5d18592145347af284a998deacecff37effd95b75ab13bc9a SHA512 5cf4eb45b126d71bcb376148383faf9713bc06ec4ee3ccc2dfa6528d9fba382bceaae2cdd47f2d8ba775dad1ca8e6258af40fc6362336927894398193600c965
-DIST woeusb-3.2.12.tar.gz 386189 BLAKE2B 53629a185d0b8ff55cb2e60eaa6cb8f9e106d3f5b24f57cf8f777dbf5b9a1e43ed423e53e4710acf9ac5ce3171da7dbfcd40b5b3f297b0db240e7c0f9a687fc0 SHA512 9a4e20003970a3313b080bde9a534fb1724382555281aa510092a3698622dae46f22483ff8968903b5685e00ebfb454718de6db7f3c61c4a2e122c961bfc270f
DIST woeusb-3.3.0.tar.gz 386251 BLAKE2B 9767fc3ab3ae438ff126c05a197cb41550704b93f3b508ad88b7a39c74777fdd863794970ebc839f79f8b2f1da9f6041bb355783ec1040e31814fead8185439c SHA512 8cac015df2309e4978f38adae9b9da04d896301f8d9d971d3d21801b24c3287d7d405bc4b2b1e0ff285497b5777462eb8cd6ce7dce079daf49b4d5d313a449a3
-EBUILD woeusb-3.1.5.ebuild 1036 BLAKE2B 05f973a5a8fd401e9555b5d87cb961a78d0383c8944eabdd35387bb4edb0897eeb184d379647496b6765bcce1d1016cf7d5baa6abba89b6ba1483a91b090b4b8 SHA512 1c8b86ec2a14ff16ad6e82616ff2430b1a364a68ef00b03a330240800ded5e55e1ca0f518523a7c792955846a35b372b396c804c29e1b68c479ec8a49d600671
-EBUILD woeusb-3.2.12.ebuild 1036 BLAKE2B 4da72a0ecf963952b371e4b7382e1a84043d13f963e58918b76b3e0febcade04f550d4cd74f87a40df8443607753ecdf0d5510e7499d697175eaa426eb5337a9 SHA512 1e4739778602432b4362626a6c794f2d27ad61f03d6994d4e7ca87beb5efac097f643b3cbdccfa18fd7948b5d8949693b88989754011d38fcd30d355db9f38e2
-EBUILD woeusb-3.3.0.ebuild 1038 BLAKE2B 372b8f269cd8e8e65df8ecce53d8a7838a7baae4da64147e900afe5aeaa7bdc19968aeef120bd17269d48cfdb602b521bbbd4da5dcdc2a503070d270d8c60d85 SHA512 89f65e4f0ef0e5deb11c2aae51d4d4dc55cba9db3751aa34046dd7c6a48691316e1be4a7f3e5644e5202ff4b1bdfd318e44c6ab87700fe4ea07575decd994a7a
+EBUILD woeusb-3.3.0.ebuild 1036 BLAKE2B 4da72a0ecf963952b371e4b7382e1a84043d13f963e58918b76b3e0febcade04f550d4cd74f87a40df8443607753ecdf0d5510e7499d697175eaa426eb5337a9 SHA512 1e4739778602432b4362626a6c794f2d27ad61f03d6994d4e7ca87beb5efac097f643b3cbdccfa18fd7948b5d8949693b88989754011d38fcd30d355db9f38e2
MISC metadata.xml 280 BLAKE2B 6e0485a0da47b477f5276aa17735ff1e9b269dbac220b12c615a80a2ad5a7a6f88aa5bcc9bd715355b5687ba50d78bb0cc45d1ef0ba82c52111691b895cffc8e SHA512 af2aa2fda44a73779e31b805313371a2cb6b9ab2846289a73083074fbff99ea1e7da2fefeaccf13b5f11c4c55b6ccb38390f21eab3f4ac1a61e00914ae38fff9
diff --git a/sys-boot/woeusb/woeusb-3.1.5.ebuild b/sys-boot/woeusb/woeusb-3.1.5.ebuild
deleted file mode 100644
index 6e6027efa6a3..000000000000
--- a/sys-boot/woeusb/woeusb-3.1.5.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER="3.0-gtk3"
-
-inherit autotools wxwidgets
-
-DESCRIPTION="Creates windows installer on usb media from an iso image"
-HOMEPAGE="https://github.com/slacka/WoeUSB"
-SRC_URI="https://github.com/slacka/WoeUSB/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="minimal"
-
-RDEPEND="
- sys-apps/util-linux
- sys-block/parted
- sys-fs/dosfstools
- sys-fs/ntfs3g
- sys-boot/grub:2[grub_platforms_pc]
- !minimal? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/WoeUSB-${PV}"
-
-src_prepare() {
- default
- find . -type f -print0 | xargs -0 sed -i "s/@@WOEUSB_VERSION@@/${PV}/" || die
- if ! use minimal; then
- setup-wxwidgets
- eautoreconf
- fi
-}
-
-src_configure() {
- ! use minimal && default
-}
-
-src_compile() {
- ! use minimal && default
-}
-
-src_test() {
- ! use minimal && default
-}
-
-src_install() {
- if use minimal; then
- dosbin src/woeusb
- einstalldocs
- else
- default
- fi
-}
diff --git a/sys-boot/woeusb/woeusb-3.2.12.ebuild b/sys-boot/woeusb/woeusb-3.2.12.ebuild
deleted file mode 100644
index 573d9db62c74..000000000000
--- a/sys-boot/woeusb/woeusb-3.2.12.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER="3.0-gtk3"
-
-inherit autotools wxwidgets
-
-DESCRIPTION="Creates windows installer on usb media from an iso image"
-HOMEPAGE="https://github.com/slacka/WoeUSB"
-SRC_URI="https://github.com/slacka/WoeUSB/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="minimal"
-
-RDEPEND="
- sys-apps/util-linux
- sys-block/parted
- sys-fs/dosfstools
- sys-fs/ntfs3g
- sys-boot/grub:2[grub_platforms_pc]
- !minimal? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/WoeUSB-${PV}"
-
-src_prepare() {
- default
- find . -type f -print0 | xargs -0 sed -i "s/@@WOEUSB_VERSION@@/${PV}/" || die
- if ! use minimal; then
- setup-wxwidgets
- eautoreconf
- fi
-}
-
-src_configure() {
- ! use minimal && default
-}
-
-src_compile() {
- ! use minimal && default
-}
-
-src_test() {
- ! use minimal && default
-}
-
-src_install() {
- if use minimal; then
- dosbin src/woeusb
- einstalldocs
- else
- default
- fi
-}
diff --git a/sys-boot/woeusb/woeusb-3.3.0.ebuild b/sys-boot/woeusb/woeusb-3.3.0.ebuild
index 81c09abcf2ef..573d9db62c74 100644
--- a/sys-boot/woeusb/woeusb-3.3.0.ebuild
+++ b/sys-boot/woeusb/woeusb-3.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/slacka/WoeUSB/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="minimal"
RDEPEND="
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-04 09:34:33 +0000