From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A91D31388BF for ; Fri, 19 Feb 2016 01:28:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 33A1721C029; Fri, 19 Feb 2016 01:28:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CD51E21C029 for ; Fri, 19 Feb 2016 01:28:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A7519340D61 for ; Fri, 19 Feb 2016 01:28:19 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 66667154D for ; Fri, 19 Feb 2016 01:28:17 +0000 (UTC) From: "Yixun Lan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Yixun Lan" Message-ID: <1455845251.b0a219ea59f69af680e1c5e80010686bc60be351.dlan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/xen-tools/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/xen-tools/xen-tools-4.5.2-r4.ebuild app-emulation/xen-tools/xen-tools-4.6.1.ebuild X-VCS-Directories: app-emulation/xen-tools/ X-VCS-Committer: dlan X-VCS-Committer-Name: Yixun Lan X-VCS-Revision: b0a219ea59f69af680e1c5e80010686bc60be351 X-VCS-Branch: master Date: Fri, 19 Feb 2016 01:28:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a3813412-b7c4-473b-9630-9bdd9a06d7ed X-Archives-Hash: e18d29d9f5dfd25a9b00766c6a8ec7fe commit: b0a219ea59f69af680e1c5e80010686bc60be351 Author: Yixun Lan gentoo org> AuthorDate: Fri Feb 19 01:27:01 2016 +0000 Commit: Yixun Lan gentoo org> CommitDate: Fri Feb 19 01:27:31 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0a219ea 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 app-emulation/xen-tools/xen-tools-4.5.2-r4.ebuild | 18 ++++++++++-------- 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 d2be7c5..94994ca 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 9f9d763..c380955 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