1 |
commit: a3cd327576f1d40e8ddc69d1790173a2eaa45dc4 |
2 |
Author: Tomas Mozes <hydrapolic <AT> gmail <DOT> com> |
3 |
AuthorDate: Wed Apr 3 02:38:57 2019 +0000 |
4 |
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Apr 3 04:55:29 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3cd3275 |
7 |
|
8 |
app-emulation/xen-pvgrub: add missing || die |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/11531 |
11 |
Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com> |
12 |
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org> |
13 |
|
14 |
app-emulation/xen-pvgrub/xen-pvgrub-4.11.1.ebuild | 32 +++++++++++------------ |
15 |
1 file changed, 16 insertions(+), 16 deletions(-) |
16 |
|
17 |
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.11.1.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.11.1.ebuild |
18 |
index 967ef1c8722..90600bb0eee 100644 |
19 |
--- a/app-emulation/xen-pvgrub/xen-pvgrub-4.11.1.ebuild |
20 |
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.11.1.ebuild |
21 |
@@ -1,12 +1,12 @@ |
22 |
-# Copyright 1999-2018 Gentoo Authors |
23 |
+# Copyright 1999-2019 Gentoo Authors |
24 |
# Distributed under the terms of the GNU General Public License v2 |
25 |
|
26 |
-EAPI=6 |
27 |
+EAPI=7 |
28 |
|
29 |
PYTHON_COMPAT=( python2_7 ) |
30 |
PYTHON_REQ_USE='xml,threads' |
31 |
|
32 |
-inherit eutils flag-o-matic multilib python-single-r1 toolchain-funcs |
33 |
+inherit flag-o-matic multilib python-single-r1 toolchain-funcs |
34 |
|
35 |
XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles" |
36 |
LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci |
37 |
@@ -54,21 +54,21 @@ retar-externals() { |
38 |
# Purely to unclutter src_prepare |
39 |
local set="grub-0.97.tar.gz lwip-1.3.0.tar.gz newlib-1.16.0.tar.gz polarssl-1.1.4-gpl.tgz zlib-1.2.3.tar.gz" |
40 |
|
41 |
- # epatch can't patch in $WORKDIR, requires a sed; Bug #455194. Patchable, but sed informative |
42 |
+ # eapply can't patch in $WORKDIR, requires a sed; Bug #455194. Patchable, but sed informative |
43 |
sed -e s':AR=${AR-"ar rc"}:AR=${AR-"ar"}:' \ |
44 |
- -i "${WORKDIR}"/zlib-1.2.3/configure |
45 |
+ -i "${WORKDIR}"/zlib-1.2.3/configure || die |
46 |
sed -e 's:^AR=ar rc:AR=ar:' \ |
47 |
-e s':$(AR) $@:$(AR) rc $@:' \ |
48 |
- -i "${WORKDIR}"/zlib-1.2.3/{Makefile,Makefile.in} |
49 |
+ -i "${WORKDIR}"/zlib-1.2.3/{Makefile,Makefile.in} || die |
50 |
einfo "zlib Makefile edited" |
51 |
|
52 |
- cd "${WORKDIR}" |
53 |
- tar czp zlib-1.2.3 -f zlib-1.2.3.tar.gz |
54 |
- tar czp grub-0.97 -f grub-0.97.tar.gz |
55 |
- tar czp lwip -f lwip-1.3.0.tar.gz |
56 |
- tar czp newlib-1.16.0 -f newlib-1.16.0.tar.gz |
57 |
- tar czp polarssl-1.1.4 -f polarssl-1.1.4-gpl.tgz |
58 |
- mv $set "${S}"/stubdom/ |
59 |
+ cd "${WORKDIR}" || die |
60 |
+ tar czp zlib-1.2.3 -f zlib-1.2.3.tar.gz || die |
61 |
+ tar czp grub-0.97 -f grub-0.97.tar.gz || die |
62 |
+ tar czp lwip -f lwip-1.3.0.tar.gz || die |
63 |
+ tar czp newlib-1.16.0 -f newlib-1.16.0.tar.gz || die |
64 |
+ tar czp polarssl-1.1.4 -f polarssl-1.1.4-gpl.tgz || die |
65 |
+ mv $set "${S}"/stubdom/ || die |
66 |
einfo "tarballs moved to source" |
67 |
} |
68 |
|
69 |
@@ -79,7 +79,7 @@ src_prepare() { |
70 |
EPATCH_SUFFIX="patch" \ |
71 |
EPATCH_FORCE="yes" \ |
72 |
EPATCH_OPTS="-p1" \ |
73 |
- epatch "${WORKDIR}"/patches-upstream |
74 |
+ eapply "${WORKDIR}"/patches-upstream |
75 |
fi |
76 |
|
77 |
# if the user *really* wants to use their own custom-cflags, let them |
78 |
@@ -99,10 +99,10 @@ src_prepare() { |
79 |
cp "${FILESDIR}"/newlib-implicits.patch stubdom || die |
80 |
|
81 |
# Patch stubdom/Makefile to patch insource newlib & prevent internal downloading |
82 |
- epatch "${FILESDIR}"/${PN/-pvgrub/}-4.3-externals.patch |
83 |
+ eapply "${FILESDIR}"/${PN/-pvgrub/}-4.10-externals.patch |
84 |
|
85 |
# fix jobserver in Makefile |
86 |
- epatch "${FILESDIR}"/${PN}-4.8-jserver.patch |
87 |
+ eapply "${FILESDIR}"/${PN}-4.8-jserver.patch |
88 |
|
89 |
#Substitute for internal downloading. pciutils copied only due to the only .bz2 |
90 |
cp "${DISTDIR}"/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom" |