Gentoo Archives: gentoo-commits

From: Ben Kohler <bkohler@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/
Date: Tue, 04 Jan 2022 16:13:51
Message-Id: 1641312810.e31b337e39136bb119ac45d63e1dcbb99ba55790.bkohler@gentoo
1 commit: e31b337e39136bb119ac45d63e1dcbb99ba55790
2 Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 4 15:48:36 2022 +0000
4 Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 4 16:13:30 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e31b337e
7
8 sys-apps/memtest86+: drop old
9
10 Package-Manager: Portage-3.0.30, Repoman-3.0.3
11 Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
12
13 sys-apps/memtest86+/memtest86+-5.31b-r1.ebuild | 114 ------------------------
14 sys-apps/memtest86+/memtest86+-5.31b-r2.ebuild | 116 -------------------------
15 2 files changed, 230 deletions(-)
16
17 diff --git a/sys-apps/memtest86+/memtest86+-5.31b-r1.ebuild b/sys-apps/memtest86+/memtest86+-5.31b-r1.ebuild
18 deleted file mode 100644
19 index f1d2ec759176..000000000000
20 --- a/sys-apps/memtest86+/memtest86+-5.31b-r1.ebuild
21 +++ /dev/null
22 @@ -1,114 +0,0 @@
23 -# Copyright 1999-2021 Gentoo Authors
24 -# Distributed under the terms of the GNU General Public License v2
25 -
26 -EAPI=7
27 -
28 -inherit mount-boot toolchain-funcs
29 -
30 -DESCRIPTION="Memory tester based on memtest86"
31 -HOMEPAGE="http://www.memtest.org/"
32 -SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz"
33 -
34 -LICENSE="GPL-2"
35 -SLOT="0"
36 -KEYWORDS="-* ~amd64 ~x86"
37 -IUSE="+boot floppy iso serial"
38 -
39 -BOOTDIR="/boot/memtest86plus"
40 -QA_PRESTRIPPED="${BOOTDIR#/}/memtest usr/share/${PN}/memtest"
41 -QA_FLAGS_IGNORED="${BOOTDIR#/}/memtest usr/share/${PN}/memtest"
42 -
43 -RDEPEND="floppy? ( sys-fs/mtools )"
44 -DEPEND="${RDEPEND}"
45 -BDEPEND="iso? ( app-cdr/cdrtools )"
46 -
47 -PATCHES=(
48 - "${FILESDIR}/${P}-gcc-473.patch"
49 - "${FILESDIR}/${P}-hardcoded_cc.patch"
50 - "${FILESDIR}/${P}-no-clean.patch" #557890
51 - "${FILESDIR}/${P}-objcopy.patch"
52 - "${FILESDIR}/${P}-test-random-cflags.patch" #590974
53 - "${FILESDIR}/${P}-fix-gcc8-freeze-crash.patch"
54 -)
55 -
56 -pkg_pretend() {
57 - use boot && mount-boot_pkg_pretend
58 -}
59 -
60 -src_prepare() {
61 - sed -i -e 's,0x10000,0x100000,' memtest.lds || die
62 - sed -i 's:genisoimage:mkisofs:' makeiso.sh || die
63 -
64 - if use serial ; then
65 - sed -i -e '/^#define SERIAL_CONSOLE_DEFAULT/s:0:1:' \
66 - config.h || die "sed failed"
67 - fi
68 - default
69 -}
70 -
71 -src_configure() {
72 - tc-ld-disable-gold #580212
73 - tc-export AS CC LD
74 -}
75 -
76 -src_compile() {
77 - emake OBJCOPY="$(tc-getOBJCOPY)"
78 - if use iso ; then
79 - ./makeiso.sh || die
80 - fi
81 -}
82 -
83 -src_test() { :; }
84 -
85 -src_install() {
86 - if use boot ; then
87 - insinto "${BOOTDIR}"
88 - doins memtest memtest.bin
89 - fi
90 -
91 - insinto /usr/share/${PN}
92 - use iso && newins mt*.iso memtest.iso
93 - doins memtest memtest.bin
94 -
95 - exeinto /etc/grub.d
96 - newexe "${FILESDIR}"/39_${PN}-r1 39_${PN}
97 -
98 - dodoc README README.build-process FAQ changelog
99 -
100 - if use floppy ; then
101 - dobin "${FILESDIR}"/make-memtest86+-boot-floppy
102 - doman "${FILESDIR}"/make-memtest86+-boot-floppy.1
103 - fi
104 -}
105 -
106 -pkg_preinst() {
107 - use boot && mount-boot_pkg_preinst
108 -}
109 -
110 -pkg_postinst() {
111 - if use boot; then
112 - mount-boot_pkg_postinst
113 -
114 - elog "memtest86+ has been installed in ${BOOTDIR}/"
115 - elog "You may wish to update your bootloader configs:"
116 - elog " - For grub2 just re-run grub-mkconfig -o /boot/grub/grub.cfg, since a"
117 - elog " config generator has been installed at /etc/grub.d/39_${PN}"
118 - elog " - For lilo, add the following to /etc/lilo.conf and re-run lilo:"
119 - elog " > image = ${BOOTDIR}/memtest.bin"
120 - elog " > label = ${PN}"
121 - elog ""
122 - elog "Note: For older configs, you might have to change from 'memtest' to 'memtest.bin'."
123 - fi
124 -
125 - if use boot && [ -e /sys/firmware/efi ]; then
126 - ewarn "WARNING: You appear to be booted in EFI mode but ${PN} is a BIOS-only tool."
127 - fi
128 -}
129 -
130 -pkg_prerm() {
131 - use boot && mount-boot_pkg_prerm
132 -}
133 -
134 -pkg_postrm() {
135 - use boot && mount-boot_pkg_postrm
136 -}
137
138 diff --git a/sys-apps/memtest86+/memtest86+-5.31b-r2.ebuild b/sys-apps/memtest86+/memtest86+-5.31b-r2.ebuild
139 deleted file mode 100644
140 index 3962c3e9f986..000000000000
141 --- a/sys-apps/memtest86+/memtest86+-5.31b-r2.ebuild
142 +++ /dev/null
143 @@ -1,116 +0,0 @@
144 -# Copyright 1999-2021 Gentoo Authors
145 -# Distributed under the terms of the GNU General Public License v2
146 -
147 -EAPI=7
148 -
149 -inherit mount-boot toolchain-funcs
150 -
151 -DESCRIPTION="Memory tester based on memtest86"
152 -HOMEPAGE="http://www.memtest.org/"
153 -SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz"
154 -
155 -LICENSE="GPL-2"
156 -SLOT="0"
157 -KEYWORDS="-* ~amd64 ~x86"
158 -IUSE="+boot floppy iso serial"
159 -
160 -BOOTDIR="/boot/memtest86plus"
161 -QA_PRESTRIPPED="${BOOTDIR#/}/memtest usr/share/${PN}/memtest"
162 -QA_FLAGS_IGNORED="${BOOTDIR#/}/memtest usr/share/${PN}/memtest"
163 -
164 -RDEPEND="floppy? ( sys-fs/mtools )"
165 -DEPEND="${RDEPEND}"
166 -BDEPEND="iso? ( app-cdr/cdrtools )"
167 -
168 -PATCHES=(
169 - "${FILESDIR}/${P}-gcc-473.patch"
170 - "${FILESDIR}/${P}-hardcoded_cc.patch"
171 - "${FILESDIR}/${P}-no-clean.patch" #557890
172 - "${FILESDIR}/${P}-objcopy.patch"
173 - "${FILESDIR}/${P}-test-random-cflags.patch" #590974
174 - "${FILESDIR}/${P}-fix-gcc8-freeze-crash.patch"
175 -)
176 -
177 -pkg_pretend() {
178 - use boot && mount-boot_pkg_pretend
179 -}
180 -
181 -src_prepare() {
182 - sed -i -e 's,0x10000,0x100000,' memtest.lds || die
183 - sed -i 's:genisoimage:mkisofs:' makeiso.sh || die
184 -
185 - if use serial ; then
186 - sed -i -e '/^#define SERIAL_CONSOLE_DEFAULT/s:0:1:' \
187 - config.h || die "sed failed"
188 - fi
189 - #613196
190 - use amd64 && sed -i -e's,$(LD) -s -T memtest.lds,$(LD) -s -T memtest.lds -z max-page-size=0x1000,' Makefile
191 - default
192 -}
193 -
194 -src_configure() {
195 - tc-ld-disable-gold #580212
196 - tc-export AS CC LD
197 -}
198 -
199 -src_compile() {
200 - emake OBJCOPY="$(tc-getOBJCOPY)"
201 - if use iso ; then
202 - ./makeiso.sh || die
203 - fi
204 -}
205 -
206 -src_test() { :; }
207 -
208 -src_install() {
209 - if use boot ; then
210 - insinto "${BOOTDIR}"
211 - doins memtest memtest.bin
212 - fi
213 -
214 - insinto /usr/share/${PN}
215 - use iso && newins mt*.iso memtest.iso
216 - doins memtest memtest.bin
217 -
218 - exeinto /etc/grub.d
219 - newexe "${FILESDIR}"/39_${PN}-r1 39_${PN}
220 -
221 - dodoc README README.build-process FAQ changelog
222 -
223 - if use floppy ; then
224 - dobin "${FILESDIR}"/make-memtest86+-boot-floppy
225 - doman "${FILESDIR}"/make-memtest86+-boot-floppy.1
226 - fi
227 -}
228 -
229 -pkg_preinst() {
230 - use boot && mount-boot_pkg_preinst
231 -}
232 -
233 -pkg_postinst() {
234 - if use boot; then
235 - mount-boot_pkg_postinst
236 -
237 - elog "memtest86+ has been installed in ${BOOTDIR}/"
238 - elog "You may wish to update your bootloader configs:"
239 - elog " - For grub2 just re-run grub-mkconfig -o /boot/grub/grub.cfg, since a"
240 - elog " config generator has been installed at /etc/grub.d/39_${PN}"
241 - elog " - For lilo, add the following to /etc/lilo.conf and re-run lilo:"
242 - elog " > image = ${BOOTDIR}/memtest.bin"
243 - elog " > label = ${PN}"
244 - elog ""
245 - elog "Note: For older configs, you might have to change from 'memtest' to 'memtest.bin'."
246 - fi
247 -
248 - if use boot && [ -e /sys/firmware/efi ]; then
249 - ewarn "WARNING: You appear to be booted in EFI mode but ${PN} is a BIOS-only tool."
250 - fi
251 -}
252 -
253 -pkg_prerm() {
254 - use boot && mount-boot_pkg_prerm
255 -}
256 -
257 -pkg_postrm() {
258 - use boot && mount-boot_pkg_postrm
259 -}