From 9a1b2d03e1c78ed6bc110f7619660cdf60734d2c Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Thu, 9 Jun 2016 21:54:40 +0000 Subject: [PATCH] - bsc#983241 - Using eepro1000 emulated driver leads to 'eepro100' is not a valid device model name Drop virtman-eepro100.patch - Remove unecessary hyphen '-' from tumbleweed name virtinst-fix-tumbleweed-detection.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=313 --- virt-manager.changes | 9 +++++++++ virt-manager.spec | 2 -- virtinst-fix-tumbleweed-detection.patch | 2 +- virtman-eepro100.patch | 13 ------------- 4 files changed, 10 insertions(+), 16 deletions(-) delete mode 100644 virtman-eepro100.patch diff --git a/virt-manager.changes b/virt-manager.changes index e9745e83..8e84e6df 100644 --- a/virt-manager.changes +++ b/virt-manager.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Jun 7 14:18:32 MDT 2016 - carnold@suse.com + +- bsc#983241 - Using eepro1000 emulated driver leads to 'eepro100' + is not a valid device model name + Drop virtman-eepro100.patch +- Remove unecessary hyphen '-' from tumbleweed name + virtinst-fix-tumbleweed-detection.patch + ------------------------------------------------------------------- Tue Jun 7 12:14:23 UTC 2016 - mvetter@suse.com diff --git a/virt-manager.spec b/virt-manager.spec index 912ef338..6527bbde 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -54,7 +54,6 @@ Patch75: virtman-dont-allow-grub.xen-to-be-deleted.patch Patch76: virtinst-pvgrub2-bootloader.patch Patch77: virtinst-nfs-install-sanitize.patch # Features or Enhancements -Patch100: virtman-eepro100.patch Patch101: virtman-default-guest-from-host-os.patch Patch102: virtman-default-to-xen-pv.patch Patch103: virtman-packages.patch @@ -180,7 +179,6 @@ machine). %patch76 -p1 %patch77 -p1 # Enhancements -%patch100 -p1 %patch101 -p1 %patch102 -p1 %patch103 -p1 diff --git a/virtinst-fix-tumbleweed-detection.patch b/virtinst-fix-tumbleweed-detection.patch index 96a742ad..47565eac 100644 --- a/virtinst-fix-tumbleweed-detection.patch +++ b/virtinst-fix-tumbleweed-detection.patch @@ -24,7 +24,7 @@ Index: virt-manager-1.3.2/virtinst/urlfetcher.py - self.os_variant += distro_version + # Tumbleweed 8 digit date + if len(version) == 8: -+ self.os_variant += "-tumbleweed" ++ self.os_variant += "tumbleweed" + else: + self.os_variant += distro_version else: diff --git a/virtman-eepro100.patch b/virtman-eepro100.patch deleted file mode 100644 index 2a9c0ab7..00000000 --- a/virtman-eepro100.patch +++ /dev/null @@ -1,13 +0,0 @@ -Enhancement to add the eepro100 NIC for KVM -Index: virt-manager-1.3.2/virtManager/addhardware.py -=================================================================== ---- virt-manager-1.3.2.orig/virtManager/addhardware.py -+++ virt-manager-1.3.2/virtManager/addhardware.py -@@ -571,6 +571,7 @@ class vmmAddHardware(vmmGObjectUI): - if vm.is_hvm(): - mod_list = [] - if vm.get_hv_type() in ["kvm", "qemu", "test"]: -+ mod_list.append("eepro100") - mod_list.append("virtio") - mod_list.append("rtl8139") - mod_list.append("e1000")