[gentoo-commits] proj/virtualization:dlan commit in: app-emulation/xen-tools/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Lan Yixun" <dlan@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/virtualization:dlan commit in: app-emulation/xen-tools/
Date: Mon, 20 Jan 2014 10:27:05 +0000 (UTC)	[thread overview]
Message-ID: <1390192115.8fcf10b3a2fee3bdc7bc90216f0cd1967e9fabf4.dlan@gentoo> (raw)

commit:     8fcf10b3a2fee3bdc7bc90216f0cd1967e9fabf4
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 20 04:28:35 2014 +0000
Commit:     Lan Yixun <dlan <AT> gentoo <DOT> 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 <dlan <AT> 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
 }

next             reply	other threads:[~2014-01-20 10:27 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-20 10:27 Lan Yixun [this message]
  -- strict thread matches above, loose matches on Subject: below --
2014-03-19 22:35 [gentoo-commits] proj/virtualization:master commit in: app-emulation/xen-tools/ Lan Yixun
2014-04-04  7:35 ` [gentoo-commits] proj/virtualization:dlan " Lan Yixun
2014-01-20 10:27 Lan Yixun
2014-01-20 10:27 Lan Yixun
2014-01-20 10:27 Lan Yixun
2014-01-20 10:27 Lan Yixun
2014-01-20 10:27 Lan Yixun

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:a55a99b dfblob:3a83125 dfblob:a55a99b dfblob:a5add0d )
 OR (
bs:"[gentoo-commits] proj/virtualization:dlan commit in: app-emulation/xen-tools/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1390192115.8fcf10b3a2fee3bdc7bc90216f0cd1967e9fabf4.dlan@gentoo \
    --to=dlan@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox