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 CC16C139694 for ; Tue, 14 Mar 2017 23:37:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E2659E0D47; Tue, 14 Mar 2017 23:37:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C3394E0D47 for ; Tue, 14 Mar 2017 23:37:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AA144340806 for ; Tue, 14 Mar 2017 23:37:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4F9A0686C for ; Tue, 14 Mar 2017 23:37:23 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1489534602.b3ca615823c5b0ec731a4e0045c80492690d9597.vapier@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-r2.ebuild sys-apps/memtest86+/metadata.xml X-VCS-Directories: sys-apps/memtest86+/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: b3ca615823c5b0ec731a4e0045c80492690d9597 X-VCS-Branch: master Date: Tue, 14 Mar 2017 23:37:23 +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: b721df77-98ad-4d97-9d34-9fa50fcae52c X-Archives-Hash: 128436a05e2665756e7a751b15247863 commit: b3ca615823c5b0ec731a4e0045c80492690d9597 Author: Mike Frysinger gentoo org> AuthorDate: Tue Mar 14 23:28:01 2017 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Tue Mar 14 23:36:42 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3ca6158 sys-apps/memtest86+: add USE=iso for building+installing a bootable ISO image sys-apps/memtest86+/memtest86+-5.01-r2.ebuild | 13 +++++++++++-- sys-apps/memtest86+/metadata.xml | 1 + 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/sys-apps/memtest86+/memtest86+-5.01-r2.ebuild b/sys-apps/memtest86+/memtest86+-5.01-r2.ebuild index 88964bdaa1a..2b3c9eba4f6 100644 --- a/sys-apps/memtest86+/memtest86+-5.01-r2.ebuild +++ b/sys-apps/memtest86+/memtest86+-5.01-r2.ebuild @@ -12,14 +12,14 @@ SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="-* ~amd64 ~x86" -IUSE="floppy serial" +IUSE="floppy iso serial" BOOTDIR=/boot/memtest86plus QA_PRESTRIPPED="${BOOTDIR}/memtest.netbsd" QA_FLAGS_IGNORED="${BOOTDIR}/memtest.netbsd" RDEPEND="floppy? ( >=sys-boot/grub-0.95:0 sys-fs/mtools )" -DEPEND="" +DEPEND="iso? ( app-cdr/cdrtools )" src_prepare() { sed -i -e 's,0x10000,0x100000,' memtest.lds || die @@ -32,6 +32,7 @@ src_prepare() { 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:' \ @@ -45,10 +46,18 @@ src_configure() { 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 newins memtest.bin memtest newins memtest memtest.netbsd dosym memtest ${BOOTDIR}/memtest.bin diff --git a/sys-apps/memtest86+/metadata.xml b/sys-apps/memtest86+/metadata.xml index f10d5787ac5..fc17238d117 100644 --- a/sys-apps/memtest86+/metadata.xml +++ b/sys-apps/memtest86+/metadata.xml @@ -8,5 +8,6 @@ Compile with serial console support Install a script to create floppy disks containing memtest86+ binaries. + Compile an ISO image