diff options
author | Michael Januszewski <spock@gentoo.org> | 2005-02-10 09:21:31 +0000 |
---|---|---|
committer | Michael Januszewski <spock@gentoo.org> | 2005-02-10 09:21:31 +0000 |
commit | f8d71a1983bc510496190673d92bdf2c4a917c09 (patch) | |
tree | c9fc495205b9d04c04182485ec099413ec4efe41 /sys-apps | |
parent | (Portage version: 2.0.51-r15) (Manifest recommit) (diff) | |
download | gentoo-2-f8d71a1983bc510496190673d92bdf2c4a917c09.tar.gz gentoo-2-f8d71a1983bc510496190673d92bdf2c4a917c09.tar.bz2 gentoo-2-f8d71a1983bc510496190673d92bdf2c4a917c09.zip |
Cleaned the 1.50 ebuild up a little bit. Removed old ebuilds.
(Portage version: 2.0.51.16)
Diffstat (limited to 'sys-apps')
-rw-r--r-- | sys-apps/memtest86+/ChangeLog | 6 | ||||
-rw-r--r-- | sys-apps/memtest86+/files/digest-memtest86+-1.11 | 1 | ||||
-rw-r--r-- | sys-apps/memtest86+/files/digest-memtest86+-1.30 | 1 | ||||
-rw-r--r-- | sys-apps/memtest86+/memtest86+-1.11.ebuild | 74 | ||||
-rw-r--r-- | sys-apps/memtest86+/memtest86+-1.30.ebuild | 68 | ||||
-rw-r--r-- | sys-apps/memtest86+/memtest86+-1.50.ebuild | 14 |
6 files changed, 13 insertions, 151 deletions
diff --git a/sys-apps/memtest86+/ChangeLog b/sys-apps/memtest86+/ChangeLog index 83216c830a53..9ee1a66fe510 100644 --- a/sys-apps/memtest86+/ChangeLog +++ b/sys-apps/memtest86+/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/memtest86+ # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/ChangeLog,v 1.17 2005/01/24 10:37:47 spock Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/ChangeLog,v 1.18 2005/02/10 09:21:31 spock Exp $ + + 10 Feb 2005; Michał Januszewski <spock@gentoo.org> + -memtest86+-1.11.ebuild, -memtest86+-1.30.ebuild, memtest86+-1.50.ebuild: + Cleaned the 1.50 ebuild up a little bit. Removed old ebuilds. 24 Jan 2005; Michał Januszewski <spock@gentoo.org> +files/memtest86+-1.50-hardened.patch, memtest86+-1.40.ebuild, diff --git a/sys-apps/memtest86+/files/digest-memtest86+-1.11 b/sys-apps/memtest86+/files/digest-memtest86+-1.11 deleted file mode 100644 index 77d1efac33ea..000000000000 --- a/sys-apps/memtest86+/files/digest-memtest86+-1.11 +++ /dev/null @@ -1 +0,0 @@ -MD5 55246f7734daedd88abe97a2b1cf98d9 memtest_source_v1.11.tar.gz 123182 diff --git a/sys-apps/memtest86+/files/digest-memtest86+-1.30 b/sys-apps/memtest86+/files/digest-memtest86+-1.30 deleted file mode 100644 index 7c1ee90e7b36..000000000000 --- a/sys-apps/memtest86+/files/digest-memtest86+-1.30 +++ /dev/null @@ -1 +0,0 @@ -MD5 f38fb2bc0e041c29ab9526b7ea431122 memtest86+-1.30.tar.gz 136002 diff --git a/sys-apps/memtest86+/memtest86+-1.11.ebuild b/sys-apps/memtest86+/memtest86+-1.11.ebuild deleted file mode 100644 index 2d0e92ec82dd..000000000000 --- a/sys-apps/memtest86+/memtest86+-1.11.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-1.11.ebuild,v 1.6 2005/01/22 15:16:13 spock Exp $ - -inherit mount-boot - -DESCRIPTION="Memory tester based on memtest86" -HOMEPAGE="http://www.memtest.org/" -SRC_URI="http://www.memtest.org/download/memtest_source_v${PV}.tar.gz" -MY_P=${P/-/_v} -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="x86" -IUSE="serial" -DEPEND="virtual/libc" - -S=${WORKDIR}/${MY_P} - -src_unpack() { - unpack ${A} - cd ${S} - - # a little fix to make gcc-3.3.x happy - sed -e '/DISCARD/d' -i memtest_shared.lds - - if use serial ; then - sed -e 's/#define SERIAL_CONSOLE_DEFAULT 0/#define SERIAL_CONSOLE_DEFAULT 1/' -i config.h - fi -} - -src_compile() { - emake || die -} - -src_install() { - dodir /boot/memtest86plus - cp memtest.bin ${D}/boot/memtest86plus/memtest.bin - dodoc README README.build-process -} - -pkg_postinst() { - einfo - einfo "memtest.bin has been installed in /boot/memtest86plus/" - einfo "You may wish to update your bootloader configs" - einfo "by adding these lines:" - einfo " - For grub:" - einfo " > title=Memtest86Plus" - - # a little magic to make users' life as easy as possible ;) - bootpart=0 - root="(hd0,0)" - res=`cat /etc/fstab | grep /boot | grep -v "^#" | awk '{print $1}' | grep '/dev/hd[a-z0-9]\+'` - if [ -n "${res}" ] ; then - bootpart=1 - else - res=`cat /etc/fstab | grep -v '^#' | 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 /memtest86plus/memtest.bin" - else - einfo " > kernel /boot/memtest86plus/memtest.bin" - fi - - einfo " - For lilo:" - einfo " > image = /boot/memtest86plus/memtest.bin" - einfo " > label = Memtest86Plus" - einfo -} diff --git a/sys-apps/memtest86+/memtest86+-1.30.ebuild b/sys-apps/memtest86+/memtest86+-1.30.ebuild deleted file mode 100644 index 685e686c9f4a..000000000000 --- a/sys-apps/memtest86+/memtest86+-1.30.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-1.30.ebuild,v 1.3 2005/01/22 15:16:13 spock Exp $ - -inherit mount-boot - -DESCRIPTION="Memory tester based on memtest86" -HOMEPAGE="http://www.memtest.org/" -SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="x86" -IUSE="serial" -DEPEND="virtual/libc" - -src_unpack() { - unpack ${A} - cd ${S} - - if use serial ; then - sed -e 's/#define SERIAL_CONSOLE_DEFAULT 0/#define SERIAL_CONSOLE_DEFAULT 1/' -i config.h - fi -} - -src_compile() { - emake || die -} - -src_install() { - dodir /boot/memtest86plus - cp memtest.bin ${D}/boot/memtest86plus/memtest.bin - dodoc README README.build-process -} - -pkg_postinst() { - einfo - einfo "memtest.bin has been installed in /boot/memtest86plus/" - einfo "You may wish to update your bootloader configs" - einfo "by adding these lines:" - einfo " - For grub:" - einfo " > title=Memtest86Plus" - - # a little magic to make users' life as easy as possible ;) - bootpart=0 - root="(hd0,0)" - res=`cat /etc/fstab | grep /boot | grep -v "^#" | awk '{print $1}' | grep '/dev/hd[a-z0-9]\+'` - if [ -n "${res}" ] ; then - bootpart=1 - else - res=`cat /etc/fstab | grep -v '^#' | 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 /memtest86plus/memtest.bin" - else - einfo " > kernel /boot/memtest86plus/memtest.bin" - fi - - einfo " - For lilo:" - einfo " > image = /boot/memtest86plus/memtest.bin" - einfo " > label = Memtest86Plus" - einfo -} diff --git a/sys-apps/memtest86+/memtest86+-1.50.ebuild b/sys-apps/memtest86+/memtest86+-1.50.ebuild index d85759942e78..dc114af89cd5 100644 --- a/sys-apps/memtest86+/memtest86+-1.50.ebuild +++ b/sys-apps/memtest86+/memtest86+-1.50.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-1.50.ebuild,v 1.3 2005/01/24 20:32:22 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-1.50.ebuild,v 1.4 2005/02/10 09:21:31 spock Exp $ inherit mount-boot eutils @@ -18,7 +18,7 @@ src_unpack() { cd ${S} # send the DOS newlines where they belong - /dev/null ;> - sed -e 's/\x0d//g' -i Makefile + sed -e 's/\x0d//g' -i Makefile || die epatch "${FILESDIR}"/${P}-hardened.patch if use serial ; then sed -e 's/#define SERIAL_CONSOLE_DEFAULT 0/#define SERIAL_CONSOLE_DEFAULT 1/' -i config.h @@ -31,7 +31,7 @@ src_compile() { src_install() { dodir /boot/memtest86plus - cp memtest.bin ${D}/boot/memtest86plus/memtest.bin + cp memtest.bin ${D}/boot/memtest86plus/memtest.bin || die dodoc README README.build-process } @@ -46,15 +46,17 @@ pkg_postinst() { # a little magic to make users' life as easy as possible ;) bootpart=0 root="(hd0,0)" - res=`cat /etc/fstab | grep /boot | grep -v "^#" | awk '{print $1}' | grep '/dev/hd[a-z0-9]\+'` + res=`grep /boot /etc/fstab | grep -v "^#" | awk '{print $1}' | grep '/dev/hd[a-z0-9]\+'` if [ -n "${res}" ] ; then bootpart=1 else - res=`cat /etc/fstab | grep -v '^#' | grep -e '/dev/hd[a-z0-9]\+[[:space:]]\+\/[[:space:]]\+' | awk '{print $1}'` + 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 ")" }'` + 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}" |