From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2830F138334 for ; Thu, 4 Apr 2019 04:55:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EEC86E0919; Thu, 4 Apr 2019 04:55:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C7708E0919 for ; Thu, 4 Apr 2019 04:55:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0CB5D335CA6 for ; Thu, 4 Apr 2019 04:55:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F0C0854A for ; Thu, 4 Apr 2019 04:55:48 +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: <1554353745.0887e98f46b36f78df9ef8b2c827455ad86f7800.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.12.0.ebuild X-VCS-Directories: app-emulation/xen-tools/ X-VCS-Committer: dlan X-VCS-Committer-Name: Yixun Lan X-VCS-Revision: 0887e98f46b36f78df9ef8b2c827455ad86f7800 X-VCS-Branch: master Date: Thu, 4 Apr 2019 04:55:48 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 80d2c8ae-92de-4d5d-aebf-1b1ca4d603db X-Archives-Hash: 0f3d8cd201b23c11377a961f0990e4be commit: 0887e98f46b36f78df9ef8b2c827455ad86f7800 Author: Yixun Lan gentoo org> AuthorDate: Thu Apr 4 04:54:34 2019 +0000 Commit: Yixun Lan gentoo org> CommitDate: Thu Apr 4 04:55:45 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0887e98f app-emulation/xen-tools: bump edk2/seabios for 4.12.0 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Yixun Lan gentoo.org> app-emulation/xen-tools/xen-tools-4.12.0.ebuild | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/app-emulation/xen-tools/xen-tools-4.12.0.ebuild b/app-emulation/xen-tools/xen-tools-4.12.0.ebuild index 6b2195b87b8..f68edb0a8dd 100644 --- a/app-emulation/xen-tools/xen-tools-4.12.0.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.12.0.ebuild @@ -24,11 +24,10 @@ else # xen-tools's gentoo patches version which apply to this specific ebuild GENTOO_GPV=0 # xen-tools ovmf's patches - OVMF_VER=3 + OVMF_VER= SEABIOS_VER=1.12.0 - # OVMF upstream 5920a9d16b1ab887c2858224316a98e961d71b05 - OVMF_PV=20170321 + EDK2_COMMIT=ef529e6ab7c31290a33045bb1f1837447cc0eb56 [[ -n ${UPSTREAM_VER} ]] && \ UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz @@ -43,8 +42,7 @@ else SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz https://www.seabios.org/downloads/seabios-${SEABIOS_VER}.tar.gz - https://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz - ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.xz + ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz ${OVMF_PATCHSET_URI} ) ${UPSTREAM_PATCHSET_URI} ${SECURITY_PATCHSET_URI} @@ -236,11 +234,12 @@ src_prepare() { if use ovmf; then if [[ -n ${OVMF_VER} ]];then einfo "Try to apply Ovmf patch set" - pushd "${WORKDIR}"/ovmf-*/ > /dev/null + pushd "${WORKDIR}"/edk2-*/ > /dev/null eapply "${WORKDIR}"/patches-ovmf popd > /dev/null fi - mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die + mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die + cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || die fi mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die