diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
| commit | 0f558761aa2dee1017b4751e4017205e015a9560 (patch) | |
| tree | 037df795519468a25d9362b4e95cdaeb84eb1cf9 /sys-boot | |
| parent | 752d6256e5204b958b0ef7905675a940b5e9172f (diff) | |
gentoo resync : 29.12.2022
Diffstat (limited to 'sys-boot')
36 files changed, 1241 insertions, 407 deletions
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz Binary files differindex c41dd51f40af..7485afb86342 100644 --- a/sys-boot/Manifest.gz +++ b/sys-boot/Manifest.gz diff --git a/sys-boot/colo/Manifest b/sys-boot/colo/Manifest index 09a1fd9fd623..ec5deeae2ef6 100644 --- a/sys-boot/colo/Manifest +++ b/sys-boot/colo/Manifest @@ -4,4 +4,4 @@ AUX menu.colo 1517 BLAKE2B 04d4ea5118ebe89229607a9beb8f6713a40f945df1d3ae0de867e AUX simple.colo 539 BLAKE2B fa8a255ffeac0ad14c0fc392fe65e89c9e627c022d0adbd9e1b1add70cc0535b9837f45d59ea1b43ae6919637a36c5364d38e75d4b5be7102e5dbf2c1727565d SHA512 38b3481adbad50c344f87cfd9a5346a78158cfd298194f715b40ad582d5fad9ad6e16f773004a8732e673bc8b3791dde39da10ac85c72a8e236837ca82a91d1a DIST colo-1.22.tar.gz 257968 BLAKE2B f7c8f97b3fed2d2071b89f84e3e78e814914999a3038c854d92e651e4c3a1aa1889e3486f2de94c561475befe4e4a4606e4873c4174ff0b24dcc290f494f5acb SHA512 c983f36991a6275d4864cbd12e00f4e73d3b722746b3d3c8442afc8fe00d5432772c93007999858afb0993e1a4917f94bc9803f017ace3e65535cad7e8fb9b1e EBUILD colo-1.22.ebuild 3734 BLAKE2B 2ba4fa5d1c3469362eb61e90646c3cd704f3a56285a38a7e95ba913fbaa6afc0e9ea04443a463bf43be7cb598f03c700c51b7a2ac5be3988d6fc61a4ec1f98e0 SHA512 9004eed3dc8ad74a22cf2717cefcf5f5a166793dd30d6e15a5fec1483bdf2ccc859fe4a43788d797d5c5d0b4e93a8bafb0fdabaf4d1f263ad7f10deffc37a475 -MISC metadata.xml 242 BLAKE2B b5193df53eea0220c10241f4d48b768e58dc0f4f384d8358fe5c9593e2498c10ad2ad2bb54d49ae51c23eab75ce3a62c4f88770a1bd7adfe0c319b720b77767b SHA512 c55afc18350cd579407801a00225befb535abfb884b79bc742ec9094d59ec4a6824dac7371afe02f73abae48e5cb011695ec5f480dc483a874dec3e40c70e67f +MISC metadata.xml 255 BLAKE2B e29df51f19ee8c5c4bc537a4f4be9e293c655938e7322ade6e0c117d66ada79e1ce841cf2233635886204f44f9af184a2f256f89f09eeba6e550cb561ef48cf4 SHA512 aac67607f01b272a58af67131ab5c24fdf478f47d818b5a12a96987611b83d4a97a8e9b8b53192a50fb58234dba362f340aa7b5a8554244abe85401c4ba6c44b diff --git a/sys-boot/colo/metadata.xml b/sys-boot/colo/metadata.xml index 72d90a220166..ab5e64aa52f5 100644 --- a/sys-boot/colo/metadata.xml +++ b/sys-boot/colo/metadata.xml @@ -3,6 +3,6 @@ <pkgmetadata> <maintainer type="project"> <email>mips@gentoo.org</email> - <name>Mips Team</name> + <name>Linux MIPS Development</name> </maintainer> </pkgmetadata> diff --git a/sys-boot/efibootmgr/Manifest b/sys-boot/efibootmgr/Manifest index 35fae25b5b85..2e9776085e36 100644 --- a/sys-boot/efibootmgr/Manifest +++ b/sys-boot/efibootmgr/Manifest @@ -7,5 +7,5 @@ DIST efibootmgr-17.tar.gz 41643 BLAKE2B a1995a5df74766f762d2eb971fd6095edea8d0a4 EBUILD efibootmgr-14.ebuild 601 BLAKE2B 609e08888d571faa2a73414e05e200d9b9b5931b97493c149fa1343f463aeb17a0eed1312feabceb56e535000ad0b24c8cd2281c24454084d4006323449bf8c1 SHA512 e93d46d6d3e6a2fab2b1652af0a667003381c2d21f56aee3fddeadf79d9f76078531548ddeec9200f210a0d36b8659bbd41a3f20b5eccb32f26e1435162b8144 EBUILD efibootmgr-15.ebuild 625 BLAKE2B 7c98f668fc581ab2a44a262ff289ef2c22fd47d951d3f2840a647a74db0e6808e5defdb8dc106a60cbfa30592a5b07ffdac2ee2fbb70ce3485123465bc797b95 SHA512 08e0ab714b313a627a8189640d8266a1e97bb4f9186352ef9644edb9c9ab42675b38528fca6d4c7184344d3ac488feee06d6baf81e5ec59bac9bd482eca4fdec EBUILD efibootmgr-16.ebuild 708 BLAKE2B e8e920cc43e35753237705b3a3d08d08092b9f325640cfa8954c267bbcc5339971222953ffe6af203216daaed34e7991c92dd9e93cc2d794200835ba3f822c71 SHA512 877d5f55c7cdf36d182e382a569b44e4d982efc6448473afd816f66c89f8649249692dff83b7b9d3c50d1bdd3a0904a171388ce82d12d936b7c539a86b96cae6 -EBUILD efibootmgr-17.ebuild 801 BLAKE2B d2f9d1b7751b63613199153f10b6dcf7be6a67d12ca5095d03dfa28292315045bcaa43aa7f22bc959f297c45763aa0492aba1c5d241a5891d2c11f2d139ea5d1 SHA512 f608516eb01a0a70092d920167d3bd8fd806d15fb3e40a276b07a82945c67ef5c8fcb484ff595c097af83f84e84d68710f3fe84120d2483623de9ee7aba88e32 +EBUILD efibootmgr-17.ebuild 808 BLAKE2B cf09fcbdc2f60c3033fda0cdbac9995c32635959cb51f9afbe961caa577141eca13b5a331fb2bd6398bba1894fb36466f9c2c75f56580d68cc0bf05d57c679eb SHA512 6fa895fbc061d779032025380bca4e40dc1ce9dda872cc96aaaeda8f9d2b5530c52a8d96f9e37ba14aa461d59e9a80c877d224673d9299558996752980cc4999 MISC metadata.xml 627 BLAKE2B 87bce38f4ea3c37516d8105815c32ea390489ca19bbaca4da5c4e591b290fa9f02bce477d651aa2f87635ea7be7ef7074db5df3ca814064d7e64c7ae310080f7 SHA512 5d2acbc46a88561df48438009780d8e6dbe0244800e0e8b1b00e1e0c5d23045410319e4e31a7c1875213aa46e0ae9eea2423c5e971256dbb223f62e9ed6a0614 diff --git a/sys-boot/efibootmgr/efibootmgr-17.ebuild b/sys-boot/efibootmgr/efibootmgr-17.ebuild index 4443462a56c3..416014829fed 100644 --- a/sys-boot/efibootmgr/efibootmgr-17.ebuild +++ b/sys-boot/efibootmgr/efibootmgr-17.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/rhboot/efibootmgr/archive/${PV}.tar.gz -> ${P}.tar.g LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~ia64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong ~riscv x86" RDEPEND=" sys-apps/pciutils diff --git a/sys-boot/elilo/Manifest b/sys-boot/elilo/Manifest index cae921352f9f..5f8d424ea7ee 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 2268 BLAKE2B 2f0863a55a5fa846a8f81afcefb37b1ed00403985bd7cfa427505b1d52967adf9e6fd554ea4f3ec6fa941d22e59a9214e2bd4104238d37474f72f6a6a4c7563a SHA512 7d33c42bba010f6bee117e2349459d7b376b034961f430470906d13288a89ad17f5fbbd04bb0462330b6fec7893594f5f3fc7c3811132988fce9b6c4c037bab4 +EBUILD elilo-3.16-r5.ebuild 2250 BLAKE2B 92d1270c76bb38df194e7153bca5e840318e6191ef6bed314c43b72e59cce924dcac0cfbf5e1a640ce77300d88509c6eb6816a61807ebb34d3d55d8c4e599ea5 SHA512 d83ea896ad26c58e3f1cc1bac0fab1cc7f044dc35a2beddbc6cba7351d9adb9e99ce2a1a06f6455ccb276a38b49b9cbf4174c0c510274f76a6edeec85fe5cf01 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-r5.ebuild index fed811421390..1aa5387103e1 100644 --- a/sys-boot/elilo/elilo-3.16-r5.ebuild +++ b/sys-boot/elilo/elilo-3.16-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -62,7 +62,7 @@ src_compile() { # "prefix" on the next line specifies where to find gcc, as, ld, # etc. It's not the usual meaning of "prefix". By blanking it we # allow PATH to be searched. - local libdir="${SYSROOT}${EPREFIX}/usr/$(get_libdir)" + local libdir="${ESYSROOT}/usr/$(get_libdir)" emake -j1 \ prefix= \ AS="$(tc-getAS)" \ @@ -71,7 +71,7 @@ src_compile() { OBJCOPY="$(tc-getOBJCOPY)" \ HOSTARCH=${iarch} \ ARCH=${iarch} \ - EFIINC="${SYSROOT}${EPREFIX}/usr/include/efi" \ + EFIINC="${ESYSROOT}/usr/include/efi" \ GNUEFILIB="${libdir}" \ EFILIB="${libdir}" \ EFICRT0="${libdir}" \ diff --git a/sys-boot/gnu-efi/Manifest b/sys-boot/gnu-efi/Manifest index 36468ab0128a..dcecdd9e270a 100644 --- a/sys-boot/gnu-efi/Manifest +++ b/sys-boot/gnu-efi/Manifest @@ -2,5 +2,5 @@ AUX gnu-efi-3.0.9-fix-clang-build.patch 691 BLAKE2B 5b3f60e27982cd9e2cfb385851af DIST gnu-efi-3.0.12.tar.bz2 154575 BLAKE2B 264e04351cf1ef74956e65d209c00514c0f56c18427a87a894132e5a5b0b09b3ca992475a2f95aac42c8a26ff4977ec837ff473d76c1c766049e903f03bd9fff SHA512 cbec6f6e37271c22c71e3ce44d3579e48e7f3b797ec3946f56eb843ed3e472722763c566fc3b749f0c692ab6cb26e8909bb258cd164771a5b1eeff5c7cd51368 DIST gnu-efi-3.0.14.tar.bz2 159295 BLAKE2B c7f9127d3bb7e5e2bc52f5fc7be3376ddc5076b262e5db5a30a997cf10bf10288da63ded64d11327fad09190a803ce26e82b32aea2d8525ee0d1e1a23ebadff2 SHA512 37420ba3804e8547451a7b143a689ceb6af0557234fa7801efdeba3c2fc581a5354fe34cbaacb338d7b394d913e7274098ebf07026b7c1d50b2236d7f86c470c EBUILD gnu-efi-3.0.12.ebuild 1893 BLAKE2B be5aa026b5aeadb8e39322013446277ea08bf96cbee08eeadea7a8392d56b1ad45f7d5963ef7f1baeef459e54fb68bc24ba5faaeef72f52e64dde1a1ef767d17 SHA512 be87d6720e42a9ff0334fb5e79b85d272339d332fa13bf8aa415badcb68bf3727b63ac241f44a1efcc1e44f869fa122350298837526d064d79931ade56e0cb3d -EBUILD gnu-efi-3.0.14.ebuild 1794 BLAKE2B 43990bcd83b91d9872b469189ce929d46cd126d364a9fd1db773fbea4813acb0fa3284bfc28c5afc43b44c3be532eca76292670b401f5039e1755966de0135c2 SHA512 687a2206ece8adbaa40f38c64ab8819a55f575d91e5068e3420eeed5a7c30f4b2805013a5906a56507af265eccc8b0d6b748cb5843ee883121c05104a8b2ae1f +EBUILD gnu-efi-3.0.14.ebuild 1914 BLAKE2B a56a217406b98741e472504df0e7e5ad33d6b3ba40cd1ea7f78378b6151e9134083d9b43635fd8b76855a717742a3553ddf94bbf89b648e65cebfa8b7d2fb3cf SHA512 a08046a2f8a309d692d3ec5b65f84cd35633ac2ba40b51024c69aa2e583bf2f99790566b92ccad993a289970384c814e536e505ae21cdfeaf31764802e1127c4 MISC metadata.xml 324 BLAKE2B 7eff39b7405a7a2e574ca870890052a58dfcf612d2a5057dffda9aa7d674ead8884acac2bda143586d8d20000cb4e9e35f044fd2618386c7f4577d8014b899a2 SHA512 9ee2a23d2c9ac583a55b2e2d92652121f4ff11f8f40a0caa13d5a52fa61259814044ec106b46be0cc741cbdf68414c55c4da96b46328a96f5a1ec1d0e1fa11d6 diff --git a/sys-boot/gnu-efi/gnu-efi-3.0.14.ebuild b/sys-boot/gnu-efi/gnu-efi-3.0.14.ebuild index 76d4ef4d4221..e3a8a8bf07f7 100644 --- a/sys-boot/gnu-efi/gnu-efi-3.0.14.ebuild +++ b/sys-boot/gnu-efi/gnu-efi-3.0.14.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit flag-o-matic toolchain-funcs +inherit toolchain-funcs DESCRIPTION="Library for build EFI Applications" HOMEPAGE="https://sourceforge.net/projects/gnu-efi/" @@ -18,6 +18,10 @@ 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. @@ -63,18 +67,18 @@ src_compile() { unset CFLAGS CPPFLAGS LDFLAGS fi - if [[ ${CHOST} == x86_64* ]]; then + if use amd64 || use x86; then use abi_x86_32 && CHOST=i686 ABI=x86 efimake - use abi_x86_64 && efimake + use abi_x86_64 && CHOST=x86_64 ABI=amd64 efimake else efimake fi } src_install() { - if [[ ${CHOST} == x86_64* ]]; then + if use amd64 || use x86; then use abi_x86_32 && CHOST=i686 ABI=x86 efimake INSTALLROOT="${D}" install - use abi_x86_64 && efimake INSTALLROOT="${D}" install + use abi_x86_64 && CHOST=x86_64 ABI=amd64 efimake INSTALLROOT="${D}" install else efimake INSTALLROOT="${D}" install fi diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest index e5bea1bf02c6..7106ed4d3834 100644 --- a/sys-boot/grub/Manifest +++ b/sys-boot/grub/Manifest @@ -5,8 +5,10 @@ AUX grub-2.06-test-words.patch 2553 BLAKE2B 21d6167945b461be7cc73198451ae0dc15ce AUX grub-2.06-xfs-v4.patch 4440 BLAKE2B 8682d2b9520f96b098160d431906059537a6d09f4af36e4e8453e9fd821f774f49db50b24c16f650eff3ac69848573ed9a988859426829ef5b9f43c7189eead2 SHA512 743203685dca932f2f6c3d6fa85cef8631cfe8dae4afc25e7cfd50de6351e3f5974d4dded5127efb3d7f3b0cf94b60c5435135f05c6c4d9a90eb724b40076dbb AUX grub.default-3 2528 BLAKE2B c32de43644eca5fae8d8d727ff443600917a93e015f8a83dde555e3bca7506a817b08a2fc926970eeb5b7f40028f4951c6cdcd281f9fc0b6504f26c8e76bf0c5 SHA512 505960e62b44c70af0a90c7ff486bd57101831d7c6e9d80084013e374070ff02b40f77b0790aebb926e1e0854e375867cba1d4977dbb00c2ba54ebaa9f6a1a0b DIST dejavu-sans-ttf-2.37.zip 417746 BLAKE2B c8904f3cd5a49370a7dc10e456684c88aeae998a99090bf4d0a5baa4f36cc8fb8f70586cf6d610a5ffeee97261d28c80f55bbe9dcfc3ed796d5c2d60e79adb58 SHA512 ede5899daa1984c5aa8cacb1c850eb53f189dddef3d9bb78bf9774d8976b7c0d6eb0bcf86237cd7d11f5b36cf5b5058d42cd94d3bd76f2bd0931c7ceb1271fae +DIST grub-2.06-backports-r1.tar.xz 31900 BLAKE2B d8320eff8cebc408b7c4845d17adf82470407fd3837ab8508703f0f3b2bf5271d6ea8ec2cdf57461e77dd9b69458e9a9d197b533029df3637aad3656b2968b65 SHA512 2487a305ca3f969ed735df0ef181cc7caceffcfaf0126dbd8cceb19ce1062952404f0e5deeaa4f9431cafa94c40c2d57c77da17ea3da4ff62592e42e852b107a DIST grub-2.06.tar.xz 6581924 BLAKE2B 2a40b9b03d7bb3b9e7b1309ab274d686f01b3c42e7035ebc6e5a0e59a59c3b7362ba518341664b314cb0dbc8222bb10ea05ce09f08ce9d58a293207cb909e417 SHA512 4f11c648f3078567e53fc0c74d5026fdc6da4be27d188975e79d9a4df817ade0fe5ad2ddd694238a07edc45adfa02943d83c57767dd51548102b375e529e8efe DIST unifont-12.1.02.pcf.gz 1335424 BLAKE2B 97080312468e3f3c8aa6f49cef08f5622641e8c9c035f3ede1e09d8d98de4e78d3b23c8aba2e8070eb46cbebd2d55e8568e467d7f15f35aa8fc8db792b7e5f14 SHA512 b280b2db7cf5f480b0668c331130dede2c0cc87d5e02e44566b77787113d0f6604d0105522858288f2ac6b8e77df7a2d9878725013a6c778dc5bfb183156e2f0 EBUILD grub-2.06-r1.ebuild 8031 BLAKE2B fee252fdcc9872dcfe778878401c669ec80fdcaf122467f87c85259348f9d39d4dc9c5c43b95e245103d3cf8d0980e77aebee4eb6777517c170a27aa934d4258 SHA512 31bd5503f44f763b081b516a68328c8860290609f6450b92cf2820b61f117743d3f8830d25f60973c3aaa53fe4df64c7f6421cef18879fc7ba9b428aee6bfc76 -EBUILD grub-9999.ebuild 7940 BLAKE2B 36335440d2ad58d5bcf686919b6d8edc5d3604df49d8933026e0c9e570a2865ef28b306f2f55dd231c0257936146f9c6cc4146f52455e448663985e6c94ea5e8 SHA512 90f576358ff79f4c3b5917fcd5fd2463ddaed993b5a4c4b3cdcac3afcda41f3805ca75cecf2fcb63c7943cc463b69dd833c632f9dfd1454132922931f215394d +EBUILD grub-2.06-r2.ebuild 8051 BLAKE2B a9e11c956bdaf7ad11bd6c4ebdc417aef168c66a0cd44491c899d8ac4c904e2f26547e7eb0e4c7ac683d8927571536e0f65f6649947ce18234365ad30df69296 SHA512 4be2b41cd067ddc85741af3da6ab90940e2cac4a88630d15ad3dcae852dac1fe1a0b7286b8b3701af3cd9511ad343fc1fdf27f03e7495e49a82c72ab0fb8320a +EBUILD grub-9999.ebuild 7940 BLAKE2B ec2c7cd1028e60c13db74c4e8ef1ae0edb2e26c41c03e58567b8431e9d90ca1d564b06a2c13df19f63bfce7e4654ee9a9e368e1f506b0690892326cd43e6ef0c SHA512 d555bf188380574d0ee33c639b60f19dcc6c36faabd984a01188c9aa3fe5f317c0ce0b18a4d11486659bd0f0dca174e6efd3e24c3c2046985c0bff129d4c3f7e MISC metadata.xml 986 BLAKE2B 7c03fac1bf235c1d82e435926c5a9079a21eb16e9937c0ac4e6297bc2f129bc9022efa11c099df07fd9e3b6c47a13246e25ae1c4cc390878ead82394c9b9ed11 SHA512 eb62f4b746c87bf2756669d57e76e60f24cea493948b19429a45e52d02fc1a501b4465ba52940757409258f7ad0ceef0e0f473aeb80cbd9b693b866ae015f13c diff --git a/sys-boot/grub/grub-2.06-r2.ebuild b/sys-boot/grub/grub-2.06-r2.ebuild new file mode 100644 index 000000000000..fce86aecc48f --- /dev/null +++ b/sys-boot/grub/grub-2.06-r2.ebuild @@ -0,0 +1,319 @@ +# Copyright 1999-2022 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 the autogen.sh. +# GRUB_AUTORECONF: Inherit autotools and invoke eautoreconf. +# +# When applying patches: +# If gnulib is updated, set GRUB_BOOTSTRAP=1 +# If *.def is updated, set GRUB_AUTOGEN=1 +# If gnulib, *.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. + +if [[ ${PV} == 9999 ]]; then + GRUB_BOOTSTRAP=1 +fi + +GRUB_AUTORECONF=1 +PYTHON_COMPAT=( python3_{8..11} ) +WANT_LIBTOOL=none + +if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then + inherit python-any-r1 +fi + +if [[ -n ${GRUB_AUTORECONF} ]]; then + inherit autotools +fi + +inherit bash-completion-r1 flag-o-matic multibuild optfeature toolchain-funcs + +if [[ ${PV} != 9999 ]]; then + 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" + S=${WORKDIR}/${MY_P} + else + SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" + S=${WORKDIR}/${P%_*} + fi + KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv sparc x86" +else + inherit git-r3 + EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git" +fi + +SRC_URI+=" https://dev.gentoo.org/~floppym/dist/grub-2.06-backports-r1.tar.xz" + +PATCHES=( + "${WORKDIR}/${P}-backports" + "${FILESDIR}"/gfxpayload.patch + "${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch + "${FILESDIR}"/grub-2.06-test-words.patch +) + +DEJAVU=dejavu-sans-ttf-2.37 +UNIFONT=unifont-12.1.02 +SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz ) + themes? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )" + +DESCRIPTION="GNU GRUB boot loader" +HOMEPAGE="https://www.gnu.org/software/grub/" + +# 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 + sys-devel/bison + sys-apps/help2man + sys-apps/texinfo + fonts? ( + media-libs/freetype:2 + virtual/pkgconfig + ) + test? ( + app-admin/genromfs + app-arch/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/libsdl ) + ) + device-mapper? ( >=sys-fs/lvm2-2.02.45 ) + libzfs? ( sys-fs/zfs:= ) + mount? ( sys-fs/fuse:0 ) + 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 )" + +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 + fi + default +} + +src_prepare() { + default + + sed -i -e /autoreconf/d autogen.sh || die + + if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then + python_setup + else + export PYTHON=true + fi + + if [[ -n ${GRUB_BOOTSTRAP} ]]; then + eautopoint --force + AUTOPOINT=: AUTORECONF=: ./bootstrap || die + elif [[ -n ${GRUB_AUTOGEN} ]]; then + ./autogen.sh || die + fi + + if [[ -n ${GRUB_AUTORECONF} ]]; then + eautoreconf + fi +} + +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) + $(use_enable sdl grub-emu-sdl) + ${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 + + 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:/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. + grub_do emake check +} + +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-3 grub + + # https://bugs.gentoo.org/231935 + dostrip -x /usr/lib/grub +} + +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 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 [[ -z ${REPLACING_VERSIONS} ]]; then + elog + optfeature "detecting other operating systems (grub-mkconfig)" sys-boot/os-prober + optfeature "creating rescue media (grub-mkrescue)" dev-libs/libisoburn + optfeature "enabling RAID device detection" sys-fs/mdadm + 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 +} diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild index 8f568dfed408..5aff4addbbee 100644 --- a/sys-boot/grub/grub-9999.ebuild +++ b/sys-boot/grub/grub-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -21,7 +21,7 @@ if [[ ${PV} == 9999 ]]; then GRUB_BOOTSTRAP=1 fi -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{8..11} ) WANT_LIBTOOL=none if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then diff --git a/sys-boot/os-prober/Manifest b/sys-boot/os-prober/Manifest index ee8a65ab5dfe..823683478ddb 100644 --- a/sys-boot/os-prober/Manifest +++ b/sys-boot/os-prober/Manifest @@ -11,8 +11,10 @@ AUX os-prober-1.79-ntfs3.patch 909 BLAKE2B bcfd977f6ed5fb82503ffce6b02f54ce132df AUX os-prober-1.79-use-fstab-name.patch 1101 BLAKE2B 37353efa899fd72e68d297325218be5a81abc2eee50bda5607e87c0eb799924fff0f510b4f13c681213e5e4be864a62fec9d5c98e539a61e9cd4036315eeabc5 SHA512 25236c935559398a4c37cdec04c358787f6178a016a6d0d4780c7dcd9eb7e18f308f4a89a1ddbb37d6c7dd17d334d879961029afb4463cef5e9029eab58fdc5c DIST os-prober_1.78.tar.xz 26848 BLAKE2B eee68ab9be36807d86e8bda831cfd490a01d20d9cc3f84ca50d5e1143e5a2dd66e47d3bdf2b4780cf73cc692f0ffc9497c6cbf13ce7aa0057e996b13d706c8f7 SHA512 7a0425130d17ce8554e7d0797b53e3a984f63a2fdcf8e668c83d357418d8c68259ada25bc350b199adece2e683d9014f234e3a83ce5ab7485be2e69c45874640 DIST os-prober_1.79.tar.xz 27028 BLAKE2B b3efacce9d7fce3708f5ec727a219e872e8d1de6dea15540cfbc0a0e8372c1033098230d3ddb9066fb5474d44e5584ee28631e0e5ab981e8fb1dc29ee3cbd89d SHA512 89b827b9b90a1d3bc11e0090ec04d808502cc1883ab10997b6d9edbe6005dcf8a0acdd7d200102c9dccde56297bda6087d68fb6dec419f0920090c2655c9c7d8 +DIST os-prober_1.80.tar.xz 27400 BLAKE2B 56883c7d3f4c5dde2904cffc77fdf6a2c1caf230f9e84197e8d976e446815838448bb42afd18d4c9526efac9907db3d2e77c6f54889011d2d03d284a44ff4cbd SHA512 51b4fefb784d5ecf34f5148157ef233e2979c4a679a54600144be473bb6ccaf263c9121701a1ecc7523c7e3bfc439a4e3a92a5eb92431ead99cbe666b0f0e6f5 EBUILD os-prober-1.78-r1.ebuild 2233 BLAKE2B 7fa1535d0b90ec18c1ec2a49759915a786f35657a1bbed560239fed784e87d8517b2754c315017013f72398d6159faff5178f9976963443fd42ac52c6210f4db SHA512 54cb1e72251533af64b65675b1fb5833c699f9f91c6d20586268e5300a7977e2d95dcd3e8d32629ac6aaf45a9fecc434151aff4d7e656f577ae42f17c15b2f14 EBUILD os-prober-1.79-r1.ebuild 2587 BLAKE2B fddd96476140557c8b703ed11d6a73c609d9c233f54eb8258356aed4a80f0724b8cebd8ff3b0ffab3d28608467a1ab013d268bae195a0f9834ef6802a474d8e1 SHA512 8b1715a9e321b84cce144715efb0856c174eb0e0a95b365cdadad0c16364fefe13571a2795e9f75d785acde07f695eaa7f3b5f5aba7244ff4200ec7276984535 EBUILD os-prober-1.79-r2.ebuild 2579 BLAKE2B f53140ad6e45427bcde3a739dcbd603d22d0c9d767c604b3c8bd7918cd108f16fd21bebe8a468a8d1d29a0551423b992ad9099c5f646e886ade1339f85d05ad2 SHA512 52da1b381bb2e54cfa5f79085d4862298f821dc3c0dabb6a4e6e3139469ee594d4c9e4063188c47929cc5f8d07856d56488ad7a014ce198dc0ba49896251a9b2 -EBUILD os-prober-9999.ebuild 2482 BLAKE2B c59a755ba75807f6bdc3f9437ea319ee55600658997a23168f586eb19c4ea1012a9dfc0d637ae18bce2d972f8533e81360249c1af4157e67dad4de242c8dbe1b SHA512 62c4eb2541c01148e715eebf2b65d4ebaa0435a431839360e06509935706cfee3c1c5afc444333e94921f43d767d0964cedc118f9981bf4cb8cc01fcd7ed492c +EBUILD os-prober-1.80.ebuild 2460 BLAKE2B cc570bf47b84f1fa39d4873d5ef9fc5bc391eef35e588a695b23f96767e19efc174e835d21a7df4a9459cfcd19e6492b6ffe0962dc4465e37e418319d3622167 SHA512 518a0cb0f0fa09e4966b23969b9d6eeb2a404e913c3fb449dd6ceb62dc2afb4d61f5d1e55f4be81d11c3fc0dcb7a10eea0f5ccca05a2b39ca77c1d08eccb2e58 +EBUILD os-prober-9999.ebuild 2460 BLAKE2B cc570bf47b84f1fa39d4873d5ef9fc5bc391eef35e588a695b23f96767e19efc174e835d21a7df4a9459cfcd19e6492b6ffe0962dc4465e37e418319d3622167 SHA512 518a0cb0f0fa09e4966b23969b9d6eeb2a404e913c3fb449dd6ceb62dc2afb4d61f5d1e55f4be81d11c3fc0dcb7a10eea0f5ccca05a2b39ca77c1d08eccb2e58 MISC metadata.xml 384 BLAKE2B 98bf64680e61d1c0f0c9cbd73ce11be5a98fc7014517d263be8808064b1ab5b7ef200c243c472c3dedfad24176851007d9f4b03399e0970fd351f086b13d355c SHA512 dd391671666f17ce8e45093ff42c898c4bb0c685df9bb631c56089379d0825a15364656dedf4eec13c7652cfdbeb9c4f40f7bae0a8360cadd9b2cff136189bc3 diff --git a/sys-boot/os-prober/os-prober-1.80.ebuild b/sys-boot/os-prober/os-prober-1.80.ebuild new file mode 100644 index 000000000000..60466c142031 --- /dev/null +++ b/sys-boot/os-prober/os-prober-1.80.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit readme.gentoo-r1 toolchain-funcs + +DESCRIPTION="Utility to detect other OSs on a set of drives" +HOMEPAGE="https://salsa.debian.org/installer-team/os-prober" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://salsa.debian.org/installer-team/${PN}.git" +else + SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-3" +SLOT="0" + +# grub-mount needed per bug #607518 +RDEPEND="sys-boot/grub:2[mount]" + +# bug 594250 +QA_MULTILIB_PATHS="usr/lib/os-prober/.*" + +PATCHES=( + "${FILESDIR}"/${PN}-1.79-mdraid-detection.patch + "${FILESDIR}"/${PN}-1.79-btrfs-subvolume-detection.patch + "${FILESDIR}"/${PN}-1.79-use-fstab-name.patch + "${FILESDIR}"/${PN}-1.79-mounted-boot-partition-fix.patch + "${FILESDIR}"/${PN}-1.79-fix-busy-umount-message.patch + "${FILESDIR}"/${PN}-1.79-efi-chroot-blkid-fallback.patch +) + +DOC_CONTENTS=" + If you intend for os-prober to detect versions of Windows installed on + NTFS-formatted partitions, your system must be capable of reading the + NTFS filesystem. One way to do this is by installing sys-fs/ntfs3g. + + NOTE: Since sys-boot/grub-2.06-rc1, grub-mkconfig disables os-prober by default. + To enable it, add GRUB_DISABLE_OS_PROBER=false to /etc/default/grub. +" + +src_prepare() { + default + # use default GNU rules + rm Makefile || die 'rm Makefile failed' +} + +src_compile() { + tc-export CC + emake newns +} + +src_install() { + dobin os-prober linux-boot-prober + + # Note: as no shared libraries are installed, /usr/lib is correct + exeinto /usr/lib/os-prober + doexe newns + + insinto /usr/share/os-prober + doins common.sh + + keepdir /var/lib/os-prober + + local debarch=${ARCH%-*} dir + + case ${debarch} in + amd64) debarch=x86 ;; + ppc|ppc64) debarch=powerpc ;; + esac + + for dir in os-probes{,/mounted,/init} linux-boot-probes{,/mounted}; do + exeinto /usr/lib/${dir} + doexe ${dir}/common/* + if [[ -d ${dir}/${debarch} ]]; then + for exe in ${dir}/${debarch}/*; do + [[ ! -d "${exe}" ]] && doexe "${exe}" + done + fi + if [[ -d ${dir}/${debarch}/efi ]]; then + exeinto /usr/lib/${dir}/efi + doexe ${dir}/${debarch}/efi/* + fi + done + + if use amd64 || use x86; then + exeinto /usr/lib/os-probes/mounted + doexe os-probes/mounted/powerpc/20macosx + fi + + einstalldocs + dodoc debian/changelog + + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog +} diff --git a/sys-boot/os-prober/os-prober-9999.ebuild b/sys-boot/os-prober/os-prober-9999.ebuild index c854d403e4f0..60466c142031 100644 --- a/sys-boot/os-prober/os-prober-9999.ebuild +++ b/sys-boot/os-prober/os-prober-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,6 @@ if [[ ${PV} == 9999 ]]; then else SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz" KEYWORDS="~amd64 ~x86" - S="${WORKDIR}"/${PN} fi LICENSE="GPL-3" diff --git a/sys-boot/plymouth/Manifest b/sys-boot/plymouth/Manifest index 8736870a5f93..e431b2f74bc9 100644 --- a/sys-boot/plymouth/Manifest +++ b/sys-boot/plymouth/Manifest @@ -5,6 +5,6 @@ DIST plymouth-22.02.122.tar.xz 1183608 BLAKE2B 8bb1362fcaa7d4c0fb1b69729a8a681d9 DIST plymouth-5b91b9ed84cc91759c986634a4d64d474e6092cf.tar.gz 1132049 BLAKE2B 0e224aad93fef4039a1a023ece051a64e1fa854f29a814957673c7ba68eb3f2348ca075f59a17f7bad692152ddcc402b2246db413886ac73ad77a36a6fb2cb3c SHA512 3d81ce379d0a11af5b557bfe86e336a40e5abdbb6dbd6cd5e046ede9a46cf2782af75b8e32e3fb2232b8a22efee1890ecb47394742041d9dcb499b38476a814c EBUILD plymouth-0.9.5-r2.ebuild 2817 BLAKE2B 9a26e26b344bdede07eac1fcf51423e6f66dbf9d9dd1560f552c58e5595a8dc376e66e2b4818117f233261d364f1ec831bbebf5c88fda9b884de20052197371b SHA512 c5713d81148c8ef409c34035f95eec234fc2591da2115f47d52017766bd3bdc47ed6b95a8b08759b2bb7266d849b65e41c1c66e748b81019ca26ea67db23dc4a EBUILD plymouth-0.9.6_pre20211225-r1.ebuild 2939 BLAKE2B b9e69a220112dba150a28130b24b01f5ec15d9234b5371e5f0ac7d25eb52e364cde13b81ecb8592b30c0cea5b8c81ce02e355fb913fe6bce509c5cd81170389a SHA512 92584abfc76c6d3e52c2749373ae0725556bb7781240bdde1c042c10ae2c23c153f873f3a4be5d72bb6e6acce7d2d71cde833edbf1a7b27493ae3a9e466d5419 -EBUILD plymouth-22.02.122-r1.ebuild 2808 BLAKE2B acbe8b37182c47c8ad0c6dd0f4e0ca27da16774f6d86cd6678b29b0bf55225f12013e187ed2dd852d182329d3f754bac7ad7ae0d08d5834193cb45db3f901a31 SHA512 a211e23ce5e30bdffe366f0958363356521ae5cf78d0e19265b1544e5be60b48f22650f135841d4d941d9b42c9fe2773444a59d071d4c0dcc24c51bde3a43de1 +EBUILD plymouth-22.02.122-r1.ebuild 2801 BLAKE2B 3e376ccabec7c0c22b5e61998fbe9aeca53faa9b7266a79a9f790c38d6bf15f9a734d6d9f4546f774e9a80b3495b2da8ad7d907d1c57a4315d38b493316e0f7b SHA512 9418782086394fe5d440cab6a04af54971845ced13e1389bd0cdd00ec55c59bce23be07a39566f4ee3750de201ff915b70c53c68116ca6752a22d2e9e7c2896e EBUILD plymouth-9999.ebuild 2808 BLAKE2B acbe8b37182c47c8ad0c6dd0f4e0ca27da16774f6d86cd6678b29b0bf55225f12013e187ed2dd852d182329d3f754bac7ad7ae0d08d5834193cb45db3f901a31 SHA512 a211e23ce5e30bdffe366f0958363356521ae5cf78d0e19265b1544e5be60b48f22650f135841d4d941d9b42c9fe2773444a59d071d4c0dcc24c51bde3a43de1 MISC metadata.xml 1074 BLAKE2B 0fe5b59b55c5e542bbe094958aad76b60b4eeb25a0873ae751d56045a810b784c95f06d447e2bc28cc5229d6de349ca95c594550490ba41f801d05291c5d4e00 SHA512 fcd7509435d01018fc52666c8214ecf50d3130b3cf0089962aed2c3679571205cb0a173871baa12bc464ce01a5a6a65cb92a01439c3b0b6ed236de876fa541d3 diff --git a/sys-boot/plymouth/plymouth-22.02.122-r1.ebuild b/sys-boot/plymouth/plymouth-22.02.122-r1.ebuild index e3ad01aa6372..b69e14eb1e65 100644 --- a/sys-boot/plymouth/plymouth-22.02.122-r1.ebuild +++ b/sys-boot/plymouth/plymouth-22.02.122-r1.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://gitlab.freedesktop.org/plymouth/plymouth" else SRC_URI="${SRC_URI} https://www.freedesktop.org/software/plymouth/releases/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86" fi inherit autotools readme.gentoo-r1 systemd diff --git a/sys-boot/refind/Manifest b/sys-boot/refind/Manifest index c3c2a077a0d1..52d48f1d64c2 100644 --- a/sys-boot/refind/Manifest +++ b/sys-boot/refind/Manifest @@ -1,10 +1,6 @@ -AUX makefile.patch 856 BLAKE2B d4de5c95330577bf2a25b8c50aa3193c3b57ce740abe12bc3996af18eda54c1514e2129a1e28f0bca7384b1f4b78e19e8b35e07e816a23cc04a93ba2804214d0 SHA512 51c0552984791190fc44159de1797094dffc01cf6ef90a3219b069ae2417c0ff5020a19b34d26b0c3f7d1a1bc9184078948f669a4186893561833ff88afdb316 -AUX refind-0.12.0-gcc10.patch 321 BLAKE2B 35cb0676fa14218eb90753481cb3f76718b71b8311b4df1a9bbf1ebe591d8a9bb06d68210c422266640771a84d80805274a2008fd454f417bbb4137b96003205 SHA512 38f679759698c23927d9c3934ffbb1ef26ca590b5b6103927ec9816f9f4b5f9745703ced94f1b357d9b47b84b3b8b8072ead507acedb576e7f4eed0c1834dee6 AUX refind-0.13.2-gnuefi-3.0.14.patch 2031 BLAKE2B f70d92f26eab16baaa58ffeee1294eae5833243c26ca4b22f69d41d03fcab0a11b820de6e63c3b43171e16cd5b03688b9056ecddbb89305b0d9ce69a0abca02a SHA512 9bf3fe0413fc8d9a6a3878f786cc477127fb83e8abc306c91ea26437816e662ff46d0af363296d47596e1af82b3570b070c863d57a292941da41ca31a58dca0a -DIST refind-src-0.11.4.tar.gz 3812192 BLAKE2B 7219eeffffb63961a7ba8f7617546a12021cfe80df80a83c4dbd47cd40b0d8afbdc510abb44de3029ff15ed49372bd59e0b156f4c27eab3ef7bd6ccc3c7e02db SHA512 529962ae432edaf1895ba98deb00a23c66bd742578e1a367f70f7ed22dd7be7daf1960df8af410fba79ca775169120499a4c10119331b2b12b55a002d4354de1 -DIST refind-src-0.12.0.tar.gz 3898337 BLAKE2B 1197049fb7d91db64135dafda7488bdb1da4997ce6a6d49dfe635526240e3193d8c7c22597aee0f2d6754ce6061b4127d8aa21d43c9f061501de98e25de609d3 SHA512 3ade9642d7acf31097daa5308acb96a9fa3371314073b5a09601a886fc30444752efa08ed9fb35e421efb0b4eb9efbccd7b5c9bd6b3b9ed4af74c58f22a74729 DIST refind-src-0.13.2.tar.gz 4554759 BLAKE2B 2c3b1daf5fa100dcd4e1c801aa625e269ae9c1a99b567a271d7cdd30f95fa1e041e22984623b9a0e61f8af45966919f4b9f3a5b6c2026271d1bc37c6925f1e70 SHA512 e671d44385297295c143824dd95593f2e7bc8e282745d127b041a645aa27003467a3a23f368fd30297f33faa06bd914540d7bdc3c71ec42f6b7a38d7ee8e0ddb -EBUILD refind-0.11.4.ebuild 4746 BLAKE2B 52a388dc1e57232d120b745e3089bad0d12265dd7718589cc7af9a8a1defa105bb74d01f76510bcaafbcb64f435b3e4a555c64d2c4538ae3cd56027b769a36db SHA512 b17c07d927462adae1b9644bdfd53d3ab58e193f02e54b45c50cbc9f100adca01d97631aeb85c014069733e11645af47b275fa2cef65b73ebd9c39a1ab40f96c -EBUILD refind-0.12.0-r1.ebuild 3719 BLAKE2B ca10b2ea88821c597c58b1a801d96e811088ce36b01128b6a4e1719c71b3cdb228580f0399a963a7db09fc02d4ea01d613ab51d60547388e531d101cbead8500 SHA512 9a3a367c466c82d5e92cb0a6ec52d19660db06e88a1bcf73bd12ef43dc4fd5fa4a6381f5c03e2d3a28f1c558789fc85de8b5a0d622d11079dcbc22b707370422 +DIST refind-src-0.13.3.1.tar.gz 4550242 BLAKE2B ab8dd27f82954ea6f9831f827550f27b5ca426b7783e918311ba7e178fc3509698a0107f61d0394a7893318528cb3e0c8491f4522de0a4aca6a40e0749f5a6f9 SHA512 7966df5dd8dc66cc49a329ed722a567672da8e2fa3f2334d53db65357cea17cba5a4dc5459e358de1079a938da3c63dc626d096ce28b6bf1fa2964be7359dbd1 EBUILD refind-0.13.2.ebuild 3732 BLAKE2B d1b19ff08c3d8a414fd605daeaca564e92f0ba3efd9180dc7e960eecabcfaf4f0fb2144d6603be97e486601b1c330129e92523ce1a41b5ca183d19c505d82495 SHA512 281213176e580222e11e33559dfb5002d9ce2de45674cd193f489f3ecdc9632abb52a05e06c07b4a1a06c8d15ff720b08e1fa382f1a58305b773a655fa53ef84 -MISC metadata.xml 3852 BLAKE2B 5c6a075b5130fe3f3991350f694d9bf0b72c0e5eaad0a52daa15a0cd463b9105df04a4f59f539303daabbc58fa48a3c1190974b3df5fc71b27e0c493f5374274 SHA512 ada8758c6ec63943c1fb6b42430a87e8f78811fbfc4f39e5d6d8db8e2e2559782531dd17eb57fef588bc530b41735d1d8b44b8ebf6d7c992661329fa4357d637 +EBUILD refind-0.13.3.1.ebuild 3665 BLAKE2B 0cdf94490bc840b28bd241f841508189525bd2c120901a3275b9ee057253891d7eaa5f1710c7b4870fcd63f068e47a35012d76306ba495b7b7e96827011eff06 SHA512 63e8a6a180fa5ed56f081206b3958c6310bcad095b2dd244a1e515909aa01ce03c26d84b73de25f6eaaabbfe1e2be4c0523fe1af254abbf9e35dbed36367870d +MISC metadata.xml 3700 BLAKE2B a09550c178969a92b11ef722b092c418f75b3d48d53b1a4395a0c350703ff0ee0d85f2c32e4895bee9a15fefc4b43dc0e1e107a3693a1e88a3866536581a75ee SHA512 4caab08d933f006512ff2f3d98094d26c7f3b00b1141f3e1f2882de2997c0138d4a2e250e933d253fbd68b4713bdfca289216fd270401566ea3717d3fc150409 diff --git a/sys-boot/refind/files/makefile.patch b/sys-boot/refind/files/makefile.patch deleted file mode 100644 index 5db6f75b1919..000000000000 --- a/sys-boot/refind/files/makefile.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/Makefile b/Makefile ---- a/Makefile -+++ b/Makefile -@@ -161,8 +161,9 @@ fs_edk2: build_edk2 - done - - build_edk2: $(EDK2BASE)/RefindPkg -- cd $(EDK2BASE) && \ -- . ./edksetup.sh BaseTools && \ -+ +cd $(EDK2BASE) && \ -+ . udk-workspace && \ -+ build -a $(UC_ARCH) -p MdePkg/MdePkg.dsc && \ - build -a $(UC_ARCH) -p RefindPkg/RefindPkg.dsc - mkdir -p ./drivers_$(FILENAME_CODE) - -diff --git a/filesystems/Makefile b/filesystems/Makefile -index 99452ed..9bc984d 100644 ---- a/filesystems/Makefile -+++ b/filesystems/Makefile -@@ -5,6 +5,7 @@ - # name of the driver to be built. This is done because of a dependency - # in the fsw_efi.c file on the filesystem type; this file must be - # recompiled for each new filesystem built. -+.NOTPARALLEL: - - # This program is licensed under the terms of the GNU GPL, version 3, - # or (at your option) any later version. diff --git a/sys-boot/refind/files/refind-0.12.0-gcc10.patch b/sys-boot/refind/files/refind-0.12.0-gcc10.patch deleted file mode 100644 index 1f2e2bc0a5de..000000000000 --- a/sys-boot/refind/files/refind-0.12.0-gcc10.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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/metadata.xml b/sys-boot/refind/metadata.xml index 39c685e1f5b5..c4b2438447a5 100644 --- a/sys-boot/refind/metadata.xml +++ b/sys-boot/refind/metadata.xml @@ -40,24 +40,22 @@ d'amorçage au moment de l'exécution le rend très facile à utiliser, en particulier associé à des noyau Linux qui fournissent un support EFI stub. </longdescription> <use lang="en"> + <flag name="btrfs">Builds the EFI binary btrfs filesystem driver</flag> <flag name="ext2">Builds the EFI binary ext2 filesystem driver</flag> <flag name="ext4">Builds the EFI binary ext4 filesystem driver</flag> - <flag name="reiserfs">Builds the EFI binary reiserfs filesystem driver</flag> - <flag name="iso9660">Builds the EFI binary iso9660 filesystem driver</flag> <flag name="hfs">Builds the EFI binary hfs filesystem driver</flag> - <flag name="btrfs">Builds the EFI binary btrfs filesystem driver</flag> + <flag name="iso9660">Builds the EFI binary iso9660 filesystem driver</flag> <flag name="ntfs">Builds the EFI binary ntfs filesystem driver</flag> - <flag name="gnuefi">Compile using GNU-EFI instead of Tianocore</flag> + <flag name="reiserfs">Builds the EFI binary reiserfs filesystem driver</flag> </use> <use lang="fr"> + <flag name="btrfs">Construire le gestionnaire EFI pour le système de fichier btrfs</flag> <flag name="ext2">Construire le gestionnaire EFI pour le système de fichier ext2</flag> <flag name="ext4">Construire le gestionnaire EFI pour le système de fichier ext4</flag> - <flag name="reiserfs">Construire le gestionnaire EFI pour le système de fichier reiserfs</flag> - <flag name="iso9660">Construire le gestionnaire EFI pour le système de fichier iso9660</flag> <flag name="hfs">Construire le gestionnaire EFI pour le système de fichier hfs</flag> - <flag name="btrfs">Construire le gestionnaire EFI pour le système de fichier btrfs</flag> + <flag name="iso9660">Construire le gestionnaire EFI pour le système de fichier iso9660</flag> <flag name="ntfs">Construire le gestionnaire EFI pour le système de fichier ntfs</flag> - <flag name="gnuefi">Compiler en utilisant GNU-EFI au lieu de Tianocore</flag> + <flag name="reiserfs">Construire le gestionnaire EFI pour le système de fichier reiserfs</flag> </use> <upstream> <remote-id type="sourceforge">refind</remote-id> diff --git a/sys-boot/refind/refind-0.11.4.ebuild b/sys-boot/refind/refind-0.11.4.ebuild deleted file mode 100644 index 37ad051eba4d..000000000000 --- a/sys-boot/refind/refind-0.11.4.ebuild +++ /dev/null @@ -1,168 +0,0 @@ -# Copyright 1999-2021 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 "" - if [[ -z "${REPLACING_VERSIONS}" ]]; then - 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-block/parted for automatic ESP location and mount" - elog "" - elog "refind-mkdefault requires >=dev-lang/python-3" - elog "" - 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.10.3"; then - elog "The new refind-mkdefault script requires >=dev-lang/python-3" - elog "to be installed" - elog "" - 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/refind/refind-0.12.0-r1.ebuild b/sys-boot/refind/refind-0.13.3.1.ebuild index 39004c2d0093..73f27787890e 100644 --- a/sys-boot/refind/refind-0.12.0-r1.ebuild +++ b/sys-boot/refind/refind-0.13.3.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit multiprocessing toolchain-funcs +inherit toolchain-funcs DESCRIPTION="The UEFI Boot Manager by Rod Smith" HOMEPAGE="https://www.rodsbooks.com/refind/" @@ -11,17 +11,12 @@ 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" -PATCHES=( - "${FILESDIR}/makefile.patch" - "${FILESDIR}/${P}-gcc10.patch" # Bug 723244 -) - DOCS=( README.txt ) pkg_pretend() { @@ -50,7 +45,8 @@ src_prepare() { default # bug 598647 - PIE not supported - sed -e '/^CFLAGS/s:$: -fno-PIE:' -i Make.common || die + sed -e '/^CFLAGS/s/$/ -fno-PIE/' -i Make.common || die + sed -e '1 i\.NOTPARALLEL:' -i filesystems/Makefile || die } src_compile() { @@ -76,8 +72,6 @@ src_compile() { 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[*]}" ) @@ -89,9 +83,9 @@ src_compile() { } src_install() { - exeinto "/usr/lib/${PN}" + exeinto "/usr/$(get_libdir)/${PN}" doexe refind-install - dosym "../lib/${PN}/refind-install" "/usr/sbin/refind-install" + dosym "../$(get_libdir)/${PN}/refind-install" "/usr/sbin/refind-install" if use doc; then doman "docs/man/"* @@ -99,7 +93,7 @@ src_install() { fi einstalldocs - insinto "/usr/lib/${PN}/refind" + insinto "/usr/$(get_libdir)/${PN}/refind" doins "refind/refind_${EFIARCH}.efi" doins "refind.conf-sample" doins -r images icons fonts banners @@ -108,7 +102,7 @@ src_install() { doins -r "drivers_${EFIARCH}" fi - insinto "/usr/lib/${PN}/refind/tools_${EFIARCH}" + insinto "/usr/$(get_libdir)/${PN}/refind/tools_${EFIARCH}" doins "gptsync/gptsync_${EFIARCH}.efi" insinto "/etc/refind.d" @@ -120,7 +114,7 @@ src_install() { } pkg_postinst() { - elog "rEFInd has been built and installed into ${EROOT}/usr/lib/${PN}" + elog "rEFInd has been built and installed into ${EROOT}/usr/$(get_libdir)/${PN}" elog "You will need to use the command 'refind-install' to install" elog "the binaries into your EFI System Partition" elog "" @@ -133,7 +127,7 @@ pkg_postinst() { elog "" if [[ -z "${REPLACING_VERSIONS}" ]]; then elog "A sample configuration can be found at" - elog "${EROOT}/usr/lib/${PN}/refind/refind.conf-sample" + elog "${EROOT}/usr/$(get_libdir)/${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" diff --git a/sys-boot/sgibootcd/Manifest b/sys-boot/sgibootcd/Manifest index fbeb4729967e..9b96f82feee9 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 -MISC metadata.xml 403 BLAKE2B 713d0b41b054221ec51b36e391c9e3fba26299651aa9298cd8310de69f73a4fe0db79db0faddb0ea96e49a8666f800de31b9987feab6e6724d5fa4e82536685e SHA512 df62ce8d90dfd0fdf79868305620ad394111d4e55c807022ac078785e0c2e7592269165e9a585117c72a6b3a1ba14384b367b2ab7568e6106dd5489ee41d745d +MISC metadata.xml 416 BLAKE2B 54808e357e9fffb30af651fab87f0b5b18bb4cf261a4c2126ff9b4ce2e0619afddc2cdd5b3f69e37ca3f51081ccbfbc3fd152df415d9503b13e8f7677c38eb29 SHA512 7731c1a4c25aadcdbfdd1cd72174b72cd174358d24b19ebfa42e88a18e9d21452f9eb05a8c6309ddace5edb342d99d85692c4d38fbb46b125f575041c73f209e diff --git a/sys-boot/sgibootcd/metadata.xml b/sys-boot/sgibootcd/metadata.xml index 3cc699b0f184..b5a25db899d2 100644 --- a/sys-boot/sgibootcd/metadata.xml +++ b/sys-boot/sgibootcd/metadata.xml @@ -3,7 +3,7 @@ <pkgmetadata> <maintainer type="project"> <email>mips@gentoo.org</email> - <name>Mips Team</name> + <name>Linux MIPS Development</name> </maintainer> <longdescription> diff --git a/sys-boot/syslinux/Manifest b/sys-boot/syslinux/Manifest index 2d385d8319e0..799f0015dbb7 100644 --- a/sys-boot/syslinux/Manifest +++ b/sys-boot/syslinux/Manifest @@ -1,6 +1,14 @@ +AUX 6.04_pre1/0001-Strip-the-.note.gnu.property-section-for-the-mbr.patch 1406 BLAKE2B 6fac1d0e6c13aa9a9cbf782472c0b581c2837989185c2e8766d6699602203d94241b3593d673ecd0d5b2238421d7aea670272117fd1a744d8939e3ff07c5a83a SHA512 7ffbe3d9fb8a426d8aaed603c9907d0fee561f0a6983c099ae3e2aff64c5028814f7776d38336c40f68125ad2e492e459057787cda13ab11c5748adc06697113 +AUX 6.04_pre1/0002-Force-the-linker-to-put-all-sections-into-a-single-P.patch 4873 BLAKE2B 851fb44f562d48cc30881d444c424ae6265d884e1ab63bcc41bc55e2fa687c47a208fe4431b57c4042fe8b56f5feb97b7e89d93b1138cf7ad66fb535df7e2115 SHA512 569ee1ccd0639bc79920f38a7d0865a62eee1e55511ec8a1a8e4e5d224de01ce422915cab75134ce836b6880722f9c152ed91ad9fab803a278e7449d5c6c907b +AUX 6.04_pre1/0003-GCC-10-compatibility-patch.patch 3356 BLAKE2B 1ceb5ce12ae9e1ffd81c6c493f3bf3b357622f91b1080b6cfa2fda9ae5f12e46af242a53cbabc14cee2a5d53ee862ab587fd674fb4342bfdd4e6b3035dc536cd SHA512 4cf21b40dcdfc2f3abba5885fd47ca41def10feedee525a805da2a4a84015ef1f72005b1c75baec4cdae3871519c30d2ed6c215f23c8ddef0a3bf04d0f704ce5 +AUX 6.04_pre1/0004-Inherit-toolchain-vars-from-environment.patch 1446 BLAKE2B fbc9c08173f82a6d07cbe11673a61f97efc5e0a284ce029f1092776fd79dcbf0023f8157d94313fef81703350498cb85e2a97da4338be3b7ddaf33fe6a20fc4f SHA512 0e2d9a7ade52135c4d53c18aa2b674314784cb6ea74e3a55013686b8c4b70304f2400a1f9b8f6c7ddc17556a0982ace67e4e6f4f0cc76c97fe09e0f19e9a3c0b +AUX 6.04_pre3/0005-Include-efisetjmp.h-from-efi.h.patch 500 BLAKE2B ed3e0a623c18ecc6880d074397fd6509223e8da1954d09b12f1a6642ca096bcc8a4b9688fbcf239d024a5fe6228aca23dc2069124f3b47c629f67ae8f23e720f SHA512 6dde7d306684174dc68bf952c50f2991d0cbcef545fbc91e220bec620a3e4e2895ac64412b777538d302e2215f1f11e45b29d87918025e98c7e14cf13205eed4 AUX syslinux-6.03-sysmacros.patch 950 BLAKE2B 60fb26a4bb462409074802b8cf01afe29e8a7f98cb6907f4f2c0902f4cc7342b6053368ddf17331eac888714e795299c155a4078668a3ed0e35d435a8cb241d3 SHA512 8659e82e5a5402633c807c8a8f99b25fd6e3066fd0838a7e984452e2ebeccc0331481c93101f00a698e573cadcd98966ea216e4f2d9873e6893af817998e2549 AUX syslinux-6.04_pre1-fcommon.patch 2111 BLAKE2B 6b0d047cc729e7e9c9658ccd6ecd1166eb1ff2be569132f94b0d2bdc71eb9412a05bf23aa287626949a6ea376b2a8d02877d72182d4ea50d54e445df9c38ac81 SHA512 50c58bc44c77a5a68910cd40370f4259afd1392fe8e1b5c6ac25f7e610d994ebc8d17434eb8d3f832a14f098e16b5b597c723f98ce8c12a89118f5b8d2c65529 AUX syslinux-6.04_pre1-singleloadsegment.patch 4744 BLAKE2B a28ff29b9a4bdd2cb65a6700c96ff99ba1a045a401d50587efe59d703f12aca3e47a14a8e7a569c50f11d367545990d09c35f90362efe49d0c9d489802885879 SHA512 9585edfc8ab0e22d4d7757ccdc435c198c5457466fb4fdefc1829cbbe8951f3406b7b51eea56044cc297d29e45772e2154e5746e6d9b92310f17c880c950ff8a DIST syslinux-6.04-pre1.tar.xz 5283272 BLAKE2B 800e5977ed13b26a1756c33d8625e850631b642e26a86e3328196ddd998596693c3a26db0ada4c0ba78a4ba692a1cc01886b6eb693d877ddafcfb325ecdeb639 SHA512 7927dd39be8e2dcf4138a6fea33def67d19d938379d694f15b48fdd2f5924c028b7a9e7bd71d0c7c6630c203e9e2a54296628e530632ad5e6f55b1ebefe8fc98 +DIST syslinux-6.04-pre3.tar.gz 10760898 BLAKE2B 708bb7f3ecbe1888471f3be0102270c056bf8c5be22013f36b56c90f13f5358ce1853722b14b962d8156cd1f045b9687166b98a1d7ad2853acbe6303fa40fae9 SHA512 0619a25347f3964e0c7c6ff629b2f59f01bd9e0afd822f46b67f26b8c84cbc55534cf7b22ff1bf83eec4986fd2d8f1646a3d750190a7c6c50251affc0b62594d EBUILD syslinux-6.04_pre1-r2.ebuild 3251 BLAKE2B 6a9d50d935e133a6937b55c05b5f06f53c01ea20427583b4cdf5d7d1976778d653fe77d083ac3df86d9c38ff10e01db9f735e878ebf26f99937174fe29b30b77 SHA512 621bafdbdca728e8c7abf3331e13eba7a0d672215adf7fab51225394c9ee4e433323751911a58984785a9a58d01dc393752632f3d3d28c46699201d364db20d2 -MISC metadata.xml 412 BLAKE2B 39ab77b79183df91d2bf410ef52f577fc39cc1f21e2f4a843bb8eec34629f3bb87770f8bd0c9461b7065560f2cb1acda57057063c1ab842980d581c52fa89ffd SHA512 55342602eddeca12ee6549fb7d753c19e005034f56f3dee93f09b4f74f3d6e7a99e01e3c56ae0e4d579872fad76e4b64a6b9d99ca064e53614e8491e1d318c64 +EBUILD syslinux-6.04_pre1-r3.ebuild 1746 BLAKE2B 4d38a809948cab9409fb967dd7bf1a9dfc90c0c79949f302c1a7a3647438524b8655a9ed734e9c012880c85302cd43d4e240d48bf5fbfcf35cb0e6cd2564480a SHA512 66903bac7048317a4545bed655e3de728665f6ddba37a3816274ba7d141f3871e78c953b9284146ce8befd01ba55b450934f06edb3825e2043106c739431a6ad +EBUILD syslinux-6.04_pre3.ebuild 2046 BLAKE2B ad2c55bac63b277be423c498c26b797ad3d3600b08e5226fd4d03796e90e421dde7048bc37c1e695998cd456f6bf514b60634ab3d157949d958362d309d527bd SHA512 3063a203d92afbcdf412e8456c2417650a3beb0f3ed0d0d30b0f135fb0fdd91647c7c4af78cec18a9e7159b0086e0b6f4b5eead9541180cdbc4d10fb6b45ea13 +MISC metadata.xml 529 BLAKE2B 8d1614f7254b20836e2bc0f650ae2e3795fd665119bc2d1427e236a417c5c82699929c0291f4b12c04ba2ac387f9d6650682d0d95802fdf333b1267367b4e75c SHA512 e80e9ba96972111b3c5cdea98fb032c50bb7f94a445785ed54d236933768ae2734d248c71ecf54f36d6b3641a7e15abdb4ef4c0b968d59d20ee9259019d32e38 diff --git a/sys-boot/syslinux/files/6.04_pre1/0001-Strip-the-.note.gnu.property-section-for-the-mbr.patch b/sys-boot/syslinux/files/6.04_pre1/0001-Strip-the-.note.gnu.property-section-for-the-mbr.patch new file mode 100644 index 000000000000..5d823436bec8 --- /dev/null +++ b/sys-boot/syslinux/files/6.04_pre1/0001-Strip-the-.note.gnu.property-section-for-the-mbr.patch @@ -0,0 +1,47 @@ +From 60fef313164d1048cf11423656732953776e5e2f Mon Sep 17 00:00:00 2001 +From: Lukas Schwaighofer <lukas@schwaighofer.name> +Date: Sat, 18 Aug 2018 12:48:21 +0200 +Subject: [PATCH 1/5] Strip the .note.gnu.property section for the mbr + +This section is added since binutils Debian version 2.31.1-2 and causes mbr.bin +to grow in size beyond what can fit into the master boot record. + +Forwarded: https://www.syslinux.org/archives/2018-August/026168.html +--- + mbr/i386/mbr.ld | 6 +++++- + mbr/x86_64/mbr.ld | 6 +++++- + 2 files changed, 10 insertions(+), 2 deletions(-) + +diff --git a/mbr/i386/mbr.ld b/mbr/i386/mbr.ld +index d14ba802..6d489904 100644 +--- a/mbr/i386/mbr.ld ++++ b/mbr/i386/mbr.ld +@@ -69,5 +69,9 @@ SECTIONS + .debug_funcnames 0 : { *(.debug_funcnames) } + .debug_typenames 0 : { *(.debug_typenames) } + .debug_varnames 0 : { *(.debug_varnames) } +- /DISCARD/ : { *(.note.GNU-stack) } ++ /DISCARD/ : ++ { ++ *(.note.GNU-stack) ++ *(.note.gnu.property) ++ } + } +diff --git a/mbr/x86_64/mbr.ld b/mbr/x86_64/mbr.ld +index ae27d49a..5b46db66 100644 +--- a/mbr/x86_64/mbr.ld ++++ b/mbr/x86_64/mbr.ld +@@ -68,5 +68,9 @@ SECTIONS + .debug_funcnames 0 : { *(.debug_funcnames) } + .debug_typenames 0 : { *(.debug_typenames) } + .debug_varnames 0 : { *(.debug_varnames) } +- /DISCARD/ : { *(.note.GNU-stack) } ++ /DISCARD/ : ++ { ++ *(.note.GNU-stack) ++ *(.note.gnu.property) ++ } + } +-- +2.35.1 + diff --git a/sys-boot/syslinux/files/6.04_pre1/0002-Force-the-linker-to-put-all-sections-into-a-single-P.patch b/sys-boot/syslinux/files/6.04_pre1/0002-Force-the-linker-to-put-all-sections-into-a-single-P.patch new file mode 100644 index 000000000000..33b6a36c63ea --- /dev/null +++ b/sys-boot/syslinux/files/6.04_pre1/0002-Force-the-linker-to-put-all-sections-into-a-single-P.patch @@ -0,0 +1,311 @@ +From 0c646f067a6b766a5ce0434e5e4e7b839b511331 Mon Sep 17 00:00:00 2001 +From: Lukas Schwaighofer <lukas@schwaighofer.name> +Date: Sat, 18 Aug 2018 16:56:35 +0200 +Subject: [PATCH 2/5] Force the linker to put all sections into a single + PT_LOAD segment + +This is required when using binutils >= 2.31 which writes two PT_LOAD segments +by default. This is not supported by the wrapper.c script used to convert the +shared object into an elf binary. + +Forwarded: https://www.syslinux.org/archives/2018-August/026167.html +--- + efi/i386/syslinux.ld | 37 +++++++++++++++++++++---------------- + efi/x86_64/syslinux.ld | 37 +++++++++++++++++++++---------------- + 2 files changed, 42 insertions(+), 32 deletions(-) + +diff --git a/efi/i386/syslinux.ld b/efi/i386/syslinux.ld +index bab3fc74..19c16479 100644 +--- a/efi/i386/syslinux.ld ++++ b/efi/i386/syslinux.ld +@@ -19,6 +19,11 @@ OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386") + OUTPUT_ARCH(i386) + ENTRY(_start) + ++PHDRS ++{ ++ all PT_LOAD ; ++} ++ + SECTIONS + { + . = 0; +@@ -31,7 +36,7 @@ SECTIONS + *(.text) + *(.text.*) + __text_end = .; +- } ++ } :all + + . = ALIGN(16); + +@@ -40,7 +45,7 @@ SECTIONS + *(.rodata) + *(.rodata.*) + __rodata_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -49,14 +54,14 @@ SECTIONS + KEEP (*(SORT(.ctors.*))) + KEEP (*(.ctors)) + __ctors_end = .; +- } ++ } :all + + .dtors : { + __dtors_start = .; + KEEP (*(SORT(.dtors.*))) + KEEP (*(.dtors)) + __dtors_end = .; +- } ++ } :all + + . = ALIGN(4096); + .rel : { +@@ -64,7 +69,7 @@ SECTIONS + *(.rel.data) + *(.rel.data.*) + *(.rel.ctors) +- } ++ } :all + + . = ALIGN(4); + +@@ -72,14 +77,14 @@ SECTIONS + __gnu_hash_start = .; + *(.gnu.hash) + __gnu_hash_end = .; +- } ++ } :all + + + .dynsym : { + __dynsym_start = .; + *(.dynsym) + __dynsym_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -87,7 +92,7 @@ SECTIONS + __dynstr_start = .; + *(.dynstr) + __dynstr_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -104,7 +109,7 @@ SECTIONS + KEEP (*(.got.plt)) + KEEP (*(.got)) + __got_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -112,7 +117,7 @@ SECTIONS + __dynamic_start = .; + *(.dynamic) + __dynamic_end = .; +- } ++ } :all + + . = ALIGN(16); + +@@ -122,19 +127,19 @@ SECTIONS + *(.data.*) + *(.lowmem) + __data_end = .; +- } ++ } :all + + .reloc : { + *(.reloc) +- } ++ } :all + + .symtab : { + *(.symtab) +- } ++ } :all + + .strtab : { + *(.strtab) +- } ++ } :all + + .bss (NOLOAD) : { + /* the EFI loader doesn't seem to like a .bss section, +@@ -148,7 +153,7 @@ SECTIONS + __bss_end = .; + *(.sbss) + *(.scommon) +- } ++ } :all + __bss_len = ABSOLUTE(__bss_end) - ABSOLUTE(__bss_start); + __bss_dwords = (__bss_len + 3) >> 2; + +@@ -161,7 +166,7 @@ SECTIONS + *(.hugebss) + *(.hugebss.*) + __hugebss_end = .; +- } ++ } :all + + _end = .; + +diff --git a/efi/x86_64/syslinux.ld b/efi/x86_64/syslinux.ld +index 450641c6..a2c124fd 100644 +--- a/efi/x86_64/syslinux.ld ++++ b/efi/x86_64/syslinux.ld +@@ -19,6 +19,11 @@ OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64") + OUTPUT_ARCH(i386:x86-64) + ENTRY(_start) + ++PHDRS ++{ ++ all PT_LOAD ; ++} ++ + SECTIONS + { + . = 0; +@@ -31,7 +36,7 @@ SECTIONS + *(.text) + *(.text.*) + __text_end = .; +- } ++ } :all + + . = ALIGN(16); + +@@ -40,7 +45,7 @@ SECTIONS + *(.rodata) + *(.rodata.*) + __rodata_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -49,14 +54,14 @@ SECTIONS + KEEP (*(SORT(.ctors.*))) + KEEP (*(.ctors)) + __ctors_end = .; +- } ++ } :all + + .dtors : { + __dtors_start = .; + KEEP (*(SORT(.dtors.*))) + KEEP (*(.dtors)) + __dtors_end = .; +- } ++ } :all + + . = ALIGN(4096); + .rel : { +@@ -64,7 +69,7 @@ SECTIONS + *(.rel.data) + *(.rel.data.*) + *(.rel.ctors) +- } ++ } :all + + . = ALIGN(4); + +@@ -72,14 +77,14 @@ SECTIONS + __gnu_hash_start = .; + *(.gnu.hash) + __gnu_hash_end = .; +- } ++ } :all + + + .dynsym : { + __dynsym_start = .; + *(.dynsym) + __dynsym_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -87,7 +92,7 @@ SECTIONS + __dynstr_start = .; + *(.dynstr) + __dynstr_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -104,7 +109,7 @@ SECTIONS + KEEP (*(.got.plt)) + KEEP (*(.got)) + __got_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -112,7 +117,7 @@ SECTIONS + __dynamic_start = .; + *(.dynamic) + __dynamic_end = .; +- } ++ } :all + + . = ALIGN(16); + +@@ -122,19 +127,19 @@ SECTIONS + *(.data.*) + *(.lowmem) + __data_end = .; +- } ++ } :all + + .reloc : { + *(.reloc) +- } ++ } :all + + .symtab : { + *(.symtab) +- } ++ } :all + + .strtab : { + *(.strtab) +- } ++ } :all + + .bss (NOLOAD) : { + /* the EFI loader doesn't seem to like a .bss section, +@@ -148,7 +153,7 @@ SECTIONS + __bss_end = .; + *(.sbss) + *(.scommon) +- } ++ } :all + __bss_len = ABSOLUTE(__bss_end) - ABSOLUTE(__bss_start); + __bss_dwords = (__bss_len + 3) >> 2; + +@@ -161,7 +166,7 @@ SECTIONS + *(.hugebss) + *(.hugebss.*) + __hugebss_end = .; +- } ++ } :all + + _end = .; + +-- +2.35.1 + diff --git a/sys-boot/syslinux/files/6.04_pre1/0003-GCC-10-compatibility-patch.patch b/sys-boot/syslinux/files/6.04_pre1/0003-GCC-10-compatibility-patch.patch new file mode 100644 index 000000000000..6d60eab14bbb --- /dev/null +++ b/sys-boot/syslinux/files/6.04_pre1/0003-GCC-10-compatibility-patch.patch @@ -0,0 +1,99 @@ +From b92e6e8f624c96acf2ce80192a893ee25de527a1 Mon Sep 17 00:00:00 2001 +From: Lukas Schwaighofer <lukas@schwaighofer.name> +Date: Sun, 16 Aug 2020 15:23:21 +0200 +Subject: [PATCH 3/5] GCC-10 compatibility patch + +* Add `-fcommon` to most gcc invocations to allow duplicate definitions +* __builtin_strlen is not really a "builtin" an implementation still + needs to be provided (source: + https://bugzilla.suse.com/show_bug.cgi?id=1166605#c5). Work around the + issue by supplying an inline function. The strlen function added to + dos/string.h was copied from com32/lib/strlen.c. +--- + dos/string.h | 11 ++++++++++- + mk/efi.mk | 1 + + mk/elf.mk | 1 + + mk/embedded.mk | 2 +- + mk/lib.mk | 2 +- + 5 files changed, 14 insertions(+), 3 deletions(-) + +diff --git a/dos/string.h b/dos/string.h +index f648de2d..c4649f5f 100644 +--- a/dos/string.h ++++ b/dos/string.h +@@ -5,12 +5,21 @@ + #ifndef _STRING_H + #define _STRING_H + ++#include <stddef.h> ++ + /* Standard routines */ + #define memcpy(a,b,c) __builtin_memcpy(a,b,c) + #define memmove(a,b,c) __builtin_memmove(a,b,c) + #define memset(a,b,c) __builtin_memset(a,b,c) + #define strcpy(a,b) __builtin_strcpy(a,b) +-#define strlen(a) __builtin_strlen(a) ++ ++static inline size_t strlen(const char *s) ++{ ++ const char *ss = s; ++ while (*ss) ++ ss++; ++ return ss - s; ++} + + /* This only returns true or false */ + static inline int memcmp(const void *__m1, const void *__m2, unsigned int __n) +diff --git a/mk/efi.mk b/mk/efi.mk +index f097ad22..407bc077 100644 +--- a/mk/efi.mk ++++ b/mk/efi.mk +@@ -25,6 +25,7 @@ FORMAT=efi-app-$(EFI_SUBARCH) + + CFLAGS = -I$(EFIINC) -I$(EFIINC)/$(EFI_SUBARCH) \ + -DEFI_FUNCTION_WRAPPER -fPIC -fshort-wchar -ffreestanding \ ++ -fcommon \ + -Wall -I$(com32)/include -I$(com32)/include/sys \ + -I$(core)/include -I$(core)/ $(ARCHOPT) \ + -I$(com32)/lib/ -I$(com32)/libutil/include -std=gnu99 \ +diff --git a/mk/elf.mk b/mk/elf.mk +index b46dbd06..dc265ce9 100644 +--- a/mk/elf.mk ++++ b/mk/elf.mk +@@ -55,6 +55,7 @@ GPLINCLUDE = + endif + + CFLAGS = $(GCCOPT) $(GCCWARN) -W -Wall \ ++ -fcommon \ + -fomit-frame-pointer -D__COM32__ -D__FIRMWARE_$(FIRMWARE)__ -DDYNAMIC_MODULE \ + -nostdinc -iwithprefix include \ + -I$(com32)/libutil/include -I$(com32)/include \ +diff --git a/mk/embedded.mk b/mk/embedded.mk +index 488dc0fc..fae13e20 100644 +--- a/mk/embedded.mk ++++ b/mk/embedded.mk +@@ -57,7 +57,7 @@ LIBGCC := $(shell $(CC) $(GCCOPT) --print-libgcc) + LD += -m elf_$(ARCH) + + # Note: use += for CFLAGS and SFLAGS in case something is set in MCONFIG.local +-CFLAGS += $(GCCOPT) -g $(GCCWARN) -Wno-sign-compare $(OPTFLAGS) $(INCLUDES) ++CFLAGS += $(GCCOPT) -g $(GCCWARN) -Wno-sign-compare -fcommon $(OPTFLAGS) $(INCLUDES) + SFLAGS += $(CFLAGS) -D__ASSEMBLY__ + + .SUFFIXES: .c .o .S .s .i .elf .com .bin .asm .lst .c32 .lss +diff --git a/mk/lib.mk b/mk/lib.mk +index f8591e56..6dd54295 100644 +--- a/mk/lib.mk ++++ b/mk/lib.mk +@@ -49,7 +49,7 @@ OPTFLAGS = -Os -march=$(MARCH) -falign-functions=0 -falign-jumps=0 \ + -falign-labels=0 -ffast-math -fomit-frame-pointer + WARNFLAGS = $(GCCWARN) -Wpointer-arith -Wwrite-strings -Wstrict-prototypes -Winline + +-CFLAGS = $(OPTFLAGS) $(REQFLAGS) $(WARNFLAGS) $(LIBFLAGS) ++CFLAGS = $(OPTFLAGS) $(REQFLAGS) -fcommon $(WARNFLAGS) $(LIBFLAGS) + + ifeq ($(FWCLASS),EFI) + CFLAGS += -mno-red-zone +-- +2.35.1 + diff --git a/sys-boot/syslinux/files/6.04_pre1/0004-Inherit-toolchain-vars-from-environment.patch b/sys-boot/syslinux/files/6.04_pre1/0004-Inherit-toolchain-vars-from-environment.patch new file mode 100644 index 000000000000..40784f9b2698 --- /dev/null +++ b/sys-boot/syslinux/files/6.04_pre1/0004-Inherit-toolchain-vars-from-environment.patch @@ -0,0 +1,72 @@ +From 46d58e2b03e15a863aed8661b9ee922da4930a3e Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <floppym@gentoo.org> +Date: Mon, 30 May 2022 11:57:07 -0400 +Subject: [PATCH 4/5] Inherit toolchain vars from environment + +--- + mk/syslinux.mk | 36 ++++++++++++++++++------------------ + 1 file changed, 18 insertions(+), 18 deletions(-) + +diff --git a/mk/syslinux.mk b/mk/syslinux.mk +index 593ff75f..91d984e8 100644 +--- a/mk/syslinux.mk ++++ b/mk/syslinux.mk +@@ -37,7 +37,7 @@ ifdef DEBUG + DEBUGOPT = -DDEBUG=$(DEBUG) + endif + +-NASM = nasm ++NASM ?= nasm + NASMOPT = -Ox $(DEBUGOPT) + + PERL = perl +@@ -46,29 +46,29 @@ UPX = upx + + CHMOD = chmod + +-CC = gcc ++CC ?= gcc + gcc_ok = $(shell tmpf=gcc_ok.$$$$.tmp; \ + if $(CC) $(GCCOPT) $(1) -c $(topdir)/dummy.c \ + -o $$tmpf 2>/dev/null ; \ + then echo '$(1)'; else echo '$(2)'; fi; \ + rm -f $$tmpf) + +-LD = ld +-OBJDUMP = objdump +-OBJCOPY = objcopy +-STRIP = strip +-AR = ar +-NM = nm +-RANLIB = ranlib +-STRIP = strip +-GZIPPROG = gzip +-XZ = xz +-PNGTOPNM = pngtopnm +-MCOPY = mcopy +-MFORMAT = mformat +-MKISOFS = mkisofs +-SED = sed +-WGET = wget ++LD ?= ld ++OBJDUMP ?= objdump ++OBJCOPY ?= objcopy ++STRIP ?= strip ++AR ?= ar ++NM ?= nm ++RANLIB ?= ranlib ++STRIP ?= strip ++GZIPPROG ?= gzip ++XZ ?= xz ++PNGTOPNM ?= pngtopnm ++MCOPY ?= mcopy ++MFORMAT ?= mformat ++MKISOFS ?= mkisofs ++SED ?= sed ++WGET ?= wget + + com32 = $(topdir)/com32 + +-- +2.35.1 + diff --git a/sys-boot/syslinux/files/6.04_pre3/0005-Include-efisetjmp.h-from-efi.h.patch b/sys-boot/syslinux/files/6.04_pre3/0005-Include-efisetjmp.h-from-efi.h.patch new file mode 100644 index 000000000000..0d32d7167024 --- /dev/null +++ b/sys-boot/syslinux/files/6.04_pre3/0005-Include-efisetjmp.h-from-efi.h.patch @@ -0,0 +1,24 @@ +From 9889f441d006d11d0fb0b726b9f81396ce6fcfbd Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <floppym@gentoo.org> +Date: Mon, 30 May 2022 14:22:28 -0400 +Subject: [PATCH 5/5] Include efisetjmp.h from efi.h + +--- + efi/efi.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/efi/efi.h b/efi/efi.h +index c266532f..250c511e 100644 +--- a/efi/efi.h ++++ b/efi/efi.h +@@ -22,6 +22,7 @@ + + #include <efi.h> + #include <efilib.h> ++#include <efisetjmp.h> + #include <efistdarg.h> + + /* Delay for 100 ms */ +-- +2.35.1 + diff --git a/sys-boot/syslinux/metadata.xml b/sys-boot/syslinux/metadata.xml index 423c8b85ac5e..ca6327ed17a2 100644 --- a/sys-boot/syslinux/metadata.xml +++ b/sys-boot/syslinux/metadata.xml @@ -1,14 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> - <email>chithanh@gentoo.org</email> -</maintainer> -<maintainer type="project"> - <email>base-system@gentoo.org</email> - <name>Gentoo Base System</name> -</maintainer> -<upstream> - <remote-id type="cpe">cpe:/a:gentoo:syslinux</remote-id> -</upstream> + <maintainer type="person"> + <email>chithanh@gentoo.org</email> + </maintainer> + <maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> + </maintainer> + <use> + <flag name="bios">Enable BIOS support</flag> + <flag name="efi">Enable EFI support</flag> + </use> + <upstream> + <remote-id type="cpe">cpe:/a:gentoo:syslinux</remote-id> + </upstream> </pkgmetadata> diff --git a/sys-boot/syslinux/syslinux-6.04_pre1-r3.ebuild b/sys-boot/syslinux/syslinux-6.04_pre1-r3.ebuild new file mode 100644 index 000000000000..4fba6cac1462 --- /dev/null +++ b/sys-boot/syslinux/syslinux-6.04_pre1-r3.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders" +HOMEPAGE="https://www.syslinux.org/" +MY_P=${P/_/-} +SRC_URI="https://www.kernel.org/pub/linux/utils/boot/syslinux/Testing/6.04/${MY_P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" +IUSE="abi_x86_32 abi_x86_64 +bios +efi" +REQUIRED_USE="|| ( bios efi ) + efi? ( || ( abi_x86_32 abi_x86_64 ) )" + +BDEPEND=" + dev-lang/perl + bios? ( + app-arch/upx + app-text/asciidoc + dev-lang/nasm + ) +" +RDEPEND=" + sys-apps/util-linux + sys-fs/mtools + dev-perl/Crypt-PasswdMD5 + dev-perl/Digest-SHA1 +" +DEPEND="${RDEPEND} + virtual/os-headers +" + +S=${WORKDIR}/${MY_P} + +QA_EXECSTACK="usr/share/syslinux/*" +QA_WX_LOAD="usr/share/syslinux/*" +QA_PRESTRIPPED="usr/share/syslinux/.*" +QA_FLAGS_IGNORED=".*" + +src_prepare() { + local PATCHES=( + "${FILESDIR}/syslinux-6.03-sysmacros.patch" + "${FILESDIR}/${PV}" + ) + default +} +src_compile() { + local DATE=$(date -u -r NEWS +%Y%m%d) + local HEXDATE=$(printf '0x%08x' "${DATE}") + + tc-export AR CC LD OBJCOPY RANLIB + unset LDFLAGS + + if use bios; then + emake bios DATE="${DATE}" HEXDATE="${HEXDATE}" + fi + if use efi; then + if use abi_x86_32; then + emake efi32 DATE="${DATE}" HEXDATE="${HEXDATE}" + fi + if use abi_x86_64; then + emake efi64 DATE="${DATE}" HEXDATE="${HEXDATE}" + fi + fi +} + +src_install() { + local firmware=( $(usev bios) ) + if use efi; then + use abi_x86_32 && firmware+=( efi32 ) + use abi_x86_64 && firmware+=( efi64 ) + fi + local args=( + INSTALLROOT="${ED}" + MANDIR='$(DATADIR)/man' + "${firmware[@]}" + install + ) + emake -j1 "${args[@]}" + einstalldocs + dostrip -x /usr/share/syslinux +} diff --git a/sys-boot/syslinux/syslinux-6.04_pre3.ebuild b/sys-boot/syslinux/syslinux-6.04_pre3.ebuild new file mode 100644 index 000000000000..9d2dcf602fe1 --- /dev/null +++ b/sys-boot/syslinux/syslinux-6.04_pre3.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders" +HOMEPAGE="https://www.syslinux.org/" +MY_P=${P/_/-} +SRC_URI="https://git.zytor.com/syslinux/syslinux.git/snapshot/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +#KEYWORDS="-* ~amd64 ~x86" +IUSE="abi_x86_32 abi_x86_64 +bios +efi" +REQUIRED_USE="|| ( bios efi ) + efi? ( || ( abi_x86_32 abi_x86_64 ) )" + +RESTRICT="test" + +BDEPEND=" + dev-lang/perl + bios? ( + app-arch/upx + app-text/asciidoc + dev-lang/nasm + ) +" +RDEPEND=" + sys-apps/util-linux + sys-fs/mtools + dev-perl/Crypt-PasswdMD5 + dev-perl/Digest-SHA1 +" +DEPEND="${RDEPEND} + efi? ( sys-boot/gnu-efi[abi_x86_32(-)?,abi_x86_64(-)?] ) + virtual/os-headers +" + +S=${WORKDIR}/${MY_P} + +QA_EXECSTACK="usr/share/syslinux/*" +QA_WX_LOAD="usr/share/syslinux/*" +QA_PRESTRIPPED="usr/share/syslinux/.*" +QA_FLAGS_IGNORED=".*" + +src_prepare() { + local PATCHES=( + "${FILESDIR}/6.04_pre1" + "${FILESDIR}/6.04_pre3" + ) + default +} + +efimake() { + local ABI="${1}" + local libdir="$(get_libdir)" + shift + local args=( + EFIINC="${ESYSROOT}/usr/include/efi" + LIBDIR="${ESYSROOT}/usr/${libdir}" + LIBEFI="${ESYSROOT}/usr/${libdir}/libefi.a" + "${@}" + ) + emake "${args[@]}" +} + +src_compile() { + local DATE=$(date -u -r NEWS +%Y%m%d) + local HEXDATE=$(printf '0x%08x' "${DATE}") + + tc-export AR CC LD OBJCOPY RANLIB + unset LDFLAGS + + if use bios; then + emake bios DATE="${DATE}" HEXDATE="${HEXDATE}" + fi + if use efi; then + if use abi_x86_32; then + efimake x86 efi32 DATE="${DATE}" HEXDATE="${HEXDATE}" + fi + if use abi_x86_64; then + efimake amd64 efi64 DATE="${DATE}" HEXDATE="${HEXDATE}" + fi + fi +} + +src_install() { + local firmware=( $(usev bios) ) + if use efi; then + use abi_x86_32 && firmware+=( efi32 ) + use abi_x86_64 && firmware+=( efi64 ) + fi + local args=( + INSTALLROOT="${ED}" + MANDIR='$(DATADIR)/man' + "${firmware[@]}" + install + ) + emake -j1 "${args[@]}" + einstalldocs + dostrip -x /usr/share/syslinux +} diff --git a/sys-boot/systemd-boot/Manifest b/sys-boot/systemd-boot/Manifest index 718605c8653d..9619ac2136ee 100644 --- a/sys-boot/systemd-boot/Manifest +++ b/sys-boot/systemd-boot/Manifest @@ -1,8 +1,6 @@ AUX 249-libshared-static.patch 881 BLAKE2B 436aa658b7f24cafad5126c5ce867508639e876a35168fa834591646dfbff6c8132348d33298d47627e1497d41be2ed1b73c288a2c0d504d2687dbdbc3f8a38b SHA512 5bb94984cddc26f35bec6edd02c7574ebd851e45efe551454d4372174ba2bca86c92c7be71936ddce4c2792886395467354e976a6a1f6e1505e95ba464a9466f AUX 249.9-cross-compile.patch 1070 BLAKE2B 45586e1d76f6eed0e6f4ae27c5c93f9495bfde2b2bb3b1853bdda22f341787747ea7d7a02a1d582e6ba7e113fd2aed94bfa72616a6a9139ec18c89f85d176646 SHA512 97e919c30fc5ff39f50908f63fee23371047223d12874e68fe74ae545acea7a1dd0d1f0147e2d8a95a49e1943a276148011294b33a8f7fcfa11c91f275e87194 -DIST systemd-stable-249.6.tar.gz 10599611 BLAKE2B 9c0cbaa4319f2ce9a78dbe820d1b6df5191e6c632e2eac9f71f9ff9817564d9b3fc177d2aec0c0daea8ac33bbdc2066ad68a8967cf8857f4af3668b9a3e7d3bf SHA512 7a7791dfe4923c00987b924adcb1cd08c4d17af2b17b4c6c6c701856c6810cfda61f06821c39787339fc05293853c0ea61b9973fcf4495c7bf4f8054ecfae66f DIST systemd-stable-249.9.tar.gz 10613893 BLAKE2B fc7a14fa3b0cc3d05fa9f20fde2efedd3ef0f011d9dce53b0a418994b4257cf753b228cf98f749fb2028d81db55ef30a6e3d9b138d86239cad4fc730d845f9e2 SHA512 ce57bc6c522082e55649fc1886c4dc818c89607e175df2c92feffe288dbd38757f36b30abeebe153f5be6b664a49d729405040a952473cb2133a2e39cf9cc164 -EBUILD systemd-boot-249.6.ebuild 2821 BLAKE2B aea61338aa4403de38db6527c74074519817f77df1dd2f1737767de7cb93e7084af9c8d11f7ae919e29f2aedd7ca00223561ce48b35d43a6544fe9cd009f06ad SHA512 efca3f4fbd43623e5d8033e32e6004576edca8d6b548c11568898d2eae7aabd05134bca8caf9732bb848dfa74cfe247d920a7b24672f4bd7a673af6b25b8dffd EBUILD systemd-boot-249.9.ebuild 2862 BLAKE2B 2ebe2d513f74ab4abc9b29e61ffcdb1a905469425a50c1304200baf2ce50690cba183614c879d2c759db040022680c86728d021cd1e138e6eb1287b5a2fcbd7e SHA512 4f54e310315e560d89ee10e35295139d95f52e84b217f269c3a9d9bddc7a67f44f87dc5670116903a8de10218a0e68bd5695894c554dce03397a0de5da205b32 EBUILD systemd-boot-250-r1.ebuild 302 BLAKE2B 6d967192962d2235ae0a635eeee50babfdbb9d0a42f98d226904a1784d75fa67c6d13f0c401666e3d63c5d1fce035f8a557088cf2da39b21be81d0d5a85f0562 SHA512 44036cd593cceda8a87935747c4bfdc003bea875ec98817075546b311dcc431d69e1215e0f0c00becbe992cbf89509a31fac3cd2ce96abbfa17a63a9f49f3b7a MISC metadata.xml 327 BLAKE2B 5f7910324b62658e242e8c275ae78895683e8704ac19ede4153f4fa8a3b3e3e5149396826ee6975ad1ce904c4ea4041bdac1a883f8c3930495be74c6b77e1810 SHA512 c44c10b2bcda1989526cd935e87135171bb1825505367be255e308505d6774a4baaeb9a642bd7839b7950a3ec74a881d6288829596fc53a3e75e7a4cb2499ac8 diff --git a/sys-boot/systemd-boot/systemd-boot-249.6.ebuild b/sys-boot/systemd-boot/systemd-boot-249.6.ebuild deleted file mode 100644 index 8ae443c2d75f..000000000000 --- a/sys-boot/systemd-boot/systemd-boot-249.6.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# Copyright 2016-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7..10} ) - -inherit meson python-any-r1 toolchain-funcs - -DESCRIPTION="UEFI boot manager from systemd (formerly gummiboot)" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd/systemd-boot/" -if [[ ${PV} == *.* ]]; then - SRC_URI="https://github.com/systemd/systemd-stable/archive/v${PV}.tar.gz -> systemd-stable-${PV}.tar.gz" - S="${WORKDIR}/systemd-stable-${PV}" -else - SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz" - S="${WORKDIR}/systemd-${PV}" -fi - -LICENSE="GPL-2 LGPL-2.1 MIT public-domain" -SLOT="0" -KEYWORDS="~amd64 ~arm64" -IUSE="" -RESTRICT="test" - -BDEPEND=" - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xml-dtd:4.5 - app-text/docbook-xsl-stylesheets - dev-libs/libxslt:0 - sys-devel/gettext - dev-util/gperf - virtual/pkgconfig - ${PYTHON_DEPS} - $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]') -" - -python_check_deps() { - has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" -} - -COMMON_DEPEND=" - >=sys-apps/util-linux-2.30 -" -DEPEND="${COMMON_DEPEND} - >=sys-boot/gnu-efi-3.0.2 - sys-libs/libcap -" -RDEPEND="${COMMON_DEPEND} - !sys-apps/systemd -" - -QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*" -QA_EXECSTACK="usr/lib/systemd/boot/efi/*" - -PATCHES=( - "${FILESDIR}/249-libshared-static.patch" -) - -src_configure() { - # https://bugs.gentoo.org/725794 - tc-export OBJCOPY - - local emesonargs=( - -Dblkid=true - -Defi=true - -Dgnu-efi=true - -Defi-cc="$(tc-getCC)" - -Defi-ld="$(tc-getLD)" - -Defi-libdir="/usr/$(get_libdir)" - -Dsplit-usr=true - -Drootprefix="${EPREFIX:-/}" - - -Dacl=false - -Dapparmor=false - -Daudit=false - -Dbzip2=false - -Delfutils=false - -Dgcrypt=false - -Dgnutls=false - -Dkmod=false - -Dlibcryptsetup=false - -Dlibcurl=false - -Dlibidn=false - -Dlibidn2=false - -Dlibiptc=false - -Dlz4=false - -Dmicrohttpd=false - -Dpam=false - -Dqrencode=false - -Dseccomp=false - -Dselinux=false - -Dxkbcommon=false - -Dxz=false - ) - meson_src_configure -} - -set_efi_arch() { - case "$(tc-arch)" in - amd64) efi_arch=x64 ;; - arm) efi_arch=arm ;; - arm64) efi_arch=aa64 ;; - x86) efi_arch=x86 ;; - esac -} - -src_compile() { - local efi_arch - set_efi_arch - local targets=( - bootctl - man/bootctl.1 - man/kernel-install.8 - src/boot/efi/linux${efi_arch}.{efi,elf}.stub - src/boot/efi/systemd-boot${efi_arch}.efi - ) - meson_src_compile "${targets[@]}" -} - -src_install() { - local efi_arch - set_efi_arch - dobin "${BUILD_DIR}"/bootctl src/kernel-install/kernel-install - doman "${BUILD_DIR}"/man/{bootctl.1,kernel-install.8} - exeinto usr/lib/kernel/install.d - doexe src/kernel-install/*.install - insinto usr/lib/systemd/boot/efi - doins "${BUILD_DIR}"/src/boot/efi/{linux${efi_arch}.{efi,elf}.stub,systemd-boot${efi_arch}.efi} - einstalldocs -} |