diff options
| author |   Yixun Lan <dlan@gentoo.org> | 2016-02-19 09:27:01 +0800 |
|---|---|---|
| committer | Yixun Lan <dlan@gentoo.org> | 2016-02-19 09:27:31 +0800 |
| commit | b0a219ea59f69af680e1c5e80010686bc60be351 (patch) | |
| tree | b70804ffc7facf77c91f7b6861a43f38f004b076 /app-emulation/xen-tools | |
| parent | media-libs/libextractor: add upstream giflib-5 fix #571902 (diff) | |
| download | gentoo-b0a219ea59f69af680e1c5e80010686bc60be351.tar.gz gentoo-b0a219ea59f69af680e1c5e80010686bc60be351.tar.bz2 gentoo-b0a219ea59f69af680e1c5e80010686bc60be351.zip | |
app-emulation/xen-tools: correct patching ovmf logic
while bumping ovmf, I found current logic not
handling USE=ovmf enabled && ${OVMF_VER} is unset case
Package-Manager: portage-2.2.27
Diffstat (limited to 'app-emulation/xen-tools')
| -rw-r--r-- | app-emulation/xen-tools/xen-tools-4.5.2-r4.ebuild | 18 | ||||
| -rw-r--r-- | app-emulation/xen-tools/xen-tools-4.6.1.ebuild | 18 |
2 files changed, 20 insertions, 16 deletions
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 index d2be7c5d90cd..94994ca49c49 100644 --- a/app-emulation/xen-tools/xen-tools-4.5.2-r4.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.5.2-r4.ebuild @@ -233,14 +233,16 @@ src_prepare() { fi # Ovmf's patchset - if [[ -n ${OVMF_VER} ]] && use ovmf; then - einfo "Try to apply Ovmf patch set" - pushd "${WORKDIR}"/ovmf-*/ > /dev/null - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - EPATCH_OPTS="-p1" \ - epatch "${WORKDIR}"/patches-ovmf - popd > /dev/null + if use ovmf; then + if [[ -n ${OVMF_VER} ]];then + einfo "Try to apply Ovmf patch set" + pushd "${WORKDIR}"/ovmf-*/ > /dev/null + EPATCH_SUFFIX="patch" \ + EPATCH_FORCE="yes" \ + EPATCH_OPTS="-p1" \ + epatch "${WORKDIR}"/patches-ovmf + popd > /dev/null + fi mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die fi diff --git a/app-emulation/xen-tools/xen-tools-4.6.1.ebuild b/app-emulation/xen-tools/xen-tools-4.6.1.ebuild index 9f9d763c4ae4..c38095583ced 100644 --- a/app-emulation/xen-tools/xen-tools-4.6.1.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.6.1.ebuild @@ -240,14 +240,16 @@ src_prepare() { fi # Ovmf's patchset - if [[ -n ${OVMF_VER} ]] && use ovmf; then - einfo "Try to apply Ovmf patch set" - pushd "${WORKDIR}"/ovmf-*/ > /dev/null - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - EPATCH_OPTS="-p1" \ - epatch "${WORKDIR}"/patches-ovmf - popd > /dev/null + if use ovmf; then + if [[ -n ${OVMF_VER} ]];then + einfo "Try to apply Ovmf patch set" + pushd "${WORKDIR}"/ovmf-*/ > /dev/null + EPATCH_SUFFIX="patch" \ + EPATCH_FORCE="yes" \ + EPATCH_OPTS="-p1" \ + epatch "${WORKDIR}"/patches-ovmf + popd > /dev/null + fi mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die fi |