diff options
author | Donnie Berkholz <dberkholz@gentoo.org> | 2008-01-31 06:18:26 +0000 |
---|---|---|
committer | Donnie Berkholz <dberkholz@gentoo.org> | 2008-01-31 06:18:26 +0000 |
commit | 2b2843128a92e0215026b6ce9cd016fbaee22a04 (patch) | |
tree | 45d4249ef691fbe5d6e69b160d0721c9f2e4f7cf /app-emulation/virtinst | |
parent | Clean up. (diff) | |
download | historical-2b2843128a92e0215026b6ce9cd016fbaee22a04.tar.gz historical-2b2843128a92e0215026b6ce9cd016fbaee22a04.tar.bz2 historical-2b2843128a92e0215026b6ce9cd016fbaee22a04.zip |
Clean up.
Package-Manager: portage-2.1.4
Diffstat (limited to 'app-emulation/virtinst')
8 files changed, 10 insertions, 271 deletions
diff --git a/app-emulation/virtinst/ChangeLog b/app-emulation/virtinst/ChangeLog index 89f55322d4ea..5310c63ef210 100644 --- a/app-emulation/virtinst/ChangeLog +++ b/app-emulation/virtinst/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for app-emulation/virtinst -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtinst/ChangeLog,v 1.2 2007/10/15 11:16:31 dberkholz Exp $ +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtinst/ChangeLog,v 1.3 2008/01/31 06:18:25 dberkholz Exp $ + + 31 Jan 2008; Donnie Berkholz <dberkholz@gentoo.org>; + -files/virtinst-0.103.0-accelerate.patch, + -files/virtinst-0.103.0-default-net.patch, + -files/virtinst-0.103.0-features-xml.patch, + -files/virtinst-0.103.0-rhel5-client.patch, + -files/virtinst-0.103.0-urlgrabber-import.patch, -virtinst-0.103.0.ebuild: + Clean up. *virtinst-0.300.1 (15 Oct 2007) diff --git a/app-emulation/virtinst/files/digest-virtinst-0.103.0 b/app-emulation/virtinst/files/digest-virtinst-0.103.0 deleted file mode 100644 index 329c188dd9bc..000000000000 --- a/app-emulation/virtinst/files/digest-virtinst-0.103.0 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 4a532a58772b0d02434e8d2043ea01f9 python-virtinst-0.103.0-3.fc7.src.rpm 55048 -RMD160 c0980d48db8431d00ffc1f94e63890e55b3c0d13 python-virtinst-0.103.0-3.fc7.src.rpm 55048 -SHA256 6ddceddb6f23312a73e8bc8aae79b88d9f205a026dcda4bdd3314ffd4002c858 python-virtinst-0.103.0-3.fc7.src.rpm 55048 diff --git a/app-emulation/virtinst/files/virtinst-0.103.0-accelerate.patch b/app-emulation/virtinst/files/virtinst-0.103.0-accelerate.patch deleted file mode 100644 index 9dbe58ba28b3..000000000000 --- a/app-emulation/virtinst/files/virtinst-0.103.0-accelerate.patch +++ /dev/null @@ -1,30 +0,0 @@ -changeset: 161:00984cdd0c55 -user: Mark McLoughlin <markmc@redhat.com> -date: Mon Apr 30 11:43:24 2007 -0400 -files: virt-install -description: -[et-mgmt-tools] [patch 1/4] Typo in kvm support -Patch from David Lutterkort - -Fixes a minor type in kvm support where we reference a -non-existent module. - -Signed-off-by: Mark McLoughlin <markmc@redhat.com> - - -diff -r 71f2046b9805 -r 00984cdd0c55 virt-install ---- a/virt-install Wed Apr 25 15:56:03 2007 -0400 -+++ b/virt-install Mon Apr 30 11:43:24 2007 -0400 -@@ -519,9 +519,9 @@ def main(): - hvm = True - type = "qemu" - if options.accelerate: -- if util.is_kvm_capable(): -+ if virtinst.util.is_kvm_capable(): - type = "kvm" -- elif util.is_kqemu_capable(): -+ elif virtinst.util.is_kqemu_capable(): - type = "kqemu" - - if hvm: - diff --git a/app-emulation/virtinst/files/virtinst-0.103.0-default-net.patch b/app-emulation/virtinst/files/virtinst-0.103.0-default-net.patch deleted file mode 100644 index 4f74af57d411..000000000000 --- a/app-emulation/virtinst/files/virtinst-0.103.0-default-net.patch +++ /dev/null @@ -1,137 +0,0 @@ -changeset: 165:5b37d71c88b6 -user: "Daniel P. Berrange <berrange@redhat.com>" -date: Tue May 01 11:31:32 2007 -0400 -summary: Automatically pick sensible default networking if no arg is listed, rather than defaulting to xenbr0. Pick sensible connect URI based on host OS - -diff -r cdbbe109cf8d -r 5b37d71c88b6 virt-install ---- a/virt-install Mon Apr 30 11:44:00 2007 -0400 -+++ b/virt-install Tue May 01 11:31:32 2007 -0400 -@@ -42,11 +42,6 @@ def prompt_for_input(prompt = "", val = - print prompt + " ", - return sys.stdin.readline().strip() - -- --def check_xen(): -- if not os.path.isdir("/proc/xen"): -- print >> sys.stderr, "Can only install guests if running under a Xen kernel!" -- sys.exit(1) - - ### General input gathering functions - def get_full_virt(): -@@ -216,7 +211,8 @@ def get_networks(macs, bridges, networks - macs = [ None ] * len(networks) - else: - if os.getuid() == 0: -- networks = ["bridge:" + virtinst.util.default_bridge()] -+ net = virtinst.util.default_network() -+ networks = [net[0] + ":" + net[1]] - else: - networks = ["user"] - if macs != None: -@@ -274,9 +270,12 @@ def get_paravirt_extraargs(extra, guest) - - - ### fullvirt input gathering functions --def get_fullvirt_cdrom(cdpath, guest): -- while 1: -- cdpath = prompt_for_input("What would you like to use for the virtual CD image?", cdpath) -+def get_fullvirt_cdrom(cdpath, location, guest): -+ if cdpath is None and location is not None: -+ cdpath = location -+ -+ while 1: -+ cdpath = prompt_for_input("What is the virtual CD image, CD device or install location?", cdpath) - try: - guest.location = cdpath - break -@@ -353,7 +352,8 @@ def parse_args(): - help="Use kernel acceleration capabilities") - parser.add_option("", "--connect", type="string", dest="connect", - action="callback", callback=check_before_store, -- help="Connect to hypervisor with URI") -+ help="Connect to hypervisor with URI", -+ default=virtinst.util.default_connection()) - - # fullvirt options - parser.add_option("-v", "--hvm", action="store_true", dest="fullvirt", -@@ -484,7 +484,6 @@ def main(): - # check to ensure we're really on a xen kernel - if conn.getType() == "Xen": - type = "xen" -- check_xen() - - if os.geteuid() != 0: - print >> sys.stderr, "Must be root to install guests" -@@ -544,7 +543,7 @@ def main(): - get_paravirt_extraargs(options.extra, guest) - continue_inst = False - else: -- get_fullvirt_cdrom(options.cdrom, guest) -+ get_fullvirt_cdrom(options.cdrom, options.location, guest) - if options.noacpi: - guest.features["acpi"] = False - if options.noapic: -diff -r cdbbe109cf8d -r 5b37d71c88b6 virtinst/util.py ---- a/virtinst/util.py Mon Apr 30 11:44:00 2007 -0400 -+++ b/virtinst/util.py Tue May 01 11:31:32 2007 -0400 -@@ -16,7 +16,7 @@ import os.path - import os.path - from sys import stderr - --def default_bridge(): -+def default_route(): - route_file = "/proc/net/route" - d = file(route_file) - -@@ -30,12 +30,47 @@ def default_bridge(): - try: - route = int(info[1],16) - if route == 0: -- defn = int(info[0][-1]) -- break -+ return info[0] - except ValueError: - continue -+ return None - -- return "xenbr%d"%(defn) -+# Legacy for compat only. -+def default_bridge(): -+ rt = default_route() -+ defn = int(rt[-1]) -+ -+ if defn is None: -+ return "xenbr0" -+ else: -+ return "xenbr%d"%(defn) -+ -+def default_network(): -+ dev = default_route() -+ -+ if dev is not None: -+ # New style peth0 == phys dev, eth0 == bridge, eth0 == default route -+ if os.path.exists("/sys/class/net/%s/bridge" % dev): -+ return ["bridge", dev] -+ -+ # Old style, peth0 == phys dev, eth0 == netloop, xenbr0 == bridge, -+ # vif0.0 == netloop enslaved, eth0 == default route -+ defn = int(dev[-1]) -+ if os.path.exists("/sys/class/net/peth%d/brport" % defn) and \ -+ os.path.exists("/sys/class/net/xenbr%d/bridge" % defn): -+ return ["bridge", "xenbr%d" % defn] -+ -+ return ["network", "default"] -+ -+def default_connection(): -+ if os.path.exists("/var/lib/xend") and os.path.exists("/proc/xen"): -+ return "xen" -+ elif os.path.exists("/usr/bin/qemu"): -+ if os.getuid() == 0: -+ return "qemu:///system" -+ else: -+ return "qemu:///session" -+ return None - - def get_cpu_flags(): - f = open("/proc/cpuinfo") - diff --git a/app-emulation/virtinst/files/virtinst-0.103.0-features-xml.patch b/app-emulation/virtinst/files/virtinst-0.103.0-features-xml.patch deleted file mode 100644 index 68acad738604..000000000000 --- a/app-emulation/virtinst/files/virtinst-0.103.0-features-xml.patch +++ /dev/null @@ -1,32 +0,0 @@ -changeset: 162:ba44389ce195 -user: Mark McLoughlin <markmc@redhat.com> -date: Mon Apr 30 11:43:35 2007 -0400 -files: virtinst/FullVirtGuest.py -description: -[et-mgmt-tools] [patch 2/4] Fix typo in hvm kernel/initrd XML -Fixes a minor typo in the libvirt XML we output when booting -qemu with a kernel/initrd - the <features> block should be -outside the <os> block. - -Signed-off-by: Mark McLoughlin <markmc@redhat.com> - - -diff -r 00984cdd0c55 -r ba44389ce195 virtinst/FullVirtGuest.py ---- a/virtinst/FullVirtGuest.py Mon Apr 30 11:43:24 2007 -0400 -+++ b/virtinst/FullVirtGuest.py Mon Apr 30 11:43:35 2007 -0400 -@@ -185,10 +185,10 @@ class FullVirtGuest(Guest.XenGuest): - <kernel>%(kernel)s</kernel> - <initrd>%(initrd)s</initrd> - <cmdline>%(extra)s</cmdline> -- <features> -- %(features)s -- </features> -- </os>""" % \ -+ </os> -+ <features> -+ %(features)s -+ </features>""" % \ - { "kernel": self.kernel, \ - "initrd": self.initrd, \ - "extra": self.extraargs, \ - diff --git a/app-emulation/virtinst/files/virtinst-0.103.0-rhel5-client.patch b/app-emulation/virtinst/files/virtinst-0.103.0-rhel5-client.patch deleted file mode 100644 index 9167ed62fc4e..000000000000 --- a/app-emulation/virtinst/files/virtinst-0.103.0-rhel5-client.patch +++ /dev/null @@ -1,22 +0,0 @@ -changeset: 166:42e9479fa521 -tag: tip -user: "Daniel P. Berrange <berrange@redhat.com>" -date: Tue May 01 11:33:16 2007 -0400 -summary: Added logic to detect RHEL5 client distro flavour - -diff -r 5b37d71c88b6 -r 42e9479fa521 virtinst/DistroManager.py ---- a/virtinst/DistroManager.py Tue May 01 11:31:32 2007 -0400 -+++ b/virtinst/DistroManager.py Tue May 01 11:33:16 2007 -0400 -@@ -214,7 +214,10 @@ class RHELImageStore(RedHatImageStore): - class RHELImageStore(RedHatImageStore): - def isValidStore(self, fetcher, progresscb): - if fetcher.hasFile("Server", progresscb): -- logging.debug("Detected a RHEL 5 distro") -+ logging.debug("Detected a RHEL 5 Server distro") -+ return True -+ if fetcher.hasFile("Client", progresscb): -+ logging.debug("Detected a RHEL 5 Client distro") - return True - if fetcher.hasFile("RedHat", progresscb): - logging.debug("Detected a RHEL 4 distro") - diff --git a/app-emulation/virtinst/files/virtinst-0.103.0-urlgrabber-import.patch b/app-emulation/virtinst/files/virtinst-0.103.0-urlgrabber-import.patch deleted file mode 100644 index ad4e74525e68..000000000000 --- a/app-emulation/virtinst/files/virtinst-0.103.0-urlgrabber-import.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- virtinst-0.103.0/virtinst/Guest.py.urlgrabber-import 2007-04-16 08:35:35.000000000 -0400 -+++ virtinst-0.103.0/virtinst/Guest.py 2007-04-17 12:30:41.514314000 -0400 -@@ -23,6 +23,8 @@ - - import logging - -+import urlgrabber.progress as progress -+ - class VirtualDisk: - DRIVER_FILE = "file" - DRIVER_PHY = "phy" diff --git a/app-emulation/virtinst/virtinst-0.103.0.ebuild b/app-emulation/virtinst/virtinst-0.103.0.ebuild deleted file mode 100644 index c132f5852fdf..000000000000 --- a/app-emulation/virtinst/virtinst-0.103.0.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtinst/virtinst-0.103.0.ebuild,v 1.1 2007/06/10 06:07:02 dberkholz Exp $ - -inherit distutils rpm - -# Revision of the RPM. Shouldn't affect us, as we're just grabbing the source -# tarball out of it -RPMREV="3.fc7" - -MY_P="python-${P}" - -DESCRIPTION="Python modules for starting virtualized guest installations" -HOMEPAGE="http://virt-manager.et.redhat.com/" -#SRC_URI="http://virt-manager.et.redhat.com/download/sources/${PN}/${P}.tar.gz" -SRC_URI="mirror://fedora/development/source/SRPMS/${MY_P}-${RPMREV}.src.rpm" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86" -IUSE="" -RDEPEND=">=app-emulation/libvirt-0.2.1 - dev-python/urlgrabber" -DEPEND="${RDEPEND}" - -src_unpack() { - rpm_src_unpack - - cd "${S}" - epatch "${FILESDIR}"/${P}-accelerate.patch - epatch "${FILESDIR}"/${P}-default-net.patch - epatch "${FILESDIR}"/${P}-features-xml.patch - epatch "${FILESDIR}"/${P}-rhel5-client.patch - epatch "${FILESDIR}"/${P}-urlgrabber-import.patch -} |