diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2012-03-06 00:58:38 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2012-03-06 00:58:38 +0000 |
| commit | c8d88af1eb7457e597f21c73fedc3b933a3666ce (patch) | |
| tree | 9d2c79bf7885e5a6124065dd9abcad6f1d8e9576 /sys-boot | |
| parent | 0.8.41 version bump. (diff) | |
| download | gentoo-2-c8d88af1eb7457e597f21c73fedc3b933a3666ce.tar.gz gentoo-2-c8d88af1eb7457e597f21c73fedc3b933a3666ce.tar.bz2 gentoo-2-c8d88af1eb7457e597f21c73fedc3b933a3666ce.zip | |
Don't use the platform to tranform the utility names; it's pointless. Users may need to specify the --target option if grub2-install fails to auto-detect it.
(Portage version: 2.2.0_alpha89/cvs/Linux x86_64)
Diffstat (limited to 'sys-boot')
| -rw-r--r-- | sys-boot/grub/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-boot/grub/grub-2.00_beta0.ebuild | 9 | ||||
| -rw-r--r-- | sys-boot/grub/grub-9999.ebuild | 9 |
3 files changed, 11 insertions, 15 deletions
diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog index 7ae493a6051b..0b807a987a5c 100644 --- a/sys-boot/grub/ChangeLog +++ b/sys-boot/grub/ChangeLog @@ -1,6 +1,12 @@ # 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.182 2012/03/04 21:23:33 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.183 2012/03/06 00:58:38 floppym Exp $ + + 06 Mar 2012; Mike Gilbert <floppym@gentoo.org> grub-2.00_beta0.ebuild, + grub-9999.ebuild: + Don't use the platform to tranform the utility names; it's pointless. Users + may need to specify the --target option if grub2-install fails to auto-detect + it. 04 Mar 2012; Mike Gilbert <floppym@gentoo.org> grub-2.00_beta0.ebuild, grub-9999.ebuild: diff --git a/sys-boot/grub/grub-2.00_beta0.ebuild b/sys-boot/grub/grub-2.00_beta0.ebuild index 832646c7752b..d5a0fe21449c 100644 --- a/sys-boot/grub/grub-2.00_beta0.ebuild +++ b/sys-boot/grub/grub-2.00_beta0.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-2.00_beta0.ebuild,v 1.4 2012/03/04 21:23:33 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00_beta0.ebuild,v 1.5 2012/03/06 00:58:38 floppym Exp $ EAPI=4 @@ -114,15 +114,10 @@ grub_run_phase() { grub_src_configure() { local platform=$1 local target - local transform="grub2" local with_platform [[ -z ${platform} ]] && die "${FUNCNAME} [platform]" - if [[ ${platform} != "guessed" ]]; then - transform="grub2-${platform}" - fi - # check if we have to specify the target (EFI) # or just append correct --with-platform if [[ ${platform} == efi* ]]; then @@ -143,7 +138,7 @@ grub_src_configure() { ECONF_SOURCE="${S}" \ econf \ --disable-werror \ - --program-transform-name="s,grub,${transform}," \ + --program-transform-name="s,grub,grub2," \ --with-grubdir=grub2 \ $(use_enable debug mm-debug) \ $(use_enable debug grub-emu-usb) \ diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild index 1bd100c5b5e2..05dbd3209313 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.53 2012/03/04 21:23:33 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.54 2012/03/06 00:58:38 floppym Exp $ EAPI=4 @@ -114,15 +114,10 @@ grub_run_phase() { grub_src_configure() { local platform=$1 local target - local transform="grub2" local with_platform [[ -z ${platform} ]] && die "${FUNCNAME} [platform]" - if [[ ${platform} != "guessed" ]]; then - transform="grub2-${platform}" - fi - # check if we have to specify the target (EFI) # or just append correct --with-platform if [[ ${platform} == efi* ]]; then @@ -143,7 +138,7 @@ grub_src_configure() { ECONF_SOURCE="${S}" \ econf \ --disable-werror \ - --program-transform-name="s,grub,${transform}," \ + --program-transform-name="s,grub,grub2," \ --with-grubdir=grub2 \ $(use_enable debug mm-debug) \ $(use_enable debug grub-emu-usb) \ |