| 1 |
commit: 111558ba21f63d5782a5509c0ed0d0a29bdbffd4 |
| 2 |
Author: Yixun Lan <dlan <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Dec 5 02:21:10 2017 +0000 |
| 4 |
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Dec 5 02:24:31 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=111558ba |
| 7 |
|
| 8 |
app-emulation/xen-tools: obsolete epatch in EAPI=6 |
| 9 |
|
| 10 |
replace epatch with eapply |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.16, Repoman-2.3.6 |
| 13 |
|
| 14 |
app-emulation/xen-tools/xen-tools-4.8.2-r3.ebuild | 20 ++++++-------------- |
| 15 |
app-emulation/xen-tools/xen-tools-4.9.1.ebuild | 20 ++++++-------------- |
| 16 |
2 files changed, 12 insertions(+), 28 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-emulation/xen-tools/xen-tools-4.8.2-r3.ebuild b/app-emulation/xen-tools/xen-tools-4.8.2-r3.ebuild |
| 19 |
index c8bbd81561c..211478319ae 100644 |
| 20 |
--- a/app-emulation/xen-tools/xen-tools-4.8.2-r3.ebuild |
| 21 |
+++ b/app-emulation/xen-tools/xen-tools-4.8.2-r3.ebuild |
| 22 |
@@ -179,10 +179,7 @@ src_prepare() { |
| 23 |
# Upstream's patchset |
| 24 |
if [[ -n ${UPSTREAM_VER} ]]; then |
| 25 |
einfo "Try to apply Xen Upstream patch set" |
| 26 |
- EPATCH_SUFFIX="patch" \ |
| 27 |
- EPATCH_FORCE="yes" \ |
| 28 |
- EPATCH_OPTS="-p1" \ |
| 29 |
- epatch "${WORKDIR}"/patches-upstream |
| 30 |
+ eapply "${WORKDIR}"/patches-upstream |
| 31 |
fi |
| 32 |
|
| 33 |
# Security patchset |
| 34 |
@@ -197,20 +194,20 @@ src_prepare() { |
| 35 |
source "${WORKDIR}"/patches-security/${PV}.conf || die |
| 36 |
|
| 37 |
for i in ${XEN_SECURITY_MAIN}; do |
| 38 |
- epatch "${WORKDIR}"/patches-security/xen/$i |
| 39 |
+ eapply "${WORKDIR}"/patches-security/xen/$i |
| 40 |
done |
| 41 |
|
| 42 |
# apply qemu-xen/upstream patches |
| 43 |
pushd "${S}"/tools/qemu-xen/ > /dev/null |
| 44 |
for i in ${XEN_SECURITY_QEMUU}; do |
| 45 |
- epatch "${WORKDIR}"/patches-security/qemuu/$i |
| 46 |
+ eapply "${WORKDIR}"/patches-security/qemuu/$i |
| 47 |
done |
| 48 |
popd > /dev/null |
| 49 |
|
| 50 |
# apply qemu-traditional patches |
| 51 |
pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null |
| 52 |
for i in ${XEN_SECURITY_QEMUT}; do |
| 53 |
- epatch "${WORKDIR}"/patches-security/qemut/$i |
| 54 |
+ eapply "${WORKDIR}"/patches-security/qemut/$i |
| 55 |
done |
| 56 |
popd > /dev/null |
| 57 |
fi |
| 58 |
@@ -227,9 +224,7 @@ src_prepare() { |
| 59 |
source "${FILESDIR}"/gentoo-patches.conf || die |
| 60 |
_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV} |
| 61 |
for i in ${!_gpv}; do |
| 62 |
- EPATCH_SUFFIX="patch" \ |
| 63 |
- EPATCH_FORCE="yes" \ |
| 64 |
- epatch "${WORKDIR}"/patches-gentoo/$i |
| 65 |
+ eapply "${WORKDIR}"/patches-gentoo/$i |
| 66 |
done |
| 67 |
fi |
| 68 |
|
| 69 |
@@ -238,10 +233,7 @@ src_prepare() { |
| 70 |
if [[ -n ${OVMF_VER} ]];then |
| 71 |
einfo "Try to apply Ovmf patch set" |
| 72 |
pushd "${WORKDIR}"/ovmf-*/ > /dev/null |
| 73 |
- EPATCH_SUFFIX="patch" \ |
| 74 |
- EPATCH_FORCE="yes" \ |
| 75 |
- EPATCH_OPTS="-p1" \ |
| 76 |
- epatch "${WORKDIR}"/patches-ovmf |
| 77 |
+ eapply "${WORKDIR}"/patches-ovmf |
| 78 |
popd > /dev/null |
| 79 |
fi |
| 80 |
mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die |
| 81 |
|
| 82 |
diff --git a/app-emulation/xen-tools/xen-tools-4.9.1.ebuild b/app-emulation/xen-tools/xen-tools-4.9.1.ebuild |
| 83 |
index e15cda8916a..665372875fa 100644 |
| 84 |
--- a/app-emulation/xen-tools/xen-tools-4.9.1.ebuild |
| 85 |
+++ b/app-emulation/xen-tools/xen-tools-4.9.1.ebuild |
| 86 |
@@ -180,10 +180,7 @@ src_prepare() { |
| 87 |
# Upstream's patchset |
| 88 |
if [[ -n ${UPSTREAM_VER} ]]; then |
| 89 |
einfo "Try to apply Xen Upstream patch set" |
| 90 |
- EPATCH_SUFFIX="patch" \ |
| 91 |
- EPATCH_FORCE="yes" \ |
| 92 |
- EPATCH_OPTS="-p1" \ |
| 93 |
- epatch "${WORKDIR}"/patches-upstream |
| 94 |
+ eapply "${WORKDIR}"/patches-upstream |
| 95 |
fi |
| 96 |
|
| 97 |
# Security patchset |
| 98 |
@@ -198,20 +195,20 @@ src_prepare() { |
| 99 |
source "${WORKDIR}"/patches-security/${PV}.conf || die |
| 100 |
|
| 101 |
for i in ${XEN_SECURITY_MAIN}; do |
| 102 |
- epatch "${WORKDIR}"/patches-security/xen/$i |
| 103 |
+ eapply "${WORKDIR}"/patches-security/xen/$i |
| 104 |
done |
| 105 |
|
| 106 |
# apply qemu-xen/upstream patches |
| 107 |
pushd "${S}"/tools/qemu-xen/ > /dev/null |
| 108 |
for i in ${XEN_SECURITY_QEMUU}; do |
| 109 |
- epatch "${WORKDIR}"/patches-security/qemuu/$i |
| 110 |
+ eapply "${WORKDIR}"/patches-security/qemuu/$i |
| 111 |
done |
| 112 |
popd > /dev/null |
| 113 |
|
| 114 |
# apply qemu-traditional patches |
| 115 |
pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null |
| 116 |
for i in ${XEN_SECURITY_QEMUT}; do |
| 117 |
- epatch "${WORKDIR}"/patches-security/qemut/$i |
| 118 |
+ eapply "${WORKDIR}"/patches-security/qemut/$i |
| 119 |
done |
| 120 |
popd > /dev/null |
| 121 |
fi |
| 122 |
@@ -228,9 +225,7 @@ src_prepare() { |
| 123 |
source "${FILESDIR}"/gentoo-patches.conf || die |
| 124 |
_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV} |
| 125 |
for i in ${!_gpv}; do |
| 126 |
- EPATCH_SUFFIX="patch" \ |
| 127 |
- EPATCH_FORCE="yes" \ |
| 128 |
- epatch "${WORKDIR}"/patches-gentoo/$i |
| 129 |
+ eapply "${WORKDIR}"/patches-gentoo/$i |
| 130 |
done |
| 131 |
fi |
| 132 |
|
| 133 |
@@ -239,10 +234,7 @@ src_prepare() { |
| 134 |
if [[ -n ${OVMF_VER} ]];then |
| 135 |
einfo "Try to apply Ovmf patch set" |
| 136 |
pushd "${WORKDIR}"/ovmf-*/ > /dev/null |
| 137 |
- EPATCH_SUFFIX="patch" \ |
| 138 |
- EPATCH_FORCE="yes" \ |
| 139 |
- EPATCH_OPTS="-p1" \ |
| 140 |
- epatch "${WORKDIR}"/patches-ovmf |
| 141 |
+ eapply "${WORKDIR}"/patches-ovmf |
| 142 |
popd > /dev/null |
| 143 |
fi |
| 144 |
mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die |
Archives