From cde8e8b9498d4159c3cd490d0f7d3dd77b0c98d4 Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Sun, 14 Apr 2019 10:50:07 +0200 Subject: app-emulation/grub-xen-host: Replace STRIP_MASK with RESTRICT=strip MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit While at it, replace QA* with RESTRICT=binchecks and add missing ||die. Closes: https://bugs.gentoo.org/651420 Signed-off-by: Michał Górny --- app-emulation/grub-xen-host/grub-xen-host-1.0.ebuild | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'app-emulation/grub-xen-host') diff --git a/app-emulation/grub-xen-host/grub-xen-host-1.0.ebuild b/app-emulation/grub-xen-host/grub-xen-host-1.0.ebuild index 8fe09f145e0f..9150a04e8c80 100644 --- a/app-emulation/grub-xen-host/grub-xen-host-1.0.ebuild +++ b/app-emulation/grub-xen-host/grub-xen-host-1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -18,22 +18,18 @@ RDEPEND="${DEPEND}" S="${WORKDIR}" -STRIP_MASK="usr/libexec/xen/bin/grub-x86_64-xen.bin" -QA_EXECSTACK="usr/libexec/xen/bin/grub-x86_64-xen.bin" -QA_WX_LOAD="usr/libexec/xen/bin/grub-x86_64-xen.bin" -QA_PRESTRIPPED="usr/libexec/xen/bin/grub-x86_64-xen.bin" -RESTRICT="test" +RESTRICT="binchecks strip test" src_configure() { : } src_compile() { - cat > "${S}/grub-bootstrap.cfg" <<- EOF + cat > "${S}/grub-bootstrap.cfg" <<- EOF || die normal (memdisk)/grub.cfg EOF - cat > "${S}/grub.cfg" <<- EOF + cat > "${S}/grub.cfg" <<- EOF || die if search -s -f /boot/xen/pvboot-x86_64.elf ; then echo "Chainloading (${root})/boot/xen/pvboot-x86_64.elf" multiboot "/boot/xen/pvboot-x86_64.elf" -- cgit v1.2.3-65-gdbad