From b354db006149dcfc0b6a7e8bc574258e7810a10d Mon Sep 17 00:00:00 2001 From: Michael Januszewski Date: Sun, 22 Mar 2009 08:40:40 +0000 Subject: Remove GRUB device ID translation code (bug #260547). (Portage version: 2.1.6.9/cvs/Linux x86_64) --- sys-apps/memtest86+/ChangeLog | 6 +++++- sys-apps/memtest86+/memtest86+-2.01.ebuild | 19 +++---------------- sys-apps/memtest86+/memtest86+-2.10.ebuild | 19 +++---------------- sys-apps/memtest86+/memtest86+-2.11.ebuild | 19 +++---------------- 4 files changed, 14 insertions(+), 49 deletions(-) (limited to 'sys-apps/memtest86+') diff --git a/sys-apps/memtest86+/ChangeLog b/sys-apps/memtest86+/ChangeLog index 8c550bf2a422..61b54e3f03e4 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.47 2009/02/09 21:26:48 spock Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/ChangeLog,v 1.48 2009/03/22 08:40:40 spock Exp $ + + 22 Mar 2009; Michał Januszewski + memtest86+-2.01.ebuild, memtest86+-2.10.ebuild, memtest86+-2.11.ebuild: + Remove GRUB device ID translation code (bug #260547). 09 Feb 2009; Michał Januszewski memtest86+-2.01.ebuild, memtest86+-2.10.ebuild, memtest86+-2.11.ebuild: diff --git a/sys-apps/memtest86+/memtest86+-2.01.ebuild b/sys-apps/memtest86+/memtest86+-2.01.ebuild index 797d0a371f28..82bd91fa28bf 100644 --- a/sys-apps/memtest86+/memtest86+-2.01.ebuild +++ b/sys-apps/memtest86+/memtest86+-2.01.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.01.ebuild,v 1.3 2009/02/09 21:26:48 spock Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-2.01.ebuild,v 1.4 2009/03/22 08:40:40 spock Exp $ inherit mount-boot eutils @@ -44,22 +44,9 @@ pkg_postinst() { einfo "You may wish to update your bootloader configs" einfo "by adding these lines:" - # a little magic to make users' life as easy as possible ;) - local fstab=${ROOT}/etc/fstab - local root="(hd0,0)" - local res=$(awk '$2 == "/boot" {print $1}' "${fstab}") - if [[ -z ${res} ]] ; then - res=$(awk '$2 == "/" {print $1}' "${fstab}") - fi - 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:3}-1)))" - fi - einfo " - For grub:" + einfo " - For grub: (replace '?' with correct numbers for your boot partition)" einfo " > title=Memtest86Plus" - einfo " > root ${root}" + einfo " > root (hd?,?)" einfo " > kernel /boot/memtest86plus/memtest.bin" einfo " - For lilo:" diff --git a/sys-apps/memtest86+/memtest86+-2.10.ebuild b/sys-apps/memtest86+/memtest86+-2.10.ebuild index 5057f465108e..7218fc73af37 100644 --- a/sys-apps/memtest86+/memtest86+-2.10.ebuild +++ b/sys-apps/memtest86+/memtest86+-2.10.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.10.ebuild,v 1.2 2009/02/09 21:26:48 spock Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-2.10.ebuild,v 1.3 2009/03/22 08:40:40 spock Exp $ inherit mount-boot eutils @@ -44,22 +44,9 @@ pkg_postinst() { einfo "You may wish to update your bootloader configs" einfo "by adding these lines:" - # a little magic to make users' life as easy as possible ;) - local fstab=${ROOT}/etc/fstab - local root="(hd0,0)" - local res=$(awk '$2 == "/boot" {print $1}' "${fstab}") - if [[ -z ${res} ]] ; then - res=$(awk '$2 == "/" {print $1}' "${fstab}") - fi - 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:3}-1)))" - fi - einfo " - For grub:" + einfo " - For grub: (replace '?' with correct numbers for your boot partition)" einfo " > title=Memtest86Plus" - einfo " > root ${root}" + einfo " > root (hd?,?)" einfo " > kernel /boot/memtest86plus/memtest.bin" einfo " - For lilo:" diff --git a/sys-apps/memtest86+/memtest86+-2.11.ebuild b/sys-apps/memtest86+/memtest86+-2.11.ebuild index 05e9a31a6751..4c80150c8c48 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.2 2009/02/09 21:26:48 spock Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-2.11.ebuild,v 1.3 2009/03/22 08:40:40 spock Exp $ inherit mount-boot eutils @@ -45,22 +45,9 @@ pkg_postinst() { einfo "You may wish to update your bootloader configs" einfo "by adding these lines:" - # a little magic to make users' life as easy as possible ;) - local fstab=${ROOT}/etc/fstab - local root="(hd0,0)" - local res=$(awk '$2 == "/boot" {print $1}' "${fstab}") - if [[ -z ${res} ]] ; then - res=$(awk '$2 == "/" {print $1}' "${fstab}") - fi - 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:3}-1)))" - fi - einfo " - For grub:" + einfo " - For grub: (replace '?' with correct numbers for your boot partition)" einfo " > title=Memtest86Plus" - einfo " > root ${root}" + einfo " > root (hd?,?)" einfo " > kernel /boot/memtest86plus/memtest.bin" einfo " - For lilo:" -- cgit v1.2.3-65-gdbad