diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-12-14 13:26:14 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-12-14 13:26:14 +0000 |
commit | 6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (patch) | |
tree | 25413d1cb3a0cbfe36029db32398c0f333609215 /sys-boot/refind | |
parent | 9c417bacd51da6d8b57fa9f37425161d30d4b95b (diff) |
gentoo resync : 14.12.2020
Diffstat (limited to 'sys-boot/refind')
-rw-r--r-- | sys-boot/refind/Manifest | 4 | ||||
-rw-r--r-- | sys-boot/refind/files/refind-0.12.0-gcc10.patch | 11 | ||||
-rw-r--r-- | sys-boot/refind/refind-0.12.0-r1.ebuild | 12 | ||||
-rw-r--r-- | sys-boot/refind/refind-0.12.0.ebuild | 168 |
4 files changed, 21 insertions, 174 deletions
diff --git a/sys-boot/refind/Manifest b/sys-boot/refind/Manifest index 375213d9846d..e4bcff65f8c1 100644 --- a/sys-boot/refind/Manifest +++ b/sys-boot/refind/Manifest @@ -1,7 +1,7 @@ AUX makefile.patch 856 BLAKE2B d4de5c95330577bf2a25b8c50aa3193c3b57ce740abe12bc3996af18eda54c1514e2129a1e28f0bca7384b1f4b78e19e8b35e07e816a23cc04a93ba2804214d0 SHA512 51c0552984791190fc44159de1797094dffc01cf6ef90a3219b069ae2417c0ff5020a19b34d26b0c3f7d1a1bc9184078948f669a4186893561833ff88afdb316 +AUX refind-0.12.0-gcc10.patch 321 BLAKE2B 35cb0676fa14218eb90753481cb3f76718b71b8311b4df1a9bbf1ebe591d8a9bb06d68210c422266640771a84d80805274a2008fd454f417bbb4137b96003205 SHA512 38f679759698c23927d9c3934ffbb1ef26ca590b5b6103927ec9816f9f4b5f9745703ced94f1b357d9b47b84b3b8b8072ead507acedb576e7f4eed0c1834dee6 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 EBUILD refind-0.11.4.ebuild 4746 BLAKE2B 9870720301e1697a91d1380832e1b0205de95e8aa1ad56de1022f17dd1b88e8c9d064f4344abc7b518d0dd0a5c662dfe4ea21cfca6f6cf4e941f6d5fee21ce85 SHA512 137a9af7e7727b2bbc40649ce7d2223f5db62e2b5c8817cb7982ca1dd0e67aa98edb250565cef65bd6bebcf79885b1d66d8a6931e6536f9561dc621b3b4c8f59 -EBUILD refind-0.12.0-r1.ebuild 3643 BLAKE2B 570720144d6ca0432ea5ae74d63dd86a5e88c7c2b39f84329f673ddf82b611333dae41c97cbf1339d3bd21db9afea3e1817ce9d7848d516db24b561da2681d1e SHA512 8ac04cfda4a7b000d059546ed6fa20432c86b0a168c5783eb4ad30b3b1994d91a35cc59550edc38922916e794de31bfde0546938de2408820f9633731dd8a785 -EBUILD refind-0.12.0.ebuild 4732 BLAKE2B 501398cee52099f0a727f30866c6d890a848b8bb5f83df9db637b3b90ce40deb141b803fefaca176cb1bb731cfd00b8eeaf5bbc8a2f24c0e7e1b14244e894393 SHA512 d9339513227603715ea47ad4521722b10411c2b0243003410cf018093c222be4cf347b82c1b4a963429eb05485a444e37852f6dc52647d7277174d6be08ed8cb +EBUILD refind-0.12.0-r1.ebuild 3721 BLAKE2B c379bdc444feae85e4d2c3d2078932027ed2faa23155d9d04319600dc2648fbff425d3a7c459092fb737d3ee66adff9b59cfcf3324584f9014d086d827ef887d SHA512 d3e92db3107e38f3ce0e1524ef2b5257a609b726ab5a74f7685d4345b0d8c32c0c84e60296d268167a4949d983272d34d5dcbd47043ee27d543daf8e0a5ac199 MISC metadata.xml 3821 BLAKE2B dd2985fd4728180562a6c11969c27e1d1af70e80e3c68aa4fe7ce7665b752c6aa4adb6fce27487dd97563821b13f2e97e746b6b6e0c346a212380b9c1b231de4 SHA512 e0a5ebc2757e7584afb0628b5f451458974f8ffc1c94774b0ba0eda67ba582fabe08cf8d17fce2df934bba5bded40605f665da0a236d08a53f19b422afae9336 diff --git a/sys-boot/refind/files/refind-0.12.0-gcc10.patch b/sys-boot/refind/files/refind-0.12.0-gcc10.patch new file mode 100644 index 000000000000..1f2e2bc0a5de --- /dev/null +++ b/sys-boot/refind/files/refind-0.12.0-gcc10.patch @@ -0,0 +1,11 @@ +--- a/Make.common ++++ b/Make.common +@@ -60,7 +60,7 @@ + # + + # ...for both GNU-EFI and TianoCore.... +-OPTIMFLAGS = -Os -fno-strict-aliasing ++OPTIMFLAGS = -Os -fno-strict-aliasing -fno-tree-loop-distribute-patterns + CFLAGS = $(OPTIMFLAGS) -fno-stack-protector -fshort-wchar -Wall + + # ...for GNU-EFI.... diff --git a/sys-boot/refind/refind-0.12.0-r1.ebuild b/sys-boot/refind/refind-0.12.0-r1.ebuild index b595a111e7e0..f63a0cbd3243 100644 --- a/sys-boot/refind/refind-0.12.0-r1.ebuild +++ b/sys-boot/refind/refind-0.12.0-r1.ebuild @@ -15,10 +15,14 @@ KEYWORDS="~amd64 ~x86" FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs" IUSE="${FS_USE} custom-cflags doc" -DEPEND=">=sys-boot/gnu-efi-3.0.2" +DEPEND="sys-boot/gnu-efi" -DOCS=(README.txt) -PATCHES=("${FILESDIR}/makefile.patch") +PATCHES=( + "${FILESDIR}/makefile.patch" + "${FILESDIR}/${P}-gcc10.patch" # Bug 723244 +) + +DOCS=( README.txt ) pkg_pretend() { if use custom-cflags; then @@ -78,7 +82,7 @@ src_compile() { FILESYSTEMS_GNUEFI="${fs_names[@]}" ) if use custom-cflags; then - make_flags=(CFLAGS="${CFLAGS}" "${make_flags[@]}") + make_flags=(CFLAGS="${CFLAGS} -fno-tree-loop-distribute-patterns" "${make_flags[@]}") fi emake "${make_flags[@]}" all_gnuefi diff --git a/sys-boot/refind/refind-0.12.0.ebuild b/sys-boot/refind/refind-0.12.0.ebuild deleted file mode 100644 index 9091a88cfcb1..000000000000 --- a/sys-boot/refind/refind-0.12.0.ebuild +++ /dev/null @@ -1,168 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multiprocessing toolchain-funcs - -DESCRIPTION="The UEFI Boot Manager by Rod Smith" -HOMEPAGE="https://www.rodsbooks.com/refind/" -SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz" - -LICENSE="BSD GPL-2 GPL-3 FDL-1.3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs" -IUSE="${FS_USE} custom-cflags doc gnuefi" - -DEPEND="gnuefi? ( >=sys-boot/gnu-efi-3.0.2 ) - !gnuefi? ( >=sys-boot/udk-2018-r1 )" - -DOCS=(README.txt) -PATCHES=("${FILESDIR}/makefile.patch") -UDK_WORKSPACE="${T}/udk" - -pkg_pretend() { - if use custom-cflags; then - ewarn - ewarn "You have enabled building with USE=custom-cflags. Be aware that" - ewarn "using this can result in EFI binaries that fail to run and may" - ewarn "fail to build at all. This is strongly advised against by upstream." - ewarn - ewarn "See https://bugs.gentoo.org/598587#c3 for more information" - ewarn - fi -} - -pkg_setup() { - if use x86; then - export EFIARCH=ia32 - export BUILDARCH=ia32 - elif use amd64; then - export EFIARCH=x64 - export BUILDARCH=x86_64 - fi -} - -src_prepare() { - default - - # bug 598647 - PIE not supported - sed -e '/^CFLAGS/s:$: -fno-PIE:' -i Make.common || die - - # Prepare UDK workspace - if ! use gnuefi; then - mkdir "${UDK_WORKSPACE}" || die - ln -s "${EPREFIX}/usr/lib/udk/"{Mde,IntelFramework}{,Module}Pkg \ - "${UDK_WORKSPACE}" || die "Could not link UDK files" - fi -} - -src_configure() { - if ! use gnuefi; then - # Use the side effect of the script which will create configuration files - (. udk-workspace "${UDK_WORKSPACE}" || die) - sed -e "s:^#\?\s*\(MAX_CONCURRENT_THREAD_NUMBER\s*=\).*$:\1 $(makeopts_jobs):" \ - -i "${UDK_WORKSPACE}/Conf/target.txt" || die "Failed to configure target file" - sed -e "s:\(_\(CC\|ASM\|PP\|VFRPP\|ASLCC\|ASLPP\|DLINK\)_PATH\s*=\).*$:\1 $(tc-getCC):" \ - -e "s:\(_ASLDLINK_PATH\s*=\).*$:\1 $(tc-getLD):" \ - -e "s:\(_OBJCOPY_PATH\s*=\).*$:\1 $(tc-getOBJCOPY):" \ - -e "s:\(_RC_PATH\s*=\).*$:\1 $(tc-getOBJCOPY):" \ - -e "s:\(_SLINK_PATH\s*=\).*$:\1 $(tc-getAR):" \ - -e "s:-Werror::" \ - -i "${UDK_WORKSPACE}/Conf/tools_def.txt" \ - || die "Failed to prepare tools definition file" - fi -} - -src_compile() { - # Update fs targets depending on uses - local fs fs_names=() - for fs in ${FS_USE}; do - fs=${fs#+} - if use "${fs}"; then - fs_names+=(${fs}) - fi - done - use gnuefi && fs_names=("${fs_names[@]/%/_gnuefi}") - - # Prepare flags - local make_flags=( - ARCH="${BUILDARCH}" - CC="$(tc-getCC)" - AS="$(tc-getAS)" - LD="$(tc-getLD)" - AR="$(tc-getAR)" - RANLIB="$(tc-getRANLIB)" - OBJCOPY="$(tc-getOBJCOPY)" - GNUEFILIB="/usr/$(get_libdir)" - EFILIB="/usr/$(get_libdir)" - EFICRT0="/usr/$(get_libdir)" - EDK2BASE="${UDK_WORKSPACE}" - EDK2_DRIVER_BASENAMES="${fs_names[@]}" - FILESYSTEMS="${fs_names[@]}" - FILESYSTEMS_GNUEFI="${fs_names[@]}" - ) - if use custom-cflags; then - make_flags=(CFLAGS="${CFLAGS}" "${make_flags[@]}") - fi - - emake "${make_flags[@]}" all_$(usex gnuefi gnuefi edk2) -} - -src_install() { - exeinto "/usr/lib/${PN}" - doexe refind-install - dosym "../lib/${PN}/refind-install" "/usr/sbin/refind-install" - - if use doc; then - doman "docs/man/"* - DOCS+=(NEWS.txt docs/refind docs/Styles) - fi - einstalldocs - - insinto "/usr/lib/${PN}/refind" - doins "refind/refind_${EFIARCH}.efi" - doins "refind.conf-sample" - doins -r images icons fonts banners - - if [[ -d "drivers_${EFIARCH}" ]]; then - doins -r "drivers_${EFIARCH}" - fi - - insinto "/usr/lib/${PN}/refind/tools_${EFIARCH}" - doins "gptsync/gptsync_${EFIARCH}.efi" - - insinto "/etc/refind.d" - doins -r "keys" - - dosbin "mkrlconf" - dosbin "mvrefind" - dosbin "refind-mkdefault" -} - -pkg_postinst() { - elog "rEFInd has been built and installed into ${EROOT}/usr/lib/${PN}" - elog "You will need to use the command 'refind-install' to install" - elog "the binaries into your EFI System Partition" - elog "" - elog "refind-install requires additional packages to be fully functional:" - elog " app-crypt/sbsigntools for binary signing for use with SecureBoot" - elog " sys-boot/efibootmgr for writing to NVRAM" - elog " sys-apps/gptfdisk for ESP management" - elog "" - elog "refind-mkdefault requires >=dev-lang/python-3" - elog "" - if [[ -z "${REPLACING_VERSIONS}" ]]; then - elog "A sample configuration can be found at" - elog "${EROOT}/usr/lib/${PN}/refind/refind.conf-sample" - else - if ver_test "${REPLACING_VERSIONS}" -lt "0.12.0"; then - ewarn "This new version uses sys-apps/gptfdisk instead of sys-block/parted" - ewarn "to manage ESP" - ewarn "" - fi - ewarn "Note that this installation will not update any EFI binaries" - ewarn "on your EFI System Partition - this needs to be done manually" - fi -} |