From 6ce05dd6b231bcd06f833fb0449eab39b11fce1e Mon Sep 17 00:00:00 2001 From: Zero_Chaos Date: Tue, 19 Jun 2018 15:50:37 -0400 Subject: sys-apps/memtest86+: install to /usr/share/${PN} make the files available without forcing mount of /boot, mostly for the purposes of catalyst. committed with permission of floppym Package-Manager: Portage-2.3.40, Repoman-2.3.9 --- sys-apps/memtest86+/memtest86+-5.01-r3.ebuild | 90 -------------------- sys-apps/memtest86+/memtest86+-5.01-r4.ebuild | 114 ++++++++++++++++++++++++++ sys-apps/memtest86+/metadata.xml | 3 +- 3 files changed, 116 insertions(+), 91 deletions(-) delete mode 100644 sys-apps/memtest86+/memtest86+-5.01-r3.ebuild create mode 100644 sys-apps/memtest86+/memtest86+-5.01-r4.ebuild (limited to 'sys-apps/memtest86+') diff --git a/sys-apps/memtest86+/memtest86+-5.01-r3.ebuild b/sys-apps/memtest86+/memtest86+-5.01-r3.ebuild deleted file mode 100644 index 54b1ab6e21dc..000000000000 --- a/sys-apps/memtest86+/memtest86+-5.01-r3.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit mount-boot eutils 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="floppy iso serial" - -BOOTDIR="/boot/memtest86plus" -QA_PRESTRIPPED="${BOOTDIR}/memtest" -QA_FLAGS_IGNORED="${BOOTDIR}/memtest" - -RDEPEND="floppy? ( >=sys-boot/grub-0.95:0 sys-fs/mtools )" -DEPEND="iso? ( app-cdr/cdrtools )" - -src_prepare() { - sed -i -e 's,0x10000,0x100000,' memtest.lds || die - epatch "${FILESDIR}/${P}-gcc-473.patch" \ - "${FILESDIR}/${P}-hardcoded_cc.patch" - epatch "${FILESDIR}"/${P}-no-scp.patch - epatch "${FILESDIR}"/${P}-io-extern-inline.patch #548312 - epatch "${FILESDIR}"/${P}-reboot-def.patch #548312 - epatch "${FILESDIR}"/${P}-no-clean.patch #557890 - epatch "${FILESDIR}"/${P}-no-C-headers.patch #592638 - epatch "${FILESDIR}"/${P}-test-random-cflags.patch #590974 - - 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 -} - -src_configure() { - tc-ld-disable-gold #580212 - tc-export AS CC LD -} - -src_compile() { - emake - if use iso ; then - ./makeiso.sh || die - fi -} - -src_test() { :; } - -src_install() { - insinto "${BOOTDIR}" - 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_postinst() { - mount-boot_pkg_postinst - - elog "memtest86+ has been installed in ${BOOTDIR}/" - elog "You may wish to update your bootloader configs by adding these lines:" - elog " - For grub2 just run grub-mkconfig, a configuration file is installed" - elog " as /etc/grub.d/39_${PN}" - elog " - For grub legacy: (replace '?' with correct numbers for your boot partition)" - elog " > title=${PN}" - elog " > root (hd?,?)" - elog " > kernel ${BOOTDIR}/memtest.bin" - elog " - For 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'." -} diff --git a/sys-apps/memtest86+/memtest86+-5.01-r4.ebuild b/sys-apps/memtest86+/memtest86+-5.01-r4.ebuild new file mode 100644 index 000000000000..e9528e637a87 --- /dev/null +++ b/sys-apps/memtest86+/memtest86+-5.01-r4.ebuild @@ -0,0 +1,114 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit mount-boot eutils 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-boot/grub-0.95:0 sys-fs/mtools )" +DEPEND="iso? ( app-cdr/cdrtools )" + +pkg_pretend() { + use boot && mount-boot_pkg_pretend +} + +src_prepare() { + sed -i -e 's,0x10000,0x100000,' memtest.lds || die + epatch "${FILESDIR}/${P}-gcc-473.patch" \ + "${FILESDIR}/${P}-hardcoded_cc.patch" + epatch "${FILESDIR}"/${P}-no-scp.patch + epatch "${FILESDIR}"/${P}-io-extern-inline.patch #548312 + epatch "${FILESDIR}"/${P}-reboot-def.patch #548312 + epatch "${FILESDIR}"/${P}-no-clean.patch #557890 + epatch "${FILESDIR}"/${P}-no-C-headers.patch #592638 + epatch "${FILESDIR}"/${P}-test-random-cflags.patch #590974 + + 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 + default +} + +src_configure() { + tc-ld-disable-gold #580212 + tc-export AS CC LD +} + +src_compile() { + emake + 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 by adding these lines:" + elog " - For grub2 just run grub-mkconfig, a configuration file is installed" + elog " as /etc/grub.d/39_${PN}" + elog " - For grub legacy: (replace '?' with correct numbers for your boot partition)" + elog " > title=${PN}" + elog " > root (hd?,?)" + elog " > kernel ${BOOTDIR}/memtest.bin" + elog " - For 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 +} + +pkg_prerm() { + use boot && mount-boot_pkg_prerm +} + +pkg_postrm() { + use boot && mount-boot_pkg_postrm +} diff --git a/sys-apps/memtest86+/metadata.xml b/sys-apps/memtest86+/metadata.xml index fc17238d1174..1745d86466f6 100644 --- a/sys-apps/memtest86+/metadata.xml +++ b/sys-apps/memtest86+/metadata.xml @@ -6,8 +6,9 @@ Gentoo Base System - Compile with serial console support + Also install to /boot instead of just /usr/share/memtest86+/ Install a script to create floppy disks containing memtest86+ binaries. Compile an ISO image + Compile with serial console support -- cgit v1.2.3-65-gdbad