diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2011-11-11 13:42:09 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2011-11-11 13:42:09 +0000 |
| commit | 0c9f57ecc2dcc6e24540aab21edbc9a550bef28f (patch) | |
| tree | cc31ca04da6501526bbc9f1d8afdc28013f8b123 /sys-boot/grub | |
| parent | Marked stable on AMD64 based on arch testing by Ian "idella4" Delaney & Agost... (diff) | |
| download | gentoo-2-0c9f57ecc2dcc6e24540aab21edbc9a550bef28f.tar.gz gentoo-2-0c9f57ecc2dcc6e24540aab21edbc9a550bef28f.tar.bz2 gentoo-2-0c9f57ecc2dcc6e24540aab21edbc9a550bef28f.zip | |
Fix build of live ebuild after info manual fixes (bug #389685).
(Portage version: 2.2.0_alpha73/cvs/Linux x86_64)
Diffstat (limited to 'sys-boot/grub')
| -rw-r--r-- | sys-boot/grub/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-boot/grub/grub-1.99-r2.ebuild | 13 | ||||
| -rw-r--r-- | sys-boot/grub/grub-9999.ebuild | 13 |
3 files changed, 23 insertions, 9 deletions
diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog index 1c0c955a01db..e017e83907e9 100644 --- a/sys-boot/grub/ChangeLog +++ b/sys-boot/grub/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-boot/grub # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.171 2011/11/11 11:33:10 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.172 2011/11/11 13:42:09 flameeyes Exp $ + + 11 Nov 2011; Diego E. Pettenò <flameeyes@gentoo.org> grub-1.99-r2.ebuild, + grub-9999.ebuild: + Fix build of live ebuild after info manual fixes (bug #389685). 11 Nov 2011; Tomáš Chvátal <scarabeus@gentoo.org> metadata.xml: Drop me from maint. diff --git a/sys-boot/grub/grub-1.99-r2.ebuild b/sys-boot/grub/grub-1.99-r2.ebuild index 4133a4d176d2..d897605e2523 100644 --- a/sys-boot/grub/grub-1.99-r2.ebuild +++ b/sys-boot/grub/grub-1.99-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild,v 1.6 2011/11/02 15:09:11 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild,v 1.7 2011/11/11 13:42:09 flameeyes Exp $ EAPI=4 @@ -225,9 +225,14 @@ src_install() { grub_run_phase ${FUNCNAME} ${i} done - # slot all collisions with grub legacy - mv "${ED}"/usr/share/info/grub.info \ - "${ED}"/usr/share/info/grub2.info || die + # No need to move the info file with the live ebuild since we + # already changed the generated file name during the preparation + # phase. + if [[ ${PV} != "9999" ]]; then + # slot all collisions with grub legacy + mv "${ED}"/usr/share/info/grub.info \ + "${ED}"/usr/share/info/grub2.info || die + fi # Do pax marking local PAX=( diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild index b3b77b56ded6..4cb523da4a70 100644 --- a/sys-boot/grub/grub-9999.ebuild +++ b/sys-boot/grub/grub-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 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.45 2011/11/02 15:09:11 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.46 2011/11/11 13:42:09 flameeyes Exp $ EAPI=4 @@ -221,9 +221,14 @@ src_install() { grub_run_phase ${FUNCNAME} ${i} done - # slot all collisions with grub legacy - mv "${ED}"/usr/share/info/grub.info \ - "${ED}"/usr/share/info/grub2.info || die + # No need to move the info file with the live ebuild since we + # already changed the generated file name during the preparation + # phase. + if [[ ${PV} != "9999" ]]; then + # slot all collisions with grub legacy + mv "${ED}"/usr/share/info/grub.info \ + "${ED}"/usr/share/info/grub2.info || die + fi # Do pax marking local PAX=( |