[Pkg-libvirt-commits] [virt-manager] 03/05: Drop patches c-p'ed from upstream
Guido Guenther
agx at moszumanska.debian.org
Thu Nov 30 13:12:32 UTC 2017
This is an automated email from the git hooks/post-receive script.
agx pushed a commit to annotated tag debian/1%1.4.3-1
in repository virt-manager.
commit 14eb81d115e9fcb2792a051e59e16d9c45d16635
Author: Guido Günther <agx at sigxcpu.org>
Date: Thu Nov 30 09:44:49 2017 +0100
Drop patches c-p'ed from upstream
virtinst-adjust-media-paths-for-s390x.patch
Drop virtinst-connection-Fix-error-caching-new-pool.patch
---
debian/patches/Use-usr-bin-python.patch | 4 +-
debian/patches/series | 2 -
.../virtinst-adjust-media-paths-for-s390x.patch | 55 ----------------------
...nst-connection-Fix-error-caching-new-pool.patch | 24 ----------
debian/patches/virtinst/Fix-patch-to-pygrub.patch | 4 +-
.../patches/virtinst/fix-path-to-hvmloader.patch | 4 +-
6 files changed, 6 insertions(+), 87 deletions(-)
diff --git a/debian/patches/Use-usr-bin-python.patch b/debian/patches/Use-usr-bin-python.patch
index 62b89c7..c5a41f4 100644
--- a/debian/patches/Use-usr-bin-python.patch
+++ b/debian/patches/Use-usr-bin-python.patch
@@ -14,7 +14,7 @@ so we don't have to worry about picking up the wrong version
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/setup.py b/setup.py
-index 6f4b37b..73f6339 100755
+index 2a39921..7b7b72b 100755
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
@@ -54,7 +54,7 @@ index c42f2ef..81c25dc 100755
# Copyright 2008, 2013, 2014 Red Hat, Inc.
# Joey Boggs <jboggs at redhat.com>
diff --git a/virt-install b/virt-install
-index 0c7f9fe..6044d47 100755
+index 4163d0f..bc32b0d 100755
--- a/virt-install
+++ b/virt-install
@@ -1,4 +1,4 @@
diff --git a/debian/patches/series b/debian/patches/series
index 8accf64..71f0093 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
virtinst/fix-path-to-hvmloader.patch
virtinst/Fix-patch-to-pygrub.patch
Use-usr-bin-python.patch
-virtinst-connection-Fix-error-caching-new-pool.patch
-virtinst-adjust-media-paths-for-s390x.patch
diff --git a/debian/patches/virtinst-adjust-media-paths-for-s390x.patch b/debian/patches/virtinst-adjust-media-paths-for-s390x.patch
deleted file mode 100644
index a70a27f..0000000
--- a/debian/patches/virtinst-adjust-media-paths-for-s390x.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From: Viktor Mihajlovski <mihajlov at linux.vnet.ibm.com>
-Date: Tue, 29 Aug 2017 15:51:43 +0200
-Subject: virtinst: adjust media paths for s390x
-
-The install kernel and intrd files are located in <url-prefix>/generic
-of the Debian and Ubuntu s390x install trees. Further they follow a
-different naming scheme than on x86. Adjust the url fetching accordingly.
-
-Signed-off-by: Viktor Mihajlovski <mihajlov at linux.vnet.ibm.com>
----
- virtinst/urlfetcher.py | 17 +++++++++++++++--
- 1 file changed, 15 insertions(+), 2 deletions(-)
-
-diff --git a/virtinst/urlfetcher.py b/virtinst/urlfetcher.py
-index 1e944a4..96ec583 100644
---- a/virtinst/urlfetcher.py
-+++ b/virtinst/urlfetcher.py
-@@ -1129,6 +1129,12 @@ class DebianDistro(Distro):
- kernel_basename = "linux"
- if self._treeArch in ["ppc64el"]:
- kernel_basename = "vmlinux"
-+
-+ if self._treeArch == "s390x":
-+ hvmroot = "%s/generic/" % self._url_prefix
-+ kernel_basename = "kernel.%s" % self.name.lower()
-+ initrd_basename = "initrd.%s" % self.name.lower()
-+
- self._hvm_kernel_paths = [
- (hvmroot + kernel_basename, hvmroot + initrd_basename)]
-
-@@ -1147,7 +1153,11 @@ class DebianDistro(Distro):
- return False
-
- filename = "%s/MANIFEST" % self._url_prefix
-- regex = ".*%s.*" % self._installer_dirname
-+ if self.arch == "s390x":
-+ regex = ".*generic/kernel\.%s.*" % self.name.lower()
-+ else:
-+ regex = ".*%s.*" % self._installer_dirname
-+
- if not self._fetchAndMatchRegex(filename, regex):
- logging.debug("Regex didn't match, not a %s distro", self.name)
- return False
-@@ -1196,7 +1206,10 @@ class UbuntuDistro(DebianDistro):
- if self.fetcher.hasFile("%s/MANIFEST" % self._url_prefix):
- # For regular trees
- filename = "%s/MANIFEST" % self._url_prefix
-- regex = ".*%s.*" % self._installer_dirname
-+ if self.arch == "s390x":
-+ regex = ".*generic/kernel\.%s.*" % self.name.lower()
-+ else:
-+ regex = ".*%s.*" % self._installer_dirname
- elif self.fetcher.hasFile("install/netboot/version.info"):
- # For trees based on ISO's
- self._url_prefix = "install"
diff --git a/debian/patches/virtinst-connection-Fix-error-caching-new-pool.patch b/debian/patches/virtinst-connection-Fix-error-caching-new-pool.patch
deleted file mode 100644
index ba1b11c..0000000
--- a/debian/patches/virtinst-connection-Fix-error-caching-new-pool.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Cole Robinson <crobinso at redhat.com>
-Date: Wed, 30 Aug 2017 10:34:17 -0400
-Subject: virtinst: connection: Fix error caching new pool
-
-$ virt-install --connect test:///default --name foo --ram 64 --import --disk /tmp/idontexist.img
-ERROR Error: --disk /tmp/idontexist.img: 'vols'
----
- virtinst/connection.py | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/virtinst/connection.py b/virtinst/connection.py
-index d6d66fc..0b2fbb0 100644
---- a/virtinst/connection.py
-+++ b/virtinst/connection.py
-@@ -249,6 +249,9 @@ class VirtualConnection(object):
- poollist = self._fetch_cache[self._FETCH_KEY_POOLS]
- poolxmlobj = self._build_pool_raw(poolobj)
- poollist.append(poolxmlobj)
-+
-+ if self._FETCH_KEY_VOLS not in self._fetch_cache:
-+ return
- vollist = self._fetch_cache[self._FETCH_KEY_VOLS]
- vollist.extend(self._fetch_vols_raw(poolxmlobj))
-
diff --git a/debian/patches/virtinst/Fix-patch-to-pygrub.patch b/debian/patches/virtinst/Fix-patch-to-pygrub.patch
index c5d6e3b..6eae9fb 100644
--- a/debian/patches/virtinst/Fix-patch-to-pygrub.patch
+++ b/debian/patches/virtinst/Fix-patch-to-pygrub.patch
@@ -36,10 +36,10 @@ index fbc4f4b..45e044e 100644
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
diff --git a/virtinst/guest.py b/virtinst/guest.py
-index cb9c780..53fa206 100644
+index 4231719..4cb79cb 100644
--- a/virtinst/guest.py
+++ b/virtinst/guest.py
-@@ -365,7 +365,7 @@ class Guest(XMLBuilder):
+@@ -366,7 +366,7 @@ class Guest(XMLBuilder):
if (not install and
self.os.is_xenpv() and
not self.os.kernel):
diff --git a/debian/patches/virtinst/fix-path-to-hvmloader.patch b/debian/patches/virtinst/fix-path-to-hvmloader.patch
index 4b76d68..ef0b55c 100644
--- a/debian/patches/virtinst/fix-path-to-hvmloader.patch
+++ b/debian/patches/virtinst/fix-path-to-hvmloader.patch
@@ -8,10 +8,10 @@ Closes: #685749
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/virtinst/guest.py b/virtinst/guest.py
-index 529286f..cb9c780 100644
+index 143a36f..4231719 100644
--- a/virtinst/guest.py
+++ b/virtinst/guest.py
-@@ -812,7 +812,7 @@ class Guest(XMLBuilder):
+@@ -814,7 +814,7 @@ class Guest(XMLBuilder):
self.os.init = self.os.init or "/bin/sh"
if not self.os.loader and self.os.is_hvm() and self.type == "xen":
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/virt-manager.git
More information about the Pkg-libvirt-commits
mailing list