Gentoo Archives: gentoo-commits

From: "Diego Petteno (flameeyes)" <flameeyes@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/memtest86+: memtest86+-4.20-r1.ebuild ChangeLog memtest86+-4.10-r1.ebuild memtest86+-2.11.ebuild memtest86+-2.10.ebuild memtest86+-4.20.ebuild memtest86+-4.10.ebuild
Date: Mon, 02 Jul 2012 11:02:14
Message-Id: 20120702110200.5031D2004C@flycatcher.gentoo.org
1 flameeyes 12/07/02 11:02:00
2
3 Modified: ChangeLog
4 Added: memtest86+-4.20-r1.ebuild
5 Removed: memtest86+-4.10-r1.ebuild memtest86+-2.11.ebuild
6 memtest86+-2.10.ebuild memtest86+-4.20.ebuild
7 memtest86+-4.10.ebuild
8 Log:
9 Cleanup old; revbump to make the ebuild look more almost identical to the new one from memtest86; install a grub2 configuration file; limit to the 0-slot of grub for the floppy USE flag; strip during build as we can't use the splitdebug anyway.
10
11 (Portage version: 2.2.0_alpha114/cvs/Linux x86_64)
12
13 Revision Changes Path
14 1.65 sys-apps/memtest86+/ChangeLog
15
16 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/memtest86+/ChangeLog?rev=1.65&view=markup
17 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/memtest86+/ChangeLog?rev=1.65&content-type=text/plain
18 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/memtest86+/ChangeLog?r1=1.64&r2=1.65
19
20 Index: ChangeLog
21 ===================================================================
22 RCS file: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/ChangeLog,v
23 retrieving revision 1.64
24 retrieving revision 1.65
25 diff -u -r1.64 -r1.65
26 --- ChangeLog 18 Jun 2011 20:32:42 -0000 1.64
27 +++ ChangeLog 2 Jul 2012 11:02:00 -0000 1.65
28 @@ -1,6 +1,20 @@
29 # ChangeLog for sys-apps/memtest86+
30 -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
31 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/ChangeLog,v 1.64 2011/06/18 20:32:42 hwoarang Exp $
32 +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
33 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/ChangeLog,v 1.65 2012/07/02 11:02:00 flameeyes Exp $
34 +
35 +*memtest86+-4.20-r1 (02 Jul 2012)
36 +
37 + 02 Jul 2012; Diego E. Pettenò <flameeyes@g.o>
38 + +files/memtest86+-4.20-hardcoded_cc.patch, +memtest86+-4.20-r1.ebuild,
39 + -files/memtest86+-2.10-hardcoded_cc.patch,
40 + -files/memtest86+-2.11-hardcoded_cc.patch,
41 + -files/memtest86+-4.10-hardcoded_cc.patch, -memtest86+-2.10.ebuild,
42 + -memtest86+-2.11.ebuild, -memtest86+-4.10-r1.ebuild, -memtest86+-4.10.ebuild,
43 + -memtest86+-4.20.ebuild:
44 + Cleanup old; revbump to make the ebuild look more almost identical to the new
45 + one from memtest86; install a grub2 configuration file; limit to the 0-slot of
46 + grub for the floppy USE flag; strip during build as we can't use the
47 + splitdebug anyway.
48
49 18 Jun 2011; Markos Chandras <hwoarang@g.o> metadata.xml:
50 no maintainer info required since it is already maintained by base-system
51 @@ -296,4 +310,3 @@
52 metadata.xml:
53 Initial commit, closes bug #38828, thanks to Frank Dörfler for the original
54 ebuild.
55 -
56
57
58
59 1.1 sys-apps/memtest86+/memtest86+-4.20-r1.ebuild
60
61 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/memtest86+/memtest86+-4.20-r1.ebuild?rev=1.1&view=markup
62 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/memtest86+/memtest86+-4.20-r1.ebuild?rev=1.1&content-type=text/plain
63
64 Index: memtest86+-4.20-r1.ebuild
65 ===================================================================
66 # Copyright 1999-2012 Gentoo Foundation
67 # Distributed under the terms of the GNU General Public License v2
68 # $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-4.20-r1.ebuild,v 1.1 2012/07/02 11:02:00 flameeyes Exp $
69
70 EAPI=4
71
72 inherit mount-boot eutils toolchain-funcs
73
74 DESCRIPTION="Memory tester based on memtest86"
75 HOMEPAGE="http://www.memtest.org/"
76 SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz"
77
78 LICENSE="GPL-2"
79 SLOT="0"
80 KEYWORDS="-* ~amd64 ~x86"
81 IUSE="floppy serial"
82
83 BOOTDIR=/boot/memtest86plus
84 QA_PRESTRIPPED="${BOOTDIR}/memtest.netbsd"
85
86 RDEPEND="floppy? ( >=sys-boot/grub-0.95:0 sys-fs/mtools )"
87 DEPEND=""
88
89 src_prepare() {
90 epatch "${FILESDIR}"/${PN}-4.20-hardcoded_cc.patch
91
92 sed -i -e 's,0x10000,0x100000,' memtest.lds || die
93
94 if use serial ; then
95 sed -i \
96 -e '/^#define SERIAL_CONSOLE_DEFAULT/s:0:1:' \
97 config.h \
98 || die "sed failed"
99 fi
100
101 cat - > "${T}"/39_${PN} <<EOF
102 #!/bin/sh
103 exec tail -n +3 \$0
104
105 menuentry "${PN} ${PV}" {
106 linux16 ${BOOTDIR}/memtest
107 }
108
109 menuentry "${PN} ${PV} (netbsd)" {
110 insmod bsd
111 knetbsd ${BOOTDIR}/memtest.netbsd
112 }
113 EOF
114
115 tc-export AS CC LD
116 }
117
118 src_test() { :; }
119
120 src_install() {
121 insinto ${BOOTDIR}
122 newins memtest.bin memtest
123 newins memtest memtest.netbsd
124 dosym memtest ${BOOTDIR}/memtest.bin
125
126 exeinto /etc/grub.d
127 doexe "${T}"/39_${PN}
128
129 dodoc README README.build-process FAQ changelog
130
131 if use floppy ; then
132 dobin "${FILESDIR}"/make-memtest86+-boot-floppy
133 doman "${FILESDIR}"/make-memtest86+-boot-floppy.1
134 fi
135 }
136
137 pkg_postinst() {
138 mount-boot_pkg_postinst
139 elog
140 elog "memtest has been installed in ${BOOTDIR}/"
141 elog "You may wish to update your bootloader configs"
142 elog "by adding these lines:"
143 elog " - For grub2 just run grub-mkconfig, a configuration file is installed"
144 elog " as /etc/grub/39_${PN}"
145 elog " - For grub legacy: (replace '?' with correct numbers for your boot partition)"
146 elog " > title=${PN}"
147 elog " > root (hd?,?)"
148 elog " > kernel ${BOOTDIR}/memtest"
149 elog " - For lilo:"
150 elog " > image = ${BOOTDIR}/memtest"
151 elog " > label = ${PN}"
152 elog
153 }