spock 09/03/22 21:30:38
Modified: memtest86-3.3.ebuild ChangeLog memtest86-3.4.ebuild
Log:
Fix bug #260547 (drop the /etc/fstab -> GRUB translation code).
(Portage version: 2.1.6.9/cvs/Linux x86_64)
Revision Changes Path
1.4 sys-apps/memtest86/memtest86-3.3.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/memtest86/memtest86-3.3.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/memtest86/memtest86-3.3.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/memtest86/memtest86-3.3.ebuild?r1=1.3&r2=1.4
Index: memtest86-3.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/memtest86/memtest86-3.3.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- memtest86-3.3.ebuild 13 Oct 2007 14:14:52 -0000 1.3
+++ memtest86-3.3.ebuild 22 Mar 2009 21:30:38 -0000 1.4
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 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-3.3.ebuild,v 1.3 2007/10/13 14:14:52 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/memtest86-3.3.ebuild,v 1.4 2009/03/22 21:30:38 spock Exp $
inherit mount-boot eutils
@@ -43,30 +43,10 @@
einfo "memtest.bin has been installed in /boot/memtest86/"
einfo "You may wish to update your bootloader configs"
einfo "by adding these lines:"
- einfo " - For grub:"
+ einfo " - For grub: (replace '?' with correct numbers for your boot partition)"
+ einfo " > root (hd?,?)"
einfo " > title=Memtest86"
-
- # a little magic to make users' life as easy as possible ;)
- bootpart=0
- root="(hd0,0)"
- res=`grep /boot /etc/fstab | grep -v "^#" | awk '{print $1}' | grep '/dev/hd[a-z0-9]\+'`
- if [ -n "${res}" ] ; then
- bootpart=1
- else
- res=`grep -v '^#' /etc/fstab | grep -e '/dev/hd[a-z0-9]\+[[:space:]]\+\/[[:space:]]\+' | awk '{print $1}'`
- fi
-
- if [ -n "${res}" ] ; then
- root=`echo ${res} | grep -o '[a-z][0-9]' | tr -t a-z 0123456789 | sed -e 's/\([0-9]\)\([0-9]\)/\1 \2/' | awk '{print "(hd" $1 "," $2-1 ")" }'`
- fi
-
- einfo " > root ${root}"
- if [ "${bootpart}" -eq 1 ] ; then
- einfo " > kernel /memtest86/memtest.bin"
- else
- einfo " > kernel /boot/memtest86/memtest.bin"
- fi
-
+ einfo " > kernel /boot/memtest86/memtest.bin"
einfo " - For lilo:"
einfo " > image = /boot/memtest86/memtest.bin"
einfo " > label = Memtest86"
1.35 sys-apps/memtest86/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/memtest86/ChangeLog?rev=1.35&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/memtest86/ChangeLog?rev=1.35&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/memtest86/ChangeLog?r1=1.34&r2=1.35
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/memtest86/ChangeLog,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- ChangeLog 28 Sep 2008 11:01:23 -0000 1.34
+++ ChangeLog 22 Mar 2009 21:30:38 -0000 1.35
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/memtest86
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/ChangeLog,v 1.34 2008/09/28 11:01:23 spock Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/ChangeLog,v 1.35 2009/03/22 21:30:38 spock Exp $
+
+ 22 Mar 2009; Michał Januszewski <spock@g.o> memtest86-3.3.ebuild,
+ memtest86-3.4.ebuild:
+ Fix bug #260547 (drop the /etc/fstab -> GRUB translation code).
28 Sep 2008; Michał Januszewski <spock@g.o> Manifest:
Compile memtest86+ with -O1 instead of -Os (bug #217324).
1.2 sys-apps/memtest86/memtest86-3.4.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/memtest86/memtest86-3.4.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/memtest86/memtest86-3.4.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/memtest86/memtest86-3.4.ebuild?r1=1.1&r2=1.2
Index: memtest86-3.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/memtest86/memtest86-3.4.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- memtest86-3.4.ebuild 19 Jan 2008 22:10:59 -0000 1.1
+++ memtest86-3.4.ebuild 22 Mar 2009 21:30:38 -0000 1.2
@@ -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-3.4.ebuild,v 1.1 2008/01/19 22:10:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/memtest86-3.4.ebuild,v 1.2 2009/03/22 21:30:38 spock Exp $
inherit mount-boot eutils
@@ -43,30 +43,10 @@
einfo "memtest.bin has been installed in /boot/memtest86/"
einfo "You may wish to update your bootloader configs"
einfo "by adding these lines:"
- einfo " - For grub:"
+ einfo " - For grub: (replace '?' with correct numbers for your boot partition)"
einfo " > title=Memtest86"
-
- # a little magic to make users' life as easy as possible ;)
- bootpart=0
- root="(hd0,0)"
- res=`grep /boot /etc/fstab | grep -v "^#" | awk '{print $1}' | grep '/dev/hd[a-z0-9]\+'`
- if [ -n "${res}" ] ; then
- bootpart=1
- else
- res=`grep -v '^#' /etc/fstab | grep -e '/dev/hd[a-z0-9]\+[[:space:]]\+\/[[:space:]]\+' | awk '{print $1}'`
- fi
-
- if [ -n "${res}" ] ; then
- root=`echo ${res} | grep -o '[a-z][0-9]' | tr -t a-z 0123456789 | sed -e 's/\([0-9]\)\([0-9]\)/\1 \2/' | awk '{print "(hd" $1 "," $2-1 ")" }'`
- fi
-
- einfo " > root ${root}"
- if [ "${bootpart}" -eq 1 ] ; then
- einfo " > kernel /memtest86/memtest.bin"
- else
- einfo " > kernel /boot/memtest86/memtest.bin"
- fi
-
+ einfo " > root (hd?,?)"
+ einfo " > kernel /boot/memtest86/memtest.bin"
einfo " - For lilo:"
einfo " > image = /boot/memtest86/memtest.bin"
einfo " > label = Memtest86"
|
