sys-boot/grub: bump to 2.02
authorMike Gilbert <floppym@gentoo.org>
Thu, 27 Apr 2017 17:13:38 +0000 (13:13 -0400)
committerMike Gilbert <floppym@gentoo.org>
Thu, 27 Apr 2017 17:14:09 +0000 (13:14 -0400)
Package-Manager: Portage-2.3.5_p31, Repoman-2.3.2_p61

sys-boot/grub/Manifest
sys-boot/grub/grub-2.02.ebuild [new file with mode: 0644]

index b48675c5a3b1005dffda769c2ccd70c2a36a9a15..029dcd6b340a36769ef0130d2da1b70208d5e64f 100644 (file)
@@ -3,6 +3,7 @@ DIST dejavu-sans-ttf-2.35.zip 415463 SHA256 c629bce270e75b6234d5285a739cd186bebc
 DIST dejavu-sans-ttf-2.37.zip 417746 SHA256 5c6e497a2f36552cb5ffb112c413a6af39c0f3c47653662b90b4fa6499822fd7 SHA512 ede5899daa1984c5aa8cacb1c850eb53f189dddef3d9bb78bf9774d8976b7c0d6eb0bcf86237cd7d11f5b36cf5b5058d42cd94d3bd76f2bd0931c7ceb1271fae WHIRLPOOL 6f19280e76ea3efe265db09236e94bdd00268c5d8742c191100b8eb19faa532289fb03d838e33aa3c501d8a3243db248648af8929d5d5dba1bfd2ea2c10358cd
 DIST grub-0.97-patches-1.14.tar.bz2 52916 SHA256 5c7ca31fd9b2123471daf2e46a1936c4044ad0c12e353d9d3d8c3f83a1c7a0e5 SHA512 d9a8d420fd5a36f181ca608f9b70be90f9d82cee66c8484636fda5085290586071b5d9379d917e8141b993ffc4777859cd02971c916d6167dca6f50d83282c26 WHIRLPOOL 60abd5087e85d9969784b9f5a100934606a76da03b665533d9d4d1d13f4e2d15de233a71e67a32d18a5fbfe128c2c8bf04c0d4451de24e6ca4fbd8dd862e23ea
 DIST grub-0.97.tar.gz 971783 SHA256 4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b SHA512 c2bc9ffc8583aeae71cee9ddcc4418969768d4e3764d47307da54f93981c0109fb07d84b061b3a3628bd00ba4d14a54742bc04848110eb3ae8ca25dbfbaabadb WHIRLPOOL 0ad7f5dc035e2a3ad5fd29b6388f06fd12a8cc694117b4cbd42b5302433aa522db23566222d35219fe17fb95edb5090553156198507f70208eda5d858fd52dd5
+DIST grub-2.02.tar.xz 6113260 SHA256 810b3798d316394f94096ec2797909dbf23c858e48f7b3830826b8daa06b7b0f SHA512 cc6eb0a42b5c8df2f671cc128ff725afb3ff1f8832a196022e433cf0d3b75decfca2316d0aa5fabea75747d55e88f3d021dd93508563f8ca80fd7b9e7fe1f088 WHIRLPOOL a7f5d786064642f926faa444b9db1555ccfbb460655f81a0ca408bc5ad2acfb89fe596f81d161078944ce1b2dc00e82e8fb056f050bf026fc07f6417af7b9776
 DIST grub-2.02_beta2-gentoo-r3.tar.xz 14532 SHA256 78d14f27ed60458601021d13c247387dad324d4141ed46721e2e14f4a4fda990 SHA512 b46390c217e9a1f9fccbefbc5aab062c228919b9b7b6f16effd9d292534c516a28747376d85d5db8b7f883cf7e8c2aa0ca6573e8ed2913aadabbc1cd795fc861 WHIRLPOOL acb6d2e39e1670a4342e21e6d35ab390e36557512784a8ee0b5bda051ec5fb633061a28d2a2deab8c3d1961052db6c3870742ff866e292d8e4c0fd3c7a0acf45
 DIST grub-2.02~beta2.tar.xz 5798740 SHA256 f6c702b2a8ea58f27a2b02928bb77973cb5a827af08f63db38c471c0a01b418d SHA512 359903928febce1df53b3bd38aab701b4ea010dfad0dee434e853c865af4bbc60d115e61eac100c79f18d89aa78b2216ef20123f4ef04cc948ecbe226ea1a58c WHIRLPOOL f92e94f43888648484a972a0c82b0a2ac4dc7fbdd6e35ca8b11a6ee92168ac8cf7ee68987b84697ec46ad18189e5c5c9aee8105b91bb131cd7f6f499f45cd58f
 DIST grub-2.02~beta3.tar.xz 6030784 SHA256 30ec3d555e52a702c3eef449872ef874eff28b320f40b55ffc47f70db8e5ada1 SHA512 4a530efef4dae45f4046cf3550563f14acb24d25cb88d5e06c93953ca5b1eec115118c6860233a9f627edcddae2571e5d6b867b70ff9dd5c184c9fef83ef7e11 WHIRLPOOL b1042c24060e35ea5a492b7258b147fde80c949c2e81dcff3a31750966b7d31cdb62e1492274843f313226d70b202a8edbf08d11c5e79e4173a4c373879e4aad
diff --git a/sys-boot/grub/grub-2.02.ebuild b/sys-boot/grub/grub-2.02.ebuild
new file mode 100644 (file)
index 0000000..cc6db98
--- /dev/null
@@ -0,0 +1,298 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == 9999  ]]; then
+       GRUB_AUTOGEN=1
+fi
+
+if [[ -n ${GRUB_AUTOGEN} ]]; then
+       PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+       WANT_LIBTOOL=none
+       inherit autotools python-any-r1
+fi
+
+inherit autotools bash-completion-r1 flag-o-matic multibuild pax-utils toolchain-funcs versionator
+
+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="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz"
+               S=${WORKDIR}/${MY_P}
+       else
+               SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+               S=${WORKDIR}/${P%_*}
+       fi
+       KEYWORDS="~amd64 ~arm64 ~x86"
+else
+       inherit git-r3
+       EGIT_REPO_URI="git://git.sv.gnu.org/grub.git
+               http://git.savannah.gnu.org/r/grub.git"
+fi
+
+PATCHES=(
+       "${FILESDIR}"/gfxpayload.patch
+       "${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
+)
+
+DEJAVU=dejavu-sans-ttf-2.37
+UNIFONT=unifont-9.0.06
+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 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
+SLOT="2/${PVR}"
+IUSE="debug device-mapper doc efiemu +fonts mount multislot nls static 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 )
+IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
+
+REQUIRED_USE="
+       grub_platforms_coreboot? ( fonts )
+       grub_platforms_qemu? ( fonts )
+       grub_platforms_ieee1275? ( fonts )
+       grub_platforms_loongson? ( fonts )
+"
+
+# os-prober: Used on runtime to detect other OSes
+# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
+RDEPEND="
+       app-arch/xz-utils
+       >=sys-libs/ncurses-5.2-r5:0=
+       debug? (
+               sdl? ( media-libs/libsdl )
+       )
+       device-mapper? ( >=sys-fs/lvm2-2.02.45 )
+       libzfs? ( sys-fs/zfs )
+       mount? ( sys-fs/fuse )
+       truetype? ( media-libs/freetype:2= )
+       ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
+       ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
+"
+DEPEND="${RDEPEND}
+       ${PYTHON_DEPS}
+       app-misc/pax-utils
+       sys-devel/flex
+       sys-devel/bison
+       sys-apps/help2man
+       sys-apps/texinfo
+       fonts? ( media-libs/freetype:2 )
+       grub_platforms_xen? ( app-emulation/xen-tools:= )
+       grub_platforms_xen-32? ( app-emulation/xen-tools:= )
+       static? (
+               app-arch/xz-utils[static-libs(+)]
+               truetype? (
+                       app-arch/bzip2[static-libs(+)]
+                       media-libs/freetype[static-libs(+)]
+                       sys-libs/zlib[static-libs(+)]
+               )
+       )
+       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
+       )
+"
+RDEPEND+="
+       kernel_linux? (
+               grub_platforms_efi-32? ( sys-boot/efibootmgr )
+               grub_platforms_efi-64? ( sys-boot/efibootmgr )
+       )
+       !multislot? ( !sys-boot/grub:0 !sys-boot/grub-static )
+       nls? ( sys-devel/gettext )
+"
+
+DEPEND+=" !!=media-libs/freetype-2.5.4"
+
+RESTRICT="strip !test? ( test )"
+
+QA_EXECSTACK="usr/bin/grub*-emu* usr/lib/grub/*"
+QA_WX_LOAD="usr/lib/grub/*"
+QA_MULTILIB_PATHS="usr/lib/grub/.*"
+
+src_unpack() {
+       if [[ ${PV} == 9999 ]]; then
+               git-r3_src_unpack
+       fi
+       default
+}
+
+src_prepare() {
+       default
+
+       sed -i -e /autoreconf/d autogen.sh || die
+
+       if use multislot; then
+               # fix texinfo file name, bug 416035
+               sed -i -e 's/^\* GRUB:/* GRUB2:/' -e 's/(grub)/(grub2)/' docs/grub.texi || die
+       fi
+
+       # Nothing in Gentoo packages 'american-english' in the exact path
+       # wanted for the test, but all that is needed is a compressible text
+       # file, and we do have 'words' from miscfiles in the same path.
+       sed -i \
+               -e '/CFILESSRC.*=/s,american-english,words,' \
+               tests/util/grub-fs-tester.in \
+               || die
+
+       if [[ -n ${GRUB_AUTOGEN} ]]; then
+               python_setup
+               bash autogen.sh || die
+               autopoint() { :; }
+               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*) 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
+               --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
+               $(use_enable debug mm-debug)
+               $(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 sdl && use_enable debug grub-emu-sdl)
+               ${platform:+--with-platform=}${platform}
+
+               # Let configure detect this where supported
+               $(usex efiemu '' '--disable-efiemu')
+       )
+
+       if use multislot; then
+               myeconfargs+=( --program-transform-name="s,grub,grub2," )
+       fi
+
+       # Set up font symlinks
+       ln -s "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
+       if use themes; then
+               ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
+       fi
+
+       local ECONF_SOURCE="${S}"
+       econf "${myeconfargs[@]}"
+}
+
+src_configure() {
+       # Bug 508758.
+       replace-flags -O3 -O2
+
+       # 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
+
+       use static && HOST_LDFLAGS+=" -static"
+
+       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 # Bug 485592
+
+       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
+
+       if use multislot; then
+               mv "${ED%/}"/usr/share/info/grub{,2}.info || die
+       fi
+
+       insinto /etc/default
+       newins "${FILESDIR}"/grub.default-3 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
+               elog "You may consider installing the following optional packages:"
+               optfeature "Detect other operating systems (grub-mkconfig)" sys-boot/os-prober
+               optfeature "Create rescue media (grub-mkrescue)" dev-libs/libisoburn
+               optfeature "Enable RAID device detection" sys-fs/mdadm
+       fi
+}