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 8D959138247 for ; Mon, 20 Jan 2014 10:27:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9F422E0DE7; Mon, 20 Jan 2014 10:27:09 +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 D1F37E0DE9 for ; Mon, 20 Jan 2014 10:27:08 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4E78533F9B5 for ; Mon, 20 Jan 2014 10:27:07 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 27FC918734 for ; Mon, 20 Jan 2014 10:27:05 +0000 (UTC) From: "Lan Yixun" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lan Yixun" Message-ID: <1390192115.8fcf10b3a2fee3bdc7bc90216f0cd1967e9fabf4.dlan@gentoo> Subject: [gentoo-commits] proj/virtualization:dlan commit in: app-emulation/xen-tools/ X-VCS-Repository: proj/virtualization X-VCS-Files: app-emulation/xen-tools/xen-tools-9999-r1.ebuild app-emulation/xen-tools/xen-tools-9999.ebuild X-VCS-Directories: app-emulation/xen-tools/ X-VCS-Committer: dlan X-VCS-Committer-Name: Lan Yixun X-VCS-Revision: 8fcf10b3a2fee3bdc7bc90216f0cd1967e9fabf4 X-VCS-Branch: dlan Date: Mon, 20 Jan 2014 10:27:05 +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: c79c65d0-3970-489e-a4f0-dc22a6a804b6 X-Archives-Hash: 44cc961f5e39b1936176b6ceeb109cdf commit: 8fcf10b3a2fee3bdc7bc90216f0cd1967e9fabf4 Author: Yixun Lan gentoo org> AuthorDate: Mon Jan 20 04:28:35 2014 +0000 Commit: Lan Yixun gentoo org> CommitDate: Mon Jan 20 04:28:35 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/virtualization.git;a=commit;h=8fcf10b3 app-emulation/xen-tools: convert to git-r3 eclass Signed-off-by: Yixun Lan gentoo.org> --- ...-tools-9999.ebuild => xen-tools-9999-r1.ebuild} | 32 ++++++++++++++-------- app-emulation/xen-tools/xen-tools-9999.ebuild | 20 ++++++++++---- 2 files changed, 36 insertions(+), 16 deletions(-) diff --git a/app-emulation/xen-tools/xen-tools-9999.ebuild b/app-emulation/xen-tools/xen-tools-9999-r1.ebuild similarity index 91% copy from app-emulation/xen-tools/xen-tools-9999.ebuild copy to app-emulation/xen-tools/xen-tools-9999-r1.ebuild index a55a99b..3a83125 100644 --- a/app-emulation/xen-tools/xen-tools-9999.ebuild +++ b/app-emulation/xen-tools/xen-tools-9999-r1.ebuild @@ -12,13 +12,20 @@ XEN_SEABIOS_URL="http://dev.gentoo.org/~idella4/tarballs/seabios-dir-remote-2013 if [[ $PV == *9999 ]]; then KEYWORDS="" + + EGIT_COMMIT_MAIN="${EGIT_COMMIT_MAIN:-origin/master}" + EGIT_COMMIT_QEMU="${EGIT_COMMIT_QEMU:-origin/master}" + EGIT_COMMIT_TRAD="${EGIT_COMMIT_TRAD:-origin/master}" + EGIT_COMMIT_SEAB="${EGIT_COMMIT_SEAB:-origin/1.7.1-stable-xen}" + EGIT_COMMIT_IPXE="${EGIT_COMMIT_IPXE:-origin/master}" + EGIT_REPO_URI_MAIN="git://xenbits.xen.org/xen.git" - EGIT_REPO_URI_QEMU="git://xenbits.xen.org/qemu-upstream-unstable.git" + EGIT_REPO_URI_QEMU="git://xenbits.xen.org/qemu-upstream-4.3-testing.git" EGIT_REPO_URI_TRAD="git://xenbits.xen.org/qemu-xen-unstable.git" EGIT_REPO_URI_SEAB="git://xenbits.xen.org/seabios.git" EGIT_REPO_URI_IPXE="git://git.ipxe.org/ipxe.git" S="${WORKDIR}/xen" - live_eclass="git-2" + live_eclass="git-r3" else KEYWORDS="~amd64 ~x86" SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz @@ -130,21 +137,24 @@ pkg_setup() { src_unpack() { EGIT_REPO_URI=${EGIT_REPO_URI_MAIN} \ - EGIT_SOURCEDIR=${S} git-2_src_unpack + EGIT_COMMIT=${EGIT_COMMIT_MAIN} \ + EGIT_CHECKOUT_DIR=${S} git-r3_src_unpack EGIT_REPO_URI=${EGIT_REPO_URI_QEMU} \ - EGIT_SOURCEDIR=${S}/tools/qemu-xen-dir git-2_src_unpack + EGIT_COMMIT=${EGIT_COMMIT_QEMU} \ + EGIT_CHECKOUT_DIR=${S}/tools/qemu-xen-dir git-r3_src_unpack EGIT_REPO_URI=${EGIT_REPO_URI_TRAD} \ - EGIT_SOURCEDIR=${S}/tools/qemu-xen-traditional-dir git-2_src_unpack + EGIT_COMMIT=${EGIT_COMMIT_TRAD} \ + EGIT_CHECKOUT_DIR=${S}/tools/qemu-xen-traditional-dir git-r3_src_unpack EGIT_REPO_URI=${EGIT_REPO_URI_SEAB} \ - EGIT_SOURCEDIR=${S}/tools/firmware/seabios-dir \ - EGIT_COMMIT="1.7.1-stable-xen" \ - EGIT_BRANCH="1.7.1-stable-xen" git-2_src_unpack + EGIT_COMMIT=${EGIT_COMMIT_SEAB} \ + EGIT_CHECKOUT_DIR=${S}/tools/firmware/seabios-dir git-r3_src_unpack EGIT_REPO_URI=${EGIT_REPO_URI_IPXE} \ - EGIT_SOURCEDIR=${S}/tools/firmware/etherboot/ipxe git-2_src_unpack + EGIT_COMMIT=${EGIT_COMMIT_IPXE} \ + EGIT_CHECKOUT_DIR=${S}/tools/firmware/etherboot/ipxe git-r3_src_unpack } src_prepare() { @@ -221,8 +231,8 @@ src_prepare() { -i tools/qemu-xen-dir/configure || die # Prevent file collision with qemu package Bug 478064 - epatch "${FILESDIR}"/qemu-bridge-r2.patch - mv tools/qemu-xen-dir/qemu-bridge-helper.c tools/qemu-xen-dir/xen-bridge-helper.c || die +# epatch "${FILESDIR}"/qemu-bridge-r1.patch +# mv tools/qemu-xen-dir/qemu-bridge-helper.c tools/qemu-xen-dir/xen-bridge-helper.c || die epatch_user } diff --git a/app-emulation/xen-tools/xen-tools-9999.ebuild b/app-emulation/xen-tools/xen-tools-9999.ebuild index a55a99b..a5add0d 100644 --- a/app-emulation/xen-tools/xen-tools-9999.ebuild +++ b/app-emulation/xen-tools/xen-tools-9999.ebuild @@ -12,6 +12,13 @@ XEN_SEABIOS_URL="http://dev.gentoo.org/~idella4/tarballs/seabios-dir-remote-2013 if [[ $PV == *9999 ]]; then KEYWORDS="" + + EGIT_COMMIT_MAIN="${EGIT_COMMIT_MAIN:-origin/master}" + EGIT_COMMIT_QEMU="${EGIT_COMMIT_QEMU:-origin/master}" + EGIT_COMMIT_TRAD="${EGIT_COMMIT_TRAD:-origin/master}" + EGIT_COMMIT_SEAB="${EGIT_COMMIT_SEAB:-origin/1.7.1-stable-xen}" + EGIT_COMMIT_IPXE="${EGIT_COMMIT_IPXE:-origin/master}" + EGIT_REPO_URI_MAIN="git://xenbits.xen.org/xen.git" EGIT_REPO_URI_QEMU="git://xenbits.xen.org/qemu-upstream-unstable.git" EGIT_REPO_URI_TRAD="git://xenbits.xen.org/qemu-xen-unstable.git" @@ -130,20 +137,23 @@ pkg_setup() { src_unpack() { EGIT_REPO_URI=${EGIT_REPO_URI_MAIN} \ + EGIT_COMMIT=${EGIT_COMMIT_MAIN} \ EGIT_SOURCEDIR=${S} git-2_src_unpack EGIT_REPO_URI=${EGIT_REPO_URI_QEMU} \ + EGIT_COMMIT=${EGIT_COMMIT_QEMU} \ EGIT_SOURCEDIR=${S}/tools/qemu-xen-dir git-2_src_unpack EGIT_REPO_URI=${EGIT_REPO_URI_TRAD} \ + EGIT_COMMIT=${EGIT_COMMIT_TRAD} \ EGIT_SOURCEDIR=${S}/tools/qemu-xen-traditional-dir git-2_src_unpack EGIT_REPO_URI=${EGIT_REPO_URI_SEAB} \ - EGIT_SOURCEDIR=${S}/tools/firmware/seabios-dir \ - EGIT_COMMIT="1.7.1-stable-xen" \ - EGIT_BRANCH="1.7.1-stable-xen" git-2_src_unpack + EGIT_COMMIT=${EGIT_COMMIT_SEAB} \ + EGIT_SOURCEDIR=${S}/tools/firmware/seabios-dir git-2_src_unpack EGIT_REPO_URI=${EGIT_REPO_URI_IPXE} \ + EGIT_COMMIT=${EGIT_COMMIT_IPXE} \ EGIT_SOURCEDIR=${S}/tools/firmware/etherboot/ipxe git-2_src_unpack } @@ -221,8 +231,8 @@ src_prepare() { -i tools/qemu-xen-dir/configure || die # Prevent file collision with qemu package Bug 478064 - epatch "${FILESDIR}"/qemu-bridge-r2.patch - mv tools/qemu-xen-dir/qemu-bridge-helper.c tools/qemu-xen-dir/xen-bridge-helper.c || die +# epatch "${FILESDIR}"/qemu-bridge-r1.patch +# mv tools/qemu-xen-dir/qemu-bridge-helper.c tools/qemu-xen-dir/xen-bridge-helper.c || die epatch_user }