Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/grub-xen-host/
Date: Sun, 14 Apr 2019 08:50:49
Message-Id: 1555231808.cde8e8b9498d4159c3cd490d0f7d3dd77b0c98d4.mgorny@gentoo
1 commit: cde8e8b9498d4159c3cd490d0f7d3dd77b0c98d4
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Apr 14 08:50:07 2019 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Apr 14 08:50:08 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cde8e8b9
7
8 app-emulation/grub-xen-host: Replace STRIP_MASK with RESTRICT=strip
9
10 While at it, replace QA* with RESTRICT=binchecks and add missing ||die.
11
12 Closes: https://bugs.gentoo.org/651420
13 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
14
15 app-emulation/grub-xen-host/grub-xen-host-1.0.ebuild | 12 ++++--------
16 1 file changed, 4 insertions(+), 8 deletions(-)
17
18 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
19 index 8fe09f145e0..9150a04e8c8 100644
20 --- a/app-emulation/grub-xen-host/grub-xen-host-1.0.ebuild
21 +++ b/app-emulation/grub-xen-host/grub-xen-host-1.0.ebuild
22 @@ -1,4 +1,4 @@
23 -# Copyright 1999-2016 Gentoo Foundation
24 +# Copyright 1999-2019 Gentoo Authors
25 # Distributed under the terms of the GNU General Public License v2
26
27 EAPI=5
28 @@ -18,22 +18,18 @@ RDEPEND="${DEPEND}"
29
30 S="${WORKDIR}"
31
32 -STRIP_MASK="usr/libexec/xen/bin/grub-x86_64-xen.bin"
33 -QA_EXECSTACK="usr/libexec/xen/bin/grub-x86_64-xen.bin"
34 -QA_WX_LOAD="usr/libexec/xen/bin/grub-x86_64-xen.bin"
35 -QA_PRESTRIPPED="usr/libexec/xen/bin/grub-x86_64-xen.bin"
36 -RESTRICT="test"
37 +RESTRICT="binchecks strip test"
38
39 src_configure() {
40 :
41 }
42
43 src_compile() {
44 - cat > "${S}/grub-bootstrap.cfg" <<- EOF
45 + cat > "${S}/grub-bootstrap.cfg" <<- EOF || die
46 normal (memdisk)/grub.cfg
47 EOF
48
49 - cat > "${S}/grub.cfg" <<- EOF
50 + cat > "${S}/grub.cfg" <<- EOF || die
51 if search -s -f /boot/xen/pvboot-x86_64.elf ; then
52 echo "Chainloading (${root})/boot/xen/pvboot-x86_64.elf"
53 multiboot "/boot/xen/pvboot-x86_64.elf"