diff options
Diffstat (limited to 'sys-boot')
| -rw-r--r-- | sys-boot/grub/ChangeLog | 9 | ||||
| -rw-r--r-- | sys-boot/grub/Manifest | 12 | ||||
| -rw-r--r-- | sys-boot/grub/grub-2.00_beta5.ebuild | 284 | ||||
| -rw-r--r-- | sys-boot/grub/grub-9999.ebuild | 10 |
4 files changed, 306 insertions, 9 deletions
diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog index 21e185d2a271..821923744a58 100644 --- a/sys-boot/grub/ChangeLog +++ b/sys-boot/grub/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-boot/grub # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.201 2012/04/28 03:23:03 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.202 2012/05/09 23:00:07 floppym Exp $ + +*grub-2.00_beta5 (09 May 2012) + + 09 May 2012; Mike Gilbert <floppym@gentoo.org> +grub-2.00_beta5.ebuild, + grub-9999.ebuild: + Version bump. Should resolve bug 412497. Repleace dependencies on os-prober + and libisoburn with elog messages. 28 Apr 2012; Mike Gilbert <floppym@gentoo.org> grub-2.00_beta3-r2.ebuild, grub-9999.ebuild: diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest index be86584af610..76b6c18c04d3 100644 --- a/sys-boot/grub/Manifest +++ b/sys-boot/grub/Manifest @@ -31,6 +31,7 @@ DIST grub-2.00~beta0.tar.xz 4833964 RMD160 8c3f6b1a54d028c4fa4e181e1b1bfc4e401e4 DIST grub-2.00~beta1.tar.xz 4893780 RMD160 5bff1bbcfb6e7fb3aad5289bd2947891d299c077 SHA1 b1eb0ca9349e59098cec0f4873a8689b7e9c57c3 SHA256 c99332bbf666ea4a4adc0cd900ec9d3ab2018f3ea7ce108b16773fc0fc78bfe9 DIST grub-2.00~beta2.tar.xz 4984612 RMD160 5f3905a1c0e813183394e4063ea51c8ff3c71950 SHA1 2ba583f9466fb676b0ae3d7a9a82d1299b153a98 SHA256 45d6fda26441b24215aabd83ab3797cde3fd4a4d511e37457464587805431b28 DIST grub-2.00~beta3.tar.xz 5069092 RMD160 ba29fd56637ed5d872442abab5267d131d566f93 SHA1 96bfdf4d53767faaf2c744ee82d4d703e4b672a2 SHA256 b0953e0b65767751fd9308374eecd26ba71d9b73425824a865708176ec0b8e94 +DIST grub-2.00~beta5.tar.xz 5102572 RMD160 816f642cfc392718d51ec3a729b34419e1cdadad SHA1 d64df2b5376a1a2062305fca90c481fcefbc7256 SHA256 e30362f6d28157cbff6c677fddfcfd9e349266baf3fc50a31042712591294f5d DIST splash.xpm.gz 33856 RMD160 2fead61f91c368429e80936248bb02af2bdf15ff SHA1 98e679f9698be43426f971f89a088c053e8c804a SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41165f4e6b30e6acaf EBUILD grub-0.92-r1.ebuild 2605 RMD160 5229d164def7c4bd6dc43923e91e064bcbdcc43b SHA1 14503ef04599d61b3cdd1a02ea0d78eb36109215 SHA256 cd42e232b3d1e3ce99fa391907df1019f38a853f574cfb812346d9b1db0c7596 EBUILD grub-0.94-r1.ebuild 3340 RMD160 38b586e0a6f7a97cb6ea5fbff6f0c64a6e505052 SHA1 272d005f296a5089c29857a050a4c013735793b9 SHA256 d9d07a2c87d1d6656e42559244e1c4f06e47aa7dfdbc644f2a3eeefabf3b784e @@ -53,13 +54,14 @@ EBUILD grub-2.00_beta2-r1.ebuild 6572 RMD160 358eced67e79b91738abfb362b3920cd3b1 EBUILD grub-2.00_beta2.ebuild 6476 RMD160 43557ca6eb3e61f66fe4d8c2977d9ac1e4db2d96 SHA1 0d7d68e9869b646275d28e1acd3badbe80b33559 SHA256 d60330fd91721d586fe4254bbaa02add8accc2ea729fff1c376aa544ed4f96ca EBUILD grub-2.00_beta3-r2.ebuild 6692 RMD160 31ba77ba971c2c588d4c112d9e800cb2b44b1d51 SHA1 d3b12362d589f855ffd4bda3fb706d054f557ee5 SHA256 8b737e1e31330251f6339dcf7dd649003ba3b6e1d7aae0d54f8f8699a9cc2435 EBUILD grub-2.00_beta3.ebuild 6488 RMD160 d0cbccc50d81e7b6e70c27c5309c2faec2ff3b44 SHA1 a2c074dcd6c535fb66a0ffb189dcf00394528772 SHA256 d39abf04dc1d6b4e03511647c3585ab8950b5778ec3a1fe0fe87de615b334477 -EBUILD grub-9999.ebuild 6627 RMD160 9dd81392b05a47979c5a1a647aaeffb72913c365 SHA1 b589070399c19b44ed55d146dcd64671d69f15a4 SHA256 8eaf198038279679d6ff73e7f69194c0db7a4c6b3c503dc9f511a15e1574ae4b -MISC ChangeLog 40028 RMD160 32583e0905b357f7d3bbd17a6de0c986e8e30c11 SHA1 52047422f230978ab7e4fc5b0c9e573a74ee7dde SHA256 5a33bac7f8d8cbc76157d866b01a9db3ed56967e3aabeaf24bf78dfe6529ba13 +EBUILD grub-2.00_beta5.ebuild 6885 RMD160 c0d3b12a459b7b8c4b8b900ca290fecb45453750 SHA1 7346bac900753faaa6baeb2959dd1aada1dbe670 SHA256 4df1fde0ccd2a46dbc0083a2b7c2b95617764d8ea87b9e1efc317b2c2d006579 +EBUILD grub-9999.ebuild 6880 RMD160 a13cdc18bd1cd9bb34ac1802664eb1d81a2a1c56 SHA1 2d36b85f91550d6145aff640e638e8082baadb48 SHA256 9464f357d91d8294438d7083ba8cffccdf619b1664284a737bb339610f886135 +MISC ChangeLog 40270 RMD160 f89e9723c370b1381b5fcc5fd38080234bfce0ae SHA1 54d6e844d111dc0ef01d2cfa0c0e7feb7ee6d2aa SHA256 a49bc1390df66b43f0cf85650b01afafd33a9e2d8ef06d4286ff1431f3f4919b MISC metadata.xml 673 RMD160 2181a768c776eed3e76c3604a2a0c03be360aa06 SHA1 0434ff5fb3b8702ca4a4661240ed08cfb06c529c SHA256 e14e5e46b726a3645b85217a2afbd5b04adb54990c7db837e01a50a8322d81b9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk+bYp0ACgkQC77qH+pIQ6SGngD6A7lpyC5xcqbBTuLS2CwcVVAC -ovtdtkM6AmCV8b3KLAwA/1m+4hrGTiF+R/4LdFV7V3RO7YSgO1P2VEUIl1sFg6y8 -=fNLB +iF4EAREIAAYFAk+q9wEACgkQC77qH+pIQ6StEgEArhPBHK29fk951rUtJ0Fh1pIV +K6B5YEwj/TxhA+qh2LoBAK9WNcRyPt2/skpN5Mm+v6JzxMpacC1Y7AygyWydojej +=Y8HF -----END PGP SIGNATURE----- diff --git a/sys-boot/grub/grub-2.00_beta5.ebuild b/sys-boot/grub/grub-2.00_beta5.ebuild new file mode 100644 index 000000000000..0a449791f5d4 --- /dev/null +++ b/sys-boot/grub/grub-2.00_beta5.ebuild @@ -0,0 +1,284 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00_beta5.ebuild,v 1.1 2012/05/09 23:00:07 floppym Exp $ + +EAPI=4 + +if [[ ${PV} == "9999" ]] ; then + EBZR_REPO_URI="http://bzr.savannah.gnu.org/r/grub/trunk/grub/" + LIVE_ECLASS="bzr" + SRC_URI="" + DO_AUTORECONF="true" +else + MY_P=${P/_/\~} + if [[ ${PV} == *_alpha* || ${PV} == *_beta* ]]; then + SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz" + else + SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz + mirror://gentoo/${MY_P}.tar.xz" + fi + # Masked until documentation guys consolidate the guide and approve + # it for usage. + #KEYWORDS="~amd64 ~mips ~x86" + S=${WORKDIR}/${MY_P} +fi + +inherit eutils flag-o-matic pax-utils toolchain-funcs ${DO_AUTORECONF:+autotools} ${LIVE_ECLASS} +unset LIVE_ECLASS + +DESCRIPTION="GNU GRUB boot loader" +HOMEPAGE="http://www.gnu.org/software/grub/" + +LICENSE="GPL-3" +SLOT="2" +IUSE="custom-cflags debug device-mapper efiemu mount nls static sdl truetype libzfs" + +GRUB_PLATFORMS=( + # everywhere: + emu + # mips only: + qemu-mips yeeloong + # amd64, x86, ppc, ppc64: + ieee1275 + # amd64, x86: + coreboot multiboot efi-32 pc qemu + # amd64, ia64: + efi-64 +) +IUSE+=" ${GRUB_PLATFORMS[@]/#/grub_platforms_}" + +# os-prober: Used on runtime to detect other OSes +# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue +RDEPEND=" + dev-libs/lzo + >=sys-libs/ncurses-5.2-r5 + 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 + >=media-fonts/unifont-5 + ) +" +DEPEND="${RDEPEND} + >=dev-lang/python-2.5.2 + sys-devel/flex + virtual/yacc + sys-apps/texinfo + static? ( + truetype? ( + app-arch/bzip2[static-libs(+)] + media-libs/freetype[static-libs(+)] + sys-libs/zlib[static-libs(+)] + ) + ) +" +RDEPEND+=" + grub_platforms_efi-32? ( sys-boot/efibootmgr ) + grub_platforms_efi-64? ( sys-boot/efibootmgr ) +" +if [[ -n ${DO_AUTORECONF} ]] ; then + DEPEND+=" >=sys-devel/autogen-5.10 sys-apps/help2man" +else + DEPEND+=" app-arch/xz-utils" +fi + +export STRIP_MASK="*/grub/*/*.{mod,img}" + +QA_EXECSTACK=" + usr/bin/grub* + usr/sbin/grub* + usr/lib*/grub/*/*.mod + usr/lib*/grub/*/kernel.exec + usr/lib*/grub/*/kernel.img + usr/lib*/grub/*/setjmp.module +" + +QA_WX_LOAD=" + usr/lib*/grub/*/kernel.exec + usr/lib*/grub/*/kernel.img + usr/lib*/grub/*/*.image +" + +QA_PRESTRIPPED=" + usr/lib.*/grub/.*/kernel.img +" + +grub_run_phase() { + local phase=$1 + local platform=$2 + [[ -z ${phase} || -z ${platform} ]] && die "${FUNCNAME} [phase] [platform]" + + [[ -d "${WORKDIR}/build-${platform}" ]] || \ + { mkdir "${WORKDIR}/build-${platform}" || die ; } + pushd "${WORKDIR}/build-${platform}" > /dev/null || die + + echo ">>> Running ${phase} for platform \"${platform}\"" + echo ">>> Working in: \"${WORKDIR}/build-${platform}\"" + + grub_${phase} ${platform} + + popd > /dev/null || die +} + +grub_src_configure() { + local platform=$1 + local with_platform= + + [[ -z ${platform} ]] && die "${FUNCNAME} [platform]" + + # Used below for efi cross-building + tc-export CC NM OBJCOPY STRIP + + estack_push CTARGET "${CTARGET}" + estack_push TARGET_CC "${TARGET_CC}" + estack_push TARGET_CFLAGS "${TARGET_CFLAGS}" + estack_push TARGET_CPPFLAGS "${TARGET_CPPFLAGS}" + + case ${platform} in + efi-32) + if [[ ${CHOST} == x86_64* ]]; then + CTARGET="${CTARGET:-i386}" + TARGET_CC="${TARGET_CC:-${CC}}" + export TARGET_CC + fi + with_platform="--with-platform=efi" + ;; + efi-64) + if [[ ${CHOST} == i?86* ]]; then + CTARGET="${CTARGET:-x86_64}" + TARGET_CC="${TARGET_CC:-${CC}}" + TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}" + TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}" + export TARGET_CC TARGET_CFLAGS TARGET_CPPFLAGS + fi + with_platform="--with-platform=efi" + ;; + guessed) ;; + *) with_platform="--with-platform=${platform}" ;; + esac + + ECONF_SOURCE="${S}" \ + econf \ + --disable-werror \ + --program-prefix= \ + --program-transform-name="s,grub,grub2," \ + --with-grubdir=grub2 \ + ${with_platform} \ + $(use_enable debug mm-debug) \ + $(use_enable debug grub-emu-usb) \ + $(use_enable device-mapper) \ + $(use_enable efiemu) \ + $(use_enable mount grub-mount) \ + $(use_enable nls) \ + $(use_enable truetype grub-mkfont) \ + $(use_enable libzfs) \ + $(use sdl && use_enable debug grub-emu-sdl) + + estack_pop CTARGET CTARGET || die + estack_pop TARGET_CC TARGET_CC || die + estack_pop TARGET_CFLAGS TARGET_CFLAGS || die + estack_pop TARGET_CPPFLAGS TARGET_CPPFLAGS || die +} + +grub_src_compile() { + default_src_compile + pax-mark -mpes "${grub_binaries[@]}" +} + +grub_src_install() { + default_src_install +} + +src_prepare() { + local i j + + epatch_user + + # autogen.sh does more than just run autotools + if [[ -n ${DO_AUTORECONF} ]] ; then + sed -i -e '/^autoreconf/s:^:set +e; e:' autogen.sh || die + (. ./autogen.sh) || die + fi + + # install into the right dir for eselect #372735 + sed -i \ + -e '/^bashcompletiondir =/s:=.*:= $(datarootdir)/bash-completion:' \ + util/bash-completion.d/Makefile.in || die + + # get enabled platforms + GRUB_ENABLED_PLATFORMS="" + for i in ${GRUB_PLATFORMS[@]}; do + use grub_platforms_${i} && GRUB_ENABLED_PLATFORMS+=" ${i}" + done + [[ -z ${GRUB_ENABLED_PLATFORMS} ]] && GRUB_ENABLED_PLATFORMS="guessed" + elog "Going to build following platforms: ${GRUB_ENABLED_PLATFORMS}" +} + +src_configure() { + local i + + use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS + use libzfs && addpredict /etc/dfs + use static && append-ldflags -static + + for i in ${GRUB_ENABLED_PLATFORMS}; do + grub_run_phase ${FUNCNAME} ${i} + done +} + +src_compile() { + # Used for pax marking in grub_src_compile + local grub_binaries=( + grub-editenv + grub-fstest + grub-menulst2cfg + grub-mkimage + grub-mklayout + grub-mkpasswd-pbkdf2 + grub-mkrelpath + grub-script-check + grub-bios-setup + grub-ofpathname + grub-probe + grub-sparc64-setup + ) + use mount && grub_binaries+=( grub-mount ) + use truetype && grub_binaries+=( grub-mkfont ) + + local i + + for i in ${GRUB_ENABLED_PLATFORMS}; do + grub_run_phase ${FUNCNAME} ${i} + done +} + +src_install() { + local i + + for i in ${GRUB_ENABLED_PLATFORMS}; do + grub_run_phase ${FUNCNAME} ${i} + done + + mv "${ED}"usr/share/info/grub{,2}.info || die + + # can't be in docs array as we use default_src_install in different builddir + dodoc AUTHORS ChangeLog NEWS README THANKS TODO + insinto /etc/default + newins "${FILESDIR}"/grub.default grub +} + +pkg_postinst() { + # display the link to guide + elog "For information on how to configure grub-2 please refer to the guide:" + elog " http://wiki.gentoo.org/wiki/GRUB2_Quick_Start" + if ! has_version sys-boot/os-prober; then + elog "Install sys-boot/os-prober to enable detection of other operating systems using grub2-mkconfig." + fi + if ! has_version dev-libs/libisoburn; then + elog "Install dev-libs/libisoburn to enable creation of rescue media using grub2-mkrescue." + fi +} diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild index 31bb3e76423d..5dab916399ef 100644 --- a/sys-boot/grub/grub-9999.ebuild +++ b/sys-boot/grub/grub-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.62 2012/04/28 03:23:03 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.63 2012/05/09 23:00:07 floppym Exp $ EAPI=4 @@ -50,9 +50,7 @@ IUSE+=" ${GRUB_PLATFORMS[@]/#/grub_platforms_}" # os-prober: Used on runtime to detect other OSes # xorriso (dev-libs/libisoburn): Used on runtime for mkrescue RDEPEND=" - dev-libs/libisoburn dev-libs/lzo - sys-boot/os-prober >=sys-libs/ncurses-5.2-r5 debug? ( sdl? ( media-libs/libsdl ) @@ -277,4 +275,10 @@ pkg_postinst() { # display the link to guide elog "For information on how to configure grub-2 please refer to the guide:" elog " http://wiki.gentoo.org/wiki/GRUB2_Quick_Start" + if ! has_version sys-boot/os-prober; then + elog "Install sys-boot/os-prober to enable detection of other operating systems using grub2-mkconfig." + fi + if ! has_version dev-libs/libisoburn; then + elog "Install dev-libs/libisoburn to enable creation of rescue media using grub2-mkrescue." + fi } |