From 91391637ca1daf68f8ec910f023716f9168e59db Mon Sep 17 00:00:00 2001 From: Matthias Dahl Date: Tue, 4 Jul 2017 10:16:54 +0200 Subject: sys-boot/refind: Bump to 1.0.8 rEFInd 1.0.8 fixes, amongst other things, compilation with gnu-efi >= 3.0.5 and thus no longer requires a custom patch. --- sys-boot/refind/Manifest | 3 +- sys-boot/refind/refind-0.10.7-r1.ebuild | 201 -------------------------------- sys-boot/refind/refind-0.10.8.ebuild | 197 +++++++++++++++++++++++++++++++ 3 files changed, 198 insertions(+), 203 deletions(-) delete mode 100644 sys-boot/refind/refind-0.10.7-r1.ebuild create mode 100644 sys-boot/refind/refind-0.10.8.ebuild (limited to 'sys-boot') diff --git a/sys-boot/refind/Manifest b/sys-boot/refind/Manifest index c6f9278a867..1337265d5e6 100644 --- a/sys-boot/refind/Manifest +++ b/sys-boot/refind/Manifest @@ -1,3 +1,2 @@ -DIST refind-0.10.7-fix_build_gnuefi-3.0.5.patch.xz 9920 SHA256 262af553bc782394d08fa208452e81ef0b8cbefd6ec3857bee0a7d7f862bd86f SHA512 48ef45c7650347b82ee14a01459fd8f59d99623ae12f40f198d0d36d2471b3e93de85a4c3d39825e58e70c08b03fe00506fb71173deaef1889f5a806b103564d WHIRLPOOL e250f230221fd3920547c2684cffe258931d8a79c47bf458cc422551b1d5ee0a3930a8ba9353ae120cd87500ec478d13cf085933f41f78b4d2e5ed7d71dd3e4e DIST refind-src-0.10.4.tar.gz 3970380 SHA256 c3e428b27a0d4c61ee052603aedea7118bf04a7917216b10bfde2a3d2a2442a5 SHA512 a75a6210ee51427c474e69c2de8c719545b2599c19f1c7541048b77ab1996a0e4b4b5fd4840f6240cd6704e5f5338cbaff432d7dc5ec4042854e26d6df18bed5 WHIRLPOOL a5d84831ea3c6282560fcc7491e7aabeb4a0598c34843a09b7baadf9398092a9495290180d05fbd935ad09207814a3fa4f72cfa3bf798f2422fecf07dc27037d -DIST refind-src-0.10.7.tar.gz 4045026 SHA256 32e9a1cb11a910a26f555792d287f1b26d677c6d15666c19814d2b67b78b4201 SHA512 42830ac8c06221e2244426059add134afc6b63e5120c78fc6fed54eb3a6a1aee1b07da4833f53b3e5ed85689ab818d9bccdd7d1eb7e8fd326ea118ad0d3a542f WHIRLPOOL a8ac31f0fe3ee5726ecca56f339a1a63835ee608c947a0d86ed6995ad3fa09d66cce7bb4a5d878a6e20755d18b784822c6032ec7f67ea99a14ff3c9f44c49d88 +DIST refind-src-0.10.8.tar.gz 4059265 SHA256 e4fc7f474fe4a13b70c7bc3611c13976dbc4edc7323f0f27f3b50147ab47f1e6 SHA512 a4576920dd68a9436ee6d008787104842e192c6a5eb52cc580258bc8e13daadf170c21270e8cfd86f27733e3e86b050af9102d35c939677b1f1c3627aeeafb32 WHIRLPOOL 970ea1b6207c526288496f4ad04cf58d86fc8352bad673574bb06de64e4fd37c45b1f7b7b8b9dca2bd0bb5c61cec9e4eaaccf88e237dc515c42e950ec2a425c4 diff --git a/sys-boot/refind/refind-0.10.7-r1.ebuild b/sys-boot/refind/refind-0.10.7-r1.ebuild deleted file mode 100644 index 7bbeb09e4d4..00000000000 --- a/sys-boot/refind/refind-0.10.7-r1.ebuild +++ /dev/null @@ -1,201 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs flag-o-matic versionator - -DESCRIPTION="The rEFInd UEFI Boot Manager by Rod Smith" -HOMEPAGE="http://www.rodsbooks.com/refind/" - -SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz - gnuefi? ( https://dev.gentoo.org/~wraeth/distfiles/${P}-fix_build_gnuefi-3.0.5.patch.xz )" - -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} -gnuefi doc -custom-cflags" - -DEPEND="gnuefi? ( >=sys-boot/gnu-efi-3.0.2 ) - !gnuefi? ( >=sys-boot/udk-2015 )" - -DOCS="NEWS.txt README.txt docs/refind docs/Styles" - -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 - else - # Try to support anyway - export BUILDARCH=$( uname -m | sed s,i[3456789]86,ia32, ) - if [[ ${BUILDARCH} == "x86_64" ]] ; then - export EFIARCH=x64 - else - export EFIARCH=${ARCH} - fi - fi -} - -src_prepare() { - default - - # bug 616668 - build fails against gnu-efi-3.0.5 - use gnuefi && eapply "${WORKDIR}"/"${P}"-fix_build_gnuefi-3.0.5.patch - - # bug 598647 - PIE not supported - sed -e 's:CFLAGS =:& -fno-PIE:' -i "${S}/Make.common" || die - - local f - for f in "${S}"/*/Make.tiano "${S}"/Make.common; do - sed -i -e 's/^\(include .*target.txt.*\)$/#\1/' \ - -e 's@^\(TIANO_INCLUDE_DIRS\s*=\s*-I\s*\).*$@\1/usr/include/udk \\@' \ - -e '/^\s*-I \$(EDK2BASE).*$/d' \ - "${f}" || die "Failed to patch Tianocore make file in" \ - $(basename $(dirname ${f})) - done - for f in "${S}"/*/Make.tiano; do - sed -i -e 's@^\(EFILIB\s*=\s*\).*$@\1/usr/lib@' \ - -e 's@\$(EFILIB).*/\([^/]*\).lib@-l\1@' \ - -e 's/\(--start-group\s*\$(ALL_EFILIBS)\)/-L \$(EFILIB) \1/' \ - "${f}" || die "Failed to patch Tianocore make file in" \ - $(basename $(dirname ${f})) - done - sed -i -e '/Guids/i#include "AutoGen.h"\n' "${S}/filesystems/AutoGen.c" \ - || die "Failed to patch AutoGen.c" - for f in "${S}"/*/AutoGen.c; do - cat >>"${f}" <<-EOF || die "Failed to patch AutoGen.c" - - #define _PCD_TOKEN_PcdFixedDebugPrintErrorLevel 11U - #define _PCD_SIZE_PcdFixedDebugPrintErrorLevel 4 - #define _PCD_GET_MODE_SIZE_PcdFixedDebugPrintErrorLevel _PCD_SIZE_PcdFixedDebugPrintErrorLevel - #define _PCD_VALUE_PcdFixedDebugPrintErrorLevel 0xFFFFFFFFU - GLOBAL_REMOVE_IF_UNREFERENCED const UINT32 _gPcd_FixedAtBuild_PcdFixedDebugPrintErrorLevel = _PCD_VALUE_PcdFixedDebugPrintErrorLevel; - extern const UINT32 _gPcd_FixedAtBuild_PcdFixedDebugPrintErrorLevel; - #define _PCD_GET_MODE_32_PcdFixedDebugPrintErrorLevel _gPcd_FixedAtBuild_PcdFixedDebugPrintErrorLevel - //#define _PCD_SET_MODE_32_PcdFixedDebugPrintErrorLevel ASSERT(FALSE) // It is not allowed to set value for a FIXED_AT_BUILD PCD - EOF - done -} - -src_compile() { - # Prepare flags - local pecoff_header_size - [[ $EFIARCH == x64 ]] && pecoff_header_size='0x228' \ - || pecoff_header_size='0x220' - local make_flags=( - ARCH="${BUILDARCH}" - GENFW="/usr/bin/GenFw" - CC="$(tc-getCC)" - AS="$(tc-getAS)" - LD="$(tc-getLD)" - AR="$(tc-getAR)" - RANLIB="$(tc-getRANLIB)" - OBJCOPY="$(tc-getOBJCOPY)" - GNUEFI_LDFLAGS="-T \$(GNUEFI_LDSCRIPT) -shared -nostdlib -Bsymbolic \ - -L\$(EFILIB) -L\$(GNUEFILIB) \$(CRTOBJS) -znocombreloc -zdefs" - TIANO_LDSCRIPT="/usr/lib/GccBase.lds" - TIANO_LDFLAGS="-n -q --gc-sections -nostdlib \ - --script=\$(TIANO_LDSCRIPT) \ - --defsym=PECOFF_HEADER_SIZE=${pecoff_header_size} \ - --entry \$(ENTRYPOINT) -u \$(ENTRYPOINT) -m \$(LD_CODE)" - ) - - # Make main EFI - local all_target - use gnuefi && all_target="gnuefi" || all_target="tiano" - - if use custom-cflags; then - emake CFLAGS="${CFLAGS}" "${make_flags[@]}" ${all_target} - else - emake "${make_flags[@]}" ${all_target} - fi - - # Make filesystem drivers - local gnuefi_target - use gnuefi && gnuefi_target="_gnuefi" - local fs - for fs in ${FS_USE}; do - fs=${fs#+} - if use "${fs}"; then - einfo "Building ${fs} filesystem driver" - if use custom-cflags; then - emake CFLAGS="${CFLAGS}" "${make_flags[@]}" -C "${S}/filesystems" ${fs}${gnuefi_target} - else - emake "${make_flags[@]}" -C "${S}/filesystems" ${fs}${gnuefi_target} - fi - fi - done -} - -src_install() { - exeinto "/usr/share/${P}" - doexe refind-install - dosym "/usr/share/${P}/refind-install" "/usr/sbin/refind-install" - - dodoc "${S}"/{COPYING.txt,LICENSE.txt,CREDITS.txt} - if use doc; then - doman "${S}/docs/man/"* - dodoc -r ${DOCS} - fi - - insinto "/usr/share/${P}/refind" - doins "${S}/refind/refind_${EFIARCH}.efi" - doins "${S}/refind.conf-sample" - doins -r images icons fonts banners - - if [[ -d "${S}/drivers_${EFIARCH}" ]]; then - doins -r "${S}/drivers_${EFIARCH}" - fi - - insinto "/usr/share/${P}/refind/tools_${EFIARCH}" - doins "${S}/gptsync/gptsync_${EFIARCH}.efi" - - insinto "/etc/refind.d" - doins -r "${S}/keys" - - dosbin "${S}/mkrlconf" - dosbin "${S}/mvrefind" - dosbin "${S}/refind-mkdefault" -} - -pkg_postinst() { - elog "rEFInd has been built and installed into ${EROOT%/}/usr/share/${P}" - 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/sbsigntool 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/share/${P}/refind/refind.conf-sample" - else - if ! version_is_at_least "0.10.3" "${REPLACING_VERSIONS}"; 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.10.8.ebuild b/sys-boot/refind/refind-0.10.8.ebuild new file mode 100644 index 00000000000..044b7ed7c12 --- /dev/null +++ b/sys-boot/refind/refind-0.10.8.ebuild @@ -0,0 +1,197 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit toolchain-funcs flag-o-matic versionator + +DESCRIPTION="The rEFInd UEFI Boot Manager by Rod Smith" +HOMEPAGE="http://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} -gnuefi doc -custom-cflags" + +DEPEND="gnuefi? ( >=sys-boot/gnu-efi-3.0.2 ) + !gnuefi? ( >=sys-boot/udk-2015 )" + +DOCS="NEWS.txt README.txt docs/refind docs/Styles" + +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 + else + # Try to support anyway + export BUILDARCH=$( uname -m | sed s,i[3456789]86,ia32, ) + if [[ ${BUILDARCH} == "x86_64" ]] ; then + export EFIARCH=x64 + else + export EFIARCH=${ARCH} + fi + fi +} + +src_prepare() { + default + + # bug 598647 - PIE not supported + sed -e 's:CFLAGS =:& -fno-PIE:' -i "${S}/Make.common" || die + + local f + for f in "${S}"/*/Make.tiano "${S}"/Make.common; do + sed -i -e 's/^\(include .*target.txt.*\)$/#\1/' \ + -e 's@^\(TIANO_INCLUDE_DIRS\s*=\s*-I\s*\).*$@\1/usr/include/udk \\@' \ + -e '/^\s*-I \$(EDK2BASE).*$/d' \ + "${f}" || die "Failed to patch Tianocore make file in" \ + $(basename $(dirname ${f})) + done + for f in "${S}"/*/Make.tiano; do + sed -i -e 's@^\(EFILIB\s*=\s*\).*$@\1/usr/lib@' \ + -e 's@\$(EFILIB).*/\([^/]*\).lib@-l\1@' \ + -e 's/\(--start-group\s*\$(ALL_EFILIBS)\)/-L \$(EFILIB) \1/' \ + "${f}" || die "Failed to patch Tianocore make file in" \ + $(basename $(dirname ${f})) + done + sed -i -e '/Guids/i#include "AutoGen.h"\n' "${S}/filesystems/AutoGen.c" \ + || die "Failed to patch AutoGen.c" + for f in "${S}"/*/AutoGen.c; do + cat >>"${f}" <<-EOF || die "Failed to patch AutoGen.c" + + #define _PCD_TOKEN_PcdFixedDebugPrintErrorLevel 11U + #define _PCD_SIZE_PcdFixedDebugPrintErrorLevel 4 + #define _PCD_GET_MODE_SIZE_PcdFixedDebugPrintErrorLevel _PCD_SIZE_PcdFixedDebugPrintErrorLevel + #define _PCD_VALUE_PcdFixedDebugPrintErrorLevel 0xFFFFFFFFU + GLOBAL_REMOVE_IF_UNREFERENCED const UINT32 _gPcd_FixedAtBuild_PcdFixedDebugPrintErrorLevel = _PCD_VALUE_PcdFixedDebugPrintErrorLevel; + extern const UINT32 _gPcd_FixedAtBuild_PcdFixedDebugPrintErrorLevel; + #define _PCD_GET_MODE_32_PcdFixedDebugPrintErrorLevel _gPcd_FixedAtBuild_PcdFixedDebugPrintErrorLevel + //#define _PCD_SET_MODE_32_PcdFixedDebugPrintErrorLevel ASSERT(FALSE) // It is not allowed to set value for a FIXED_AT_BUILD PCD + EOF + done +} + +src_compile() { + # Prepare flags + local pecoff_header_size + [[ $EFIARCH == x64 ]] && pecoff_header_size='0x228' \ + || pecoff_header_size='0x220' + local make_flags=( + ARCH="${BUILDARCH}" + GENFW="/usr/bin/GenFw" + CC="$(tc-getCC)" + AS="$(tc-getAS)" + LD="$(tc-getLD)" + AR="$(tc-getAR)" + RANLIB="$(tc-getRANLIB)" + OBJCOPY="$(tc-getOBJCOPY)" + GNUEFI_LDFLAGS="-T \$(GNUEFI_LDSCRIPT) -shared -nostdlib -Bsymbolic \ + -L\$(EFILIB) -L\$(GNUEFILIB) \$(CRTOBJS) -znocombreloc -zdefs" + TIANO_LDSCRIPT="/usr/lib/GccBase.lds" + TIANO_LDFLAGS="-n -q --gc-sections -nostdlib \ + --script=\$(TIANO_LDSCRIPT) \ + --defsym=PECOFF_HEADER_SIZE=${pecoff_header_size} \ + --entry \$(ENTRYPOINT) -u \$(ENTRYPOINT) -m \$(LD_CODE)" + ) + + # Make main EFI + local all_target + use gnuefi && all_target="gnuefi" || all_target="tiano" + + if use custom-cflags; then + emake CFLAGS="${CFLAGS}" "${make_flags[@]}" ${all_target} + else + emake "${make_flags[@]}" ${all_target} + fi + + # Make filesystem drivers + local gnuefi_target + use gnuefi && gnuefi_target="_gnuefi" + local fs + for fs in ${FS_USE}; do + fs=${fs#+} + if use "${fs}"; then + einfo "Building ${fs} filesystem driver" + if use custom-cflags; then + emake CFLAGS="${CFLAGS}" "${make_flags[@]}" -C "${S}/filesystems" ${fs}${gnuefi_target} + else + emake "${make_flags[@]}" -C "${S}/filesystems" ${fs}${gnuefi_target} + fi + fi + done +} + +src_install() { + exeinto "/usr/share/${P}" + doexe refind-install + dosym "/usr/share/${P}/refind-install" "/usr/sbin/refind-install" + + dodoc "${S}"/{COPYING.txt,LICENSE.txt,CREDITS.txt} + if use doc; then + doman "${S}/docs/man/"* + dodoc -r ${DOCS} + fi + + insinto "/usr/share/${P}/refind" + doins "${S}/refind/refind_${EFIARCH}.efi" + doins "${S}/refind.conf-sample" + doins -r images icons fonts banners + + if [[ -d "${S}/drivers_${EFIARCH}" ]]; then + doins -r "${S}/drivers_${EFIARCH}" + fi + + insinto "/usr/share/${P}/refind/tools_${EFIARCH}" + doins "${S}/gptsync/gptsync_${EFIARCH}.efi" + + insinto "/etc/refind.d" + doins -r "${S}/keys" + + dosbin "${S}/mkrlconf" + dosbin "${S}/mvrefind" + dosbin "${S}/refind-mkdefault" +} + +pkg_postinst() { + elog "rEFInd has been built and installed into ${EROOT%/}/usr/share/${P}" + 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/sbsigntool 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/share/${P}/refind/refind.conf-sample" + else + if ! version_is_at_least "0.10.3" "${REPLACING_VERSIONS}"; 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 +} -- cgit v1.2.1