public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Ben Kohler" <bkohler@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/
Date: Fri,  3 Dec 2021 16:17:22 +0000 (UTC)	[thread overview]
Message-ID: <1638548190.aee0712e4c0cf7c15440ebfca9eff372ce93d2b1.bkohler@gentoo> (raw)

commit:     aee0712e4c0cf7c15440ebfca9eff372ce93d2b1
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  3 16:13:41 2021 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri Dec  3 16:16:30 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aee0712e

sys-apps/memtest86+: attempt fix for "oversized on x86_64"

Fix from https://bugzilla.redhat.com/show_bug.cgi?id=620846#c10

Bug: https://bugs.gentoo.org/613196

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 sys-apps/memtest86+/memtest86+-5.31b-r2.ebuild | 116 +++++++++++++++++++++++++
 1 file changed, 116 insertions(+)

diff --git a/sys-apps/memtest86+/memtest86+-5.31b-r2.ebuild b/sys-apps/memtest86+/memtest86+-5.31b-r2.ebuild
new file mode 100644
index 000000000000..3962c3e9f986
--- /dev/null
+++ b/sys-apps/memtest86+/memtest86+-5.31b-r2.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit mount-boot toolchain-funcs
+
+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="-* ~amd64 ~x86"
+IUSE="+boot floppy iso serial"
+
+BOOTDIR="/boot/memtest86plus"
+QA_PRESTRIPPED="${BOOTDIR#/}/memtest usr/share/${PN}/memtest"
+QA_FLAGS_IGNORED="${BOOTDIR#/}/memtest usr/share/${PN}/memtest"
+
+RDEPEND="floppy? ( sys-fs/mtools )"
+DEPEND="${RDEPEND}"
+BDEPEND="iso? ( app-cdr/cdrtools )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-gcc-473.patch"
+	"${FILESDIR}/${P}-hardcoded_cc.patch"
+	"${FILESDIR}/${P}-no-clean.patch" #557890
+	"${FILESDIR}/${P}-objcopy.patch"
+	"${FILESDIR}/${P}-test-random-cflags.patch" #590974
+	"${FILESDIR}/${P}-fix-gcc8-freeze-crash.patch"
+)
+
+pkg_pretend() {
+	use boot && mount-boot_pkg_pretend
+}
+
+src_prepare() {
+	sed -i -e 's,0x10000,0x100000,' memtest.lds || die
+	sed -i 's:genisoimage:mkisofs:' makeiso.sh || die
+
+	if use serial ; then
+		sed -i -e '/^#define SERIAL_CONSOLE_DEFAULT/s:0:1:' \
+			config.h || die "sed failed"
+	fi
+	#613196
+	use amd64 && sed -i -e's,$(LD) -s -T memtest.lds,$(LD) -s -T memtest.lds -z max-page-size=0x1000,' Makefile
+	default
+}
+
+src_configure() {
+	tc-ld-disable-gold #580212
+	tc-export AS CC LD
+}
+
+src_compile() {
+	emake OBJCOPY="$(tc-getOBJCOPY)"
+	if use iso ; then
+		./makeiso.sh || die
+	fi
+}
+
+src_test() { :; }
+
+src_install() {
+	if use boot ; then
+		insinto "${BOOTDIR}"
+		doins memtest memtest.bin
+	fi
+
+	insinto /usr/share/${PN}
+	use iso && newins mt*.iso memtest.iso
+	doins memtest memtest.bin
+
+	exeinto /etc/grub.d
+	newexe "${FILESDIR}"/39_${PN}-r1 39_${PN}
+
+	dodoc README README.build-process FAQ changelog
+
+	if use floppy ; then
+		dobin "${FILESDIR}"/make-memtest86+-boot-floppy
+		doman "${FILESDIR}"/make-memtest86+-boot-floppy.1
+	fi
+}
+
+pkg_preinst() {
+	use boot && mount-boot_pkg_preinst
+}
+
+pkg_postinst() {
+	if use boot; then
+		mount-boot_pkg_postinst
+
+		elog "memtest86+ has been installed in ${BOOTDIR}/"
+		elog "You may wish to update your bootloader configs:"
+		elog " - For grub2 just re-run grub-mkconfig -o /boot/grub/grub.cfg, since a"
+		elog "   config generator has been installed at /etc/grub.d/39_${PN}"
+		elog " - For lilo, add the following to /etc/lilo.conf and re-run lilo:"
+		elog "    > image  = ${BOOTDIR}/memtest.bin"
+		elog "    > label  = ${PN}"
+		elog ""
+		elog "Note: For older configs, you might have to change from 'memtest' to 'memtest.bin'."
+	fi
+
+	if use boot && [ -e /sys/firmware/efi ]; then
+		ewarn "WARNING: You appear to be booted in EFI mode but ${PN} is a BIOS-only tool."
+	fi
+}
+
+pkg_prerm() {
+	use boot && mount-boot_pkg_prerm
+}
+
+pkg_postrm() {
+	use boot && mount-boot_pkg_postrm
+}


             reply	other threads:[~2021-12-03 16:17 UTC|newest]

Thread overview: 53+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-03 16:17 Ben Kohler [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-11-14 19:01 [gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/ Ben Kohler
2024-03-29 15:18 Ben Kohler
2024-01-14 21:00 Ben Kohler
2024-01-07 17:19 Andrew Ammerlaan
2023-12-28 14:16 Ben Kohler
2023-11-03 12:23 Ben Kohler
2023-08-17  7:49 Andrew Ammerlaan
2023-07-14 13:00 Ben Kohler
2023-05-19 13:17 Ben Kohler
2023-05-19 13:05 Ben Kohler
2023-05-10 18:02 Ben Kohler
2023-03-31 12:57 Ben Kohler
2023-03-30 16:42 Sam James
2023-03-30 16:12 Arthur Zamarin
2023-02-05 13:35 Ben Kohler
2023-02-03 13:02 Ben Kohler
2022-12-30 15:59 Ben Kohler
2022-11-30  0:52 Sam James
2022-11-30  0:52 Sam James
2022-11-12 15:36 Ben Kohler
2022-10-25 18:05 Sam James
2022-10-25 13:00 Ben Kohler
2022-08-16 15:15 Ben Kohler
2022-07-18 13:47 Ben Kohler
2022-07-02 12:01 Ben Kohler
2022-07-01 15:36 Ben Kohler
2022-06-29 15:42 Ben Kohler
2022-06-14 16:05 Ben Kohler
2022-01-18 12:24 Sam James
2022-01-18 12:24 Sam James
2022-01-04 16:13 Ben Kohler
2021-12-03 16:17 Ben Kohler
2021-10-03 11:28 David Seifert
2021-09-16 14:56 Ben Kohler
2021-09-16 14:56 Ben Kohler
2021-08-13 13:22 Lars Wendler
2021-05-26  8:33 David Seifert
2021-05-23 23:05 Agostino Sarubbo
2021-05-23 22:28 Agostino Sarubbo
2021-04-21 19:02 Sam James
2019-11-13 19:58 Aaron Bauman
2019-09-01  7:43 Mikle Kolyada
2018-08-08 21:56 Mikle Kolyada
2018-08-06 22:20 Thomas Deutschmann
2018-06-19 19:54 Richard Farina
2018-06-03  2:59 Aaron Bauman
2017-03-17 10:26 Agostino Sarubbo
2017-03-17 10:15 Agostino Sarubbo
2017-03-15  7:45 Mike Frysinger
2017-03-14 23:37 Mike Frysinger
2017-02-09 15:29 Mike Frysinger
2015-12-12 23:24 Mike Frysinger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1638548190.aee0712e4c0cf7c15440ebfca9eff372ce93d2b1.bkohler@gentoo \
    --to=bkohler@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox