| 1 |
commit: b0a219ea59f69af680e1c5e80010686bc60be351 |
| 2 |
Author: Yixun Lan <dlan <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Feb 19 01:27:01 2016 +0000 |
| 4 |
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Feb 19 01:27:31 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0a219ea |
| 7 |
|
| 8 |
app-emulation/xen-tools: correct patching ovmf logic |
| 9 |
|
| 10 |
while bumping ovmf, I found current logic not |
| 11 |
handling USE=ovmf enabled && ${OVMF_VER} is unset case |
| 12 |
|
| 13 |
Package-Manager: portage-2.2.27 |
| 14 |
|
| 15 |
app-emulation/xen-tools/xen-tools-4.5.2-r4.ebuild | 18 ++++++++++-------- |
| 16 |
app-emulation/xen-tools/xen-tools-4.6.1.ebuild | 18 ++++++++++-------- |
| 17 |
2 files changed, 20 insertions(+), 16 deletions(-) |
| 18 |
|
| 19 |
diff --git a/app-emulation/xen-tools/xen-tools-4.5.2-r4.ebuild b/app-emulation/xen-tools/xen-tools-4.5.2-r4.ebuild |
| 20 |
index d2be7c5..94994ca 100644 |
| 21 |
--- a/app-emulation/xen-tools/xen-tools-4.5.2-r4.ebuild |
| 22 |
+++ b/app-emulation/xen-tools/xen-tools-4.5.2-r4.ebuild |
| 23 |
@@ -233,14 +233,16 @@ src_prepare() { |
| 24 |
fi |
| 25 |
|
| 26 |
# Ovmf's patchset |
| 27 |
- if [[ -n ${OVMF_VER} ]] && use ovmf; then |
| 28 |
- einfo "Try to apply Ovmf patch set" |
| 29 |
- pushd "${WORKDIR}"/ovmf-*/ > /dev/null |
| 30 |
- EPATCH_SUFFIX="patch" \ |
| 31 |
- EPATCH_FORCE="yes" \ |
| 32 |
- EPATCH_OPTS="-p1" \ |
| 33 |
- epatch "${WORKDIR}"/patches-ovmf |
| 34 |
- popd > /dev/null |
| 35 |
+ if use ovmf; then |
| 36 |
+ if [[ -n ${OVMF_VER} ]];then |
| 37 |
+ einfo "Try to apply Ovmf patch set" |
| 38 |
+ pushd "${WORKDIR}"/ovmf-*/ > /dev/null |
| 39 |
+ EPATCH_SUFFIX="patch" \ |
| 40 |
+ EPATCH_FORCE="yes" \ |
| 41 |
+ EPATCH_OPTS="-p1" \ |
| 42 |
+ epatch "${WORKDIR}"/patches-ovmf |
| 43 |
+ popd > /dev/null |
| 44 |
+ fi |
| 45 |
mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die |
| 46 |
fi |
| 47 |
|
| 48 |
|
| 49 |
diff --git a/app-emulation/xen-tools/xen-tools-4.6.1.ebuild b/app-emulation/xen-tools/xen-tools-4.6.1.ebuild |
| 50 |
index 9f9d763..c380955 100644 |
| 51 |
--- a/app-emulation/xen-tools/xen-tools-4.6.1.ebuild |
| 52 |
+++ b/app-emulation/xen-tools/xen-tools-4.6.1.ebuild |
| 53 |
@@ -240,14 +240,16 @@ src_prepare() { |
| 54 |
fi |
| 55 |
|
| 56 |
# Ovmf's patchset |
| 57 |
- if [[ -n ${OVMF_VER} ]] && use ovmf; then |
| 58 |
- einfo "Try to apply Ovmf patch set" |
| 59 |
- pushd "${WORKDIR}"/ovmf-*/ > /dev/null |
| 60 |
- EPATCH_SUFFIX="patch" \ |
| 61 |
- EPATCH_FORCE="yes" \ |
| 62 |
- EPATCH_OPTS="-p1" \ |
| 63 |
- epatch "${WORKDIR}"/patches-ovmf |
| 64 |
- popd > /dev/null |
| 65 |
+ if use ovmf; then |
| 66 |
+ if [[ -n ${OVMF_VER} ]];then |
| 67 |
+ einfo "Try to apply Ovmf patch set" |
| 68 |
+ pushd "${WORKDIR}"/ovmf-*/ > /dev/null |
| 69 |
+ EPATCH_SUFFIX="patch" \ |
| 70 |
+ EPATCH_FORCE="yes" \ |
| 71 |
+ EPATCH_OPTS="-p1" \ |
| 72 |
+ epatch "${WORKDIR}"/patches-ovmf |
| 73 |
+ popd > /dev/null |
| 74 |
+ fi |
| 75 |
mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die |
| 76 |
fi |
Archives