sys-boot/grub: bump to 2.02~rc1
authorMike Gilbert <floppym@gentoo.org>
Sat, 4 Feb 2017 19:30:10 +0000 (14:30 -0500)
committerMike Gilbert <floppym@gentoo.org>
Sat, 4 Feb 2017 19:31:19 +0000 (14:31 -0500)
Package-Manager: Portage-2.3.3_p47_p599686, Repoman-2.3.1_p40_p599686

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

index 1983a1672c75b2af1a2aae27d3efeba2fa7c8b85..7b7d0b3dc0a60310c4644b01291cf92e659ec769 100644 (file)
@@ -6,7 +6,8 @@ DIST grub-0.97.tar.gz 971783 SHA256 4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47
 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
+DIST grub-2.02~rc1.tar.xz 6051964 SHA256 445239e9b96d1143c194c1d37851cf4196b83701c60172e49665e9d453d80278 SHA512 c55a91f43d3c065dc9303fc9ab164910432095a571e28082cbcae646b8b92212f85da22873af99a1a5d7c943c51e2f90837dd2c68abf87ff50bf2e5955877f39 WHIRLPOOL 7ae697d8de28f1e936e49662564900ce82402895a7d3d07c70879c68ed9765ac2e82a89a8d2da4cfb6ecf64cc04c61ff4b889283a2e8abad0c38d86d889a6317
 DIST splash.xpm.gz 33856 SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41165f4e6b30e6acaf SHA512 5ae1f786f7d46a95a7061068d5b2b3ad64607c7b190d6f28379508c5dce67e26308325bfd637542a84855dfcf1ea3d143947326fdb189a6a8972208d3ead23da WHIRLPOOL d95b7b588ea8ac7c2c8c53eb8057aef21c825da6411afe3b7e864c606aeffaaebce8ae41ce3e979f277bd6b48a9e82a1f2ea8afc836213b56523d8a854227d7b
 DIST unifont-7.0.06.pcf.gz 1359006 SHA256 acf516b464928244c25dd1afddd02f6f459686b5135685694d875d7eca8bf4f2 SHA512 a62f21366b51a582d2b5a66710c8a6183bc869407867da78e59ecec9dabcff7a2522a8bc454cf511592d336befea812d36622589ef119160fe3014d927fa11b3 WHIRLPOOL 9f431f9b6af23a87e3291e5c66d6f1e56f8c8ce23222821dbf41aa03edac4d80e8e6c5895c024951cf199d41904e6c9f830103427568a9b0386f68adc0a959d7
 DIST unifont-8.0.01.pcf.gz 1359487 SHA256 28c3f7ffe986e611a42f3d209e1f7730669e2e317b6913510746a77fa6f0ed56 SHA512 8a2872a389bb6e1bb4badf8bbe717c4fff632fed53baaea018b7b277c2b88678df485bcd0663a8b1ec76a344e04a3a1cd9de24b7f953ffd9d58844eef029bbc8 WHIRLPOOL 33433d9cfc2fedc9969fa438be4ceaaf2ebc3801424ca247f5dd448607f45e7b9cb503a11ba72e76cf4608142161268c0b078ea65bfa970595f571c807ad6ae8
-DIST unifont-9.0.02.pcf.gz 1360332 SHA256 c2f2a3d6a4e8420d4ed66778ca61836225ff68d6ef031aad6842f4d02914961f SHA512 f619d6a23217d28399b1cf842077891af6749eb611b1c6e3bb9fce94a918834c6a73d423dafe9b5d36661ac7fd2c0aa4ef3c483f449fed48f4d09ae55359073b WHIRLPOOL 2323c2a3bea1eaeeb4c31d921114b9dc5f974a21f73465b7e6b2bb5e1f0b1a84767e1e638e36f6260395c9d3382d66cc631b7e75f72e7833eb168d5d07dcb363
+DIST unifont-9.0.06.pcf.gz 1360354 SHA256 6d23e82ea3fd3d79849d675c0c30129b62a3973a83b4cdc05f9994efef773b86 SHA512 dd0a1afa72f5204c62055d83f22750c74af38ffafdb8eda8e1f1cf7292e572a14969b8a9a6a2cb336d5bed4ab633f6b5a962c59117a590e4238788959cb82774 WHIRLPOOL 3153fe2a254cffa5aac6c5915468262bf60f993ce5a2aa47885ccef2a6714e205724b01fd9d26d499b9efbc5213e3cea0037c91f17fb2ae780ee289cab0de69b
diff --git a/sys-boot/grub/grub-2.02_rc1.ebuild b/sys-boot/grub/grub-2.02_rc1.ebuild
new file mode 100644 (file)
index 0000000..5588e17
--- /dev/null
@@ -0,0 +1,285 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~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? (
+               dev-libs/libisoburn
+               app-emulation/qemu
+       )
+       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"
+
+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
+
+       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
+}
index 829968158f4b999333415d040779128b75158876..5588e17754851b524f6c4f9b5e579ce6a5b2399c 100644 (file)
@@ -1,11 +1,16 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 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
 
@@ -18,9 +23,7 @@ if [[ ${PV} != 9999 ]]; then
                SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz"
                S=${WORKDIR}/${MY_P}
        else
-               SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
-                       mirror://gentoo/${P}.tar.xz
-                       https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
+               SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
                S=${WORKDIR}/${P%_*}
        fi
        KEYWORDS="~amd64 ~x86"
@@ -36,7 +39,7 @@ PATCHES=(
 )
 
 DEJAVU=dejavu-sans-ttf-2.37
-UNIFONT=unifont-9.0.02
+UNIFONT=unifont-9.0.06
 SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
        themes? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )"
 
@@ -134,7 +137,7 @@ src_prepare() {
                sed -i -e 's/^\* GRUB:/* GRUB2:/' -e 's/(grub)/(grub2)/' docs/grub.texi || die
        fi
 
-       if [[ ${PV} == 9999 ]]; then
+       if [[ -n ${GRUB_AUTOGEN} ]]; then
                python_setup
                bash autogen.sh || die
                autopoint() { :; }
@@ -202,7 +205,8 @@ grub_configure() {
                ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
        fi
 
-       ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+       local ECONF_SOURCE="${S}"
+       econf "${myeconfargs[@]}"
 }
 
 src_configure() {
@@ -225,8 +229,12 @@ src_configure() {
        tc-export CC NM OBJCOPY RANLIB STRIP
        tc-export BUILD_CC # Bug 485592
 
-       # Portage will take care of cleaning up GRUB_PLATFORMS
-       MULTIBUILD_VARIANTS=( ${GRUB_PLATFORMS:-guessed} )
+       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
 }