diff options
| author |   Michael Januszewski <spock@gentoo.org> | 2009-02-09 21:26:48 +0000 |
|---|---|---|
| committer | Michael Januszewski <spock@gentoo.org> | 2009-02-09 21:26:48 +0000 |
| commit | 90259145e8411b555d6e0003910183a419296234 (patch) | |
| tree | 7c16ecba12713ed8acd23278569b8c5e88f71842 /sys-apps/memtest86+ | |
| parent | stable sparc, bug 258230 (diff) | |
| download | gentoo-2-90259145e8411b555d6e0003910183a419296234.tar.gz gentoo-2-90259145e8411b555d6e0003910183a419296234.tar.bz2 gentoo-2-90259145e8411b555d6e0003910183a419296234.zip | |
Fix GRUB device number translation code (bug #257767).
(Portage version: 2.1.6.7/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps/memtest86+')
| -rw-r--r-- | sys-apps/memtest86+/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/memtest86+/memtest86+-2.01.ebuild | 8 | ||||
| -rw-r--r-- | sys-apps/memtest86+/memtest86+-2.10.ebuild | 8 | ||||
| -rw-r--r-- | sys-apps/memtest86+/memtest86+-2.11.ebuild | 7 |
4 files changed, 17 insertions, 12 deletions
diff --git a/sys-apps/memtest86+/ChangeLog b/sys-apps/memtest86+/ChangeLog index cdf713e41d73..8c550bf2a422 100644 --- a/sys-apps/memtest86+/ChangeLog +++ b/sys-apps/memtest86+/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/memtest86+ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/ChangeLog,v 1.46 2009/01/03 12:38:55 spock Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/ChangeLog,v 1.47 2009/02/09 21:26:48 spock Exp $ + + 09 Feb 2009; Michał Januszewski <spock@gentoo.org> + memtest86+-2.01.ebuild, memtest86+-2.10.ebuild, memtest86+-2.11.ebuild: + Fix GRUB device number translation code (bug #257767). *memtest86+-2.11 (03 Jan 2009) diff --git a/sys-apps/memtest86+/memtest86+-2.01.ebuild b/sys-apps/memtest86+/memtest86+-2.01.ebuild index 4b341969e6ff..797d0a371f28 100644 --- a/sys-apps/memtest86+/memtest86+-2.01.ebuild +++ b/sys-apps/memtest86+/memtest86+-2.01.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-2.01.ebuild,v 1.2 2008/10/04 14:18:14 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-2.01.ebuild,v 1.3 2009/02/09 21:26:48 spock Exp $ inherit mount-boot eutils @@ -54,8 +54,8 @@ pkg_postinst() { if [[ -n ${res} ]] ; then # transform /dev/hd* magic into grub naming ... # /dev/hda1 -> a1 -> 01 - root=$(echo "${res}" | grep -o '[a-z][0-9]' | tr -t a-z 0123456789) - root="(hd${root:0:1},$((${root:1:1}-1)))" + root=$(echo "${res}" | grep -o '[a-z][0-9]\+' | tr -t a-z 0123456789) + root="(hd${root:0:1},$((${root:1:3}-1)))" fi einfo " - For grub:" einfo " > title=Memtest86Plus" diff --git a/sys-apps/memtest86+/memtest86+-2.10.ebuild b/sys-apps/memtest86+/memtest86+-2.10.ebuild index 17548f8540ca..5057f465108e 100644 --- a/sys-apps/memtest86+/memtest86+-2.10.ebuild +++ b/sys-apps/memtest86+/memtest86+-2.10.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-2.10.ebuild,v 1.1 2008/11/27 13:04:04 spock Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-2.10.ebuild,v 1.2 2009/02/09 21:26:48 spock Exp $ inherit mount-boot eutils @@ -54,8 +54,8 @@ pkg_postinst() { if [[ -n ${res} ]] ; then # transform /dev/hd* magic into grub naming ... # /dev/hda1 -> a1 -> 01 - root=$(echo "${res}" | grep -o '[a-z][0-9]' | tr -t a-z 0123456789) - root="(hd${root:0:1},$((${root:1:1}-1)))" + root=$(echo "${res}" | grep -o '[a-z][0-9]\+' | tr -t a-z 0123456789) + root="(hd${root:0:1},$((${root:1:3}-1)))" fi einfo " - For grub:" einfo " > title=Memtest86Plus" diff --git a/sys-apps/memtest86+/memtest86+-2.11.ebuild b/sys-apps/memtest86+/memtest86+-2.11.ebuild index 00b90c523ea6..05e9a31a6751 100644 --- a/sys-apps/memtest86+/memtest86+-2.11.ebuild +++ b/sys-apps/memtest86+/memtest86+-2.11.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-2.11.ebuild,v 1.1 2009/01/03 12:38:55 spock Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-2.11.ebuild,v 1.2 2009/02/09 21:26:48 spock Exp $ inherit mount-boot eutils @@ -15,6 +15,7 @@ IUSE="serial" RESTRICT="test" DEPEND="" +RDEPEND="" src_unpack() { unpack ${A} @@ -54,8 +55,8 @@ pkg_postinst() { if [[ -n ${res} ]] ; then # transform /dev/hd* magic into grub naming ... # /dev/hda1 -> a1 -> 01 - root=$(echo "${res}" | grep -o '[a-z][0-9]' | tr -t a-z 0123456789) - root="(hd${root:0:1},$((${root:1:1}-1)))" + root=$(echo "${res}" | grep -o '[a-z][0-9]\+' | tr -t a-z 0123456789) + root="(hd${root:0:1},$((${root:1:3}-1)))" fi einfo " - For grub:" einfo " > title=Memtest86Plus" |