From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A61F1138334 for ; Tue, 19 Jun 2018 19:54:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 68C7EE089A; Tue, 19 Jun 2018 19:54:33 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 222ABE089A for ; Tue, 19 Jun 2018 19:54:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ACB74335C7E for ; Tue, 19 Jun 2018 19:54:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C6CE62AD for ; Tue, 19 Jun 2018 19:54:27 +0000 (UTC) From: "Richard Farina" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Richard Farina" Message-ID: <1529438042.6ce05dd6b231bcd06f833fb0449eab39b11fce1e.zerochaos@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/memtest86+/memtest86+-5.01-r3.ebuild sys-apps/memtest86+/memtest86+-5.01-r4.ebuild sys-apps/memtest86+/metadata.xml X-VCS-Directories: sys-apps/memtest86+/ X-VCS-Committer: zerochaos X-VCS-Committer-Name: Richard Farina X-VCS-Revision: 6ce05dd6b231bcd06f833fb0449eab39b11fce1e X-VCS-Branch: master Date: Tue, 19 Jun 2018 19:54:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: bb8de09c-9f47-46e9-a937-56dafbc809a8 X-Archives-Hash: ea3a9dad95335ab852792445ea6f105b commit: 6ce05dd6b231bcd06f833fb0449eab39b11fce1e Author: Zero_Chaos gentoo org> AuthorDate: Tue Jun 19 19:50:37 2018 +0000 Commit: Richard Farina gentoo org> CommitDate: Tue Jun 19 19:54:02 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ce05dd6 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 ...6+-5.01-r3.ebuild => memtest86+-5.01-r4.ebuild} | 66 +++++++++++++++------- sys-apps/memtest86+/metadata.xml | 3 +- 2 files changed, 47 insertions(+), 22 deletions(-) diff --git a/sys-apps/memtest86+/memtest86+-5.01-r3.ebuild b/sys-apps/memtest86+/memtest86+-5.01-r4.ebuild similarity index 56% rename from sys-apps/memtest86+/memtest86+-5.01-r3.ebuild rename to sys-apps/memtest86+/memtest86+-5.01-r4.ebuild index 54b1ab6e21d..e9528e637a8 100644 --- a/sys-apps/memtest86+/memtest86+-5.01-r3.ebuild +++ b/sys-apps/memtest86+/memtest86+-5.01-r4.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI="6" inherit mount-boot eutils toolchain-funcs @@ -12,15 +12,19 @@ SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="-* ~amd64 ~x86" -IUSE="floppy iso serial" +IUSE="+boot floppy iso serial" BOOTDIR="/boot/memtest86plus" -QA_PRESTRIPPED="${BOOTDIR}/memtest" -QA_FLAGS_IGNORED="${BOOTDIR}/memtest" +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" \ @@ -39,6 +43,7 @@ src_prepare() { config.h \ || die "sed failed" fi + default } src_configure() { @@ -56,7 +61,12 @@ src_compile() { src_test() { :; } src_install() { - insinto "${BOOTDIR}" + 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 @@ -71,20 +81,34 @@ src_install() { fi } +pkg_preinst() { + use boot && mount-boot_pkg_preinst +} + 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'." + 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 fc17238d117..1745d86466f 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