From a6ee991e8e7752b2a50b19adef3e6dbe83dcb079 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 7 Dec 2021 09:54:46 +0000 Subject: [PATCH] New upstream development version 1.45.94 (preview of 2.0) Requires nbdkit >= 1.28.3 / 1.29.9 Containing this fix: https://gitlab.com/nbdkit/nbdkit/-/commit/c6fe9cb5b4a45e026f6c45ff3f92a510731d87b9 (cherry picked from commit b06ee3b61c34ae0f33391c43aee1c757f82aad64) resolves: rhbz#2011713 --- ...L-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch | 2 +- ...L-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch | 2 +- ...L-Fix-list-of-supported-sound-cards-to-match-RHEL.patch | 2 +- 0004-RHEL-Fixes-for-libguestfs-winsupport.patch | 2 +- ...RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch | 2 +- ...EL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch | 2 +- ...L-point-to-KB-for-supported-v2v-hypervisors-guest.patch | 2 +- 0008-RHEL-Disable-o-glance.patch | 2 +- 0009-RHEL-Remove-the-in-place-option.patch | 2 +- sources | 4 ++-- virt-v2v.spec | 7 +++++-- 11 files changed, 16 insertions(+), 13 deletions(-) diff --git a/0001-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch b/0001-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch index e24f5a1..6c38b34 100644 --- a/0001-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch +++ b/0001-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch @@ -1,4 +1,4 @@ -From 2a2cb7e1f6152b61f3f938399b16d11fdc755d47 Mon Sep 17 00:00:00 2001 +From 950985cd43569d085b1198a15d9ffe0185e954a5 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sun, 28 Sep 2014 19:14:43 +0100 Subject: [PATCH] RHEL: v2v: Select correct qemu binary for -o qemu mode diff --git a/0002-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch b/0002-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch index d2cabb3..1b11668 100644 --- a/0002-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch +++ b/0002-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch @@ -1,4 +1,4 @@ -From c66dfdca6557f88340e5101a447adea5852d6c00 Mon Sep 17 00:00:00 2001 +From 30dd7bf52be72eb2d4d638db89924a701a8290c3 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 30 Sep 2014 10:50:27 +0100 Subject: [PATCH] RHEL: v2v: Disable the --qemu-boot / -oo qemu-boot option diff --git a/0003-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch b/0003-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch index ff28e48..509f2b3 100644 --- a/0003-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch +++ b/0003-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch @@ -1,4 +1,4 @@ -From 03ec5eeadf55eb8b890d7b7fc8740c39417a8c7d Mon Sep 17 00:00:00 2001 +From 8d76ce9a924775b20f5d7a92e2709393e80a3312 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 24 Apr 2015 09:45:41 -0400 Subject: [PATCH] RHEL: Fix list of supported sound cards to match RHEL qemu diff --git a/0004-RHEL-Fixes-for-libguestfs-winsupport.patch b/0004-RHEL-Fixes-for-libguestfs-winsupport.patch index fa9ac10..cbb28ec 100644 --- a/0004-RHEL-Fixes-for-libguestfs-winsupport.patch +++ b/0004-RHEL-Fixes-for-libguestfs-winsupport.patch @@ -1,4 +1,4 @@ -From e0bab87deb129541330a8f67c198847fc0eb7204 Mon Sep 17 00:00:00 2001 +From 225d717b0bfc70d4eaacee8bb09dc4d8cfc3219e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sun, 30 Aug 2015 03:21:57 -0400 Subject: [PATCH] RHEL: Fixes for libguestfs-winsupport. diff --git a/0005-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch b/0005-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch index 1468ad8..e88a247 100644 --- a/0005-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch +++ b/0005-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch @@ -1,4 +1,4 @@ -From 6796448dba4631bffa9c667b8541c659b4bd870b Mon Sep 17 00:00:00 2001 +From 105f5aa22cd03e480b63f61b56e7459db69d41c8 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 2 Mar 2017 14:21:37 +0100 Subject: [PATCH] RHEL: v2v: -i disk: force VNC as display (RHBZ#1372671) diff --git a/0006-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch b/0006-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch index 2002b56..c62f915 100644 --- a/0006-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch +++ b/0006-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch @@ -1,4 +1,4 @@ -From 329a9c9435aae6c43faae4599be9ae424212ddcb Mon Sep 17 00:00:00 2001 +From 8d8dcce022f27e5c82f0bb72fddf5b9329373761 Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Wed, 8 Mar 2017 11:03:40 +0100 Subject: [PATCH] RHEL: v2v: do not mention SUSE Xen hosts (RHBZ#1430203) diff --git a/0007-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch b/0007-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch index 5fcd356..d85c84a 100644 --- a/0007-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch +++ b/0007-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch @@ -1,4 +1,4 @@ -From c1848a548727e0b24da0a2b7bb410ad5e4af456d Mon Sep 17 00:00:00 2001 +From 98e2603f7ff0a2cd9f23f80dd1d22f908a1a869d Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Tue, 26 Mar 2019 09:42:25 +0100 Subject: [PATCH] RHEL: point to KB for supported v2v hypervisors/guests diff --git a/0008-RHEL-Disable-o-glance.patch b/0008-RHEL-Disable-o-glance.patch index 6a22c37..008c1eb 100644 --- a/0008-RHEL-Disable-o-glance.patch +++ b/0008-RHEL-Disable-o-glance.patch @@ -1,4 +1,4 @@ -From 299c6f40236935c1cba51aa4bae106de4621b60c Mon Sep 17 00:00:00 2001 +From e1f82d3ca83499a4fce6347664a277679c04db93 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 30 Jun 2021 11:15:52 +0100 Subject: [PATCH] RHEL: Disable -o glance diff --git a/0009-RHEL-Remove-the-in-place-option.patch b/0009-RHEL-Remove-the-in-place-option.patch index 58b4977..acd6c4d 100644 --- a/0009-RHEL-Remove-the-in-place-option.patch +++ b/0009-RHEL-Remove-the-in-place-option.patch @@ -1,4 +1,4 @@ -From cf846671d2f7482ec147397d3dc860a5df61969a Mon Sep 17 00:00:00 2001 +From c7de0b56ada81868aecd1c719bc3621109675b60 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 2 Dec 2021 11:56:05 +0000 Subject: [PATCH] RHEL: Remove the --in-place option diff --git a/sources b/sources index fa0fd0a..589d3a0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (virt-v2v-1.45.93.tar.gz) = d70ef9bdebf0c3579274ddbcce96681600eb263576c605fdf6f17cc6ae76bed6452a4c978e91ff662f7c2f4c6dc28fe760a49e545adce14ce5743c492bea8246 -SHA512 (virt-v2v-1.45.93.tar.gz.sig) = e2f6e203940490409bc234113e4b2d7cfd2be4ada08897fbd59eba52411f06bb30c4a7fba9b1ecf1c1ef9b3d5bed2f889703758e99820b2e3d4787835bc45958 +SHA512 (virt-v2v-1.45.94.tar.gz) = d3a7644f08decf50074632df727605c9adcf7fa0eada39c5def99f6f682353a40355e48fe5e2207b976fa3bfa42127a226317f7502f32dc7cc0666efcabb44ce +SHA512 (virt-v2v-1.45.94.tar.gz.sig) = 61d4ba66ceea91312ca1b730179d6ce2a565f2bfab17c7ebd54f5f54f3ac176b922987f217fbb02b6906004ebefb22fb8e66e4c88da579352d643ddbbe175249 diff --git a/virt-v2v.spec b/virt-v2v.spec index b8be27e..d8f9384 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -14,7 +14,7 @@ Name: virt-v2v Epoch: 1 -Version: 1.45.93 +Version: 1.45.94 Release: 1%{?dist} Summary: Convert a virtual machine to run on KVM @@ -134,7 +134,7 @@ Requires: libnbd >= 1.8.2-2.el9 Requires: %{_bindir}/qemu-nbd Requires: %{_bindir}/nbdcopy Requires: %{_bindir}/nbdinfo -Requires: nbdkit-server >= 1.26.5-1.el9 +Requires: nbdkit-server >= 1.28.3-1.el9 Requires: nbdkit-curl-plugin Requires: nbdkit-file-plugin Requires: nbdkit-nbd-plugin @@ -300,6 +300,9 @@ popd %changelog +* Tue Dec 07 2021 Richard W.M. Jones - 1:1.45.94-1 +- New upstream development version 1.45.94 (preview of 2.0) + * Fri Dec 03 2021 Richard W.M. Jones - 1:1.45.93-1 - Rebase to upstream 1.45.93. - Change video type to VGA (instead of QXL).