From 844ab511ff5476172c4f9d2bf5518de8f1d0c6ba3e6b31fe54f3cd121cb7fd1c Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Thu, 2 May 2024 20:33:56 +0000 Subject: [PATCH 1/4] - bsc#1223444 - New virt-v2v dependency on btrfsprogs causes error with zypper dup on systems without btrfs installed Add additional Requires for filesystem tools in the spec file OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-v2v?expand=0&rev=56 --- virt-v2v.changes | 7 +++++++ virt-v2v.spec | 3 +++ 2 files changed, 10 insertions(+) diff --git a/virt-v2v.changes b/virt-v2v.changes index 94fc490..a138fb5 100644 --- a/virt-v2v.changes +++ b/virt-v2v.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu May 2 14:32:22 MDT 2024 - carnold@suse.com + +- bsc#1223444 - New virt-v2v dependency on btrfsprogs causes error + with zypper dup on systems without btrfs installed + Add additional Requires for filesystem tools in the spec file + ------------------------------------------------------------------- Fri Apr 19 09:03:27 MDT 2024 - carnold@suse.com diff --git a/virt-v2v.spec b/virt-v2v.spec index eb44ba5..dbf61d4 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -66,6 +66,7 @@ Requires: %{_bindir}/virsh Requires: btrfsprogs Requires: curl Requires: dhcp-client +Requires: e2fsprogs Requires: gptfdisk Requires: guestfs-tools >= 1.42 Requires: libguestfs-winsupport @@ -79,9 +80,11 @@ Requires: nbdkit-ssh-plugin %ifarch x86_64 Requires: nbdkit-vddk-plugin %endif +Requires: ntfsprogs Requires: openssh-clients Requires: ovmf Requires: unzip +Requires: xfsprogs # Build only for architectures that have a kernel ExclusiveArch: x86_64 ppc64le s390x aarch64 riscv64 %if 0%{patches_touch_autotools} From 7bab7869db210f766e59ebebde79b45b937772778ff28cbd2b825c437844be08 Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Tue, 7 May 2024 16:35:19 +0000 Subject: [PATCH 2/4] Drop Requires on the following packages and move them into libguestfs-appliance btrfsprogs, curl, dhcp-client, e2fsprogs, gptfdisk OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-v2v?expand=0&rev=57 --- virt-v2v.changes | 6 ++++-- virt-v2v.spec | 6 +----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/virt-v2v.changes b/virt-v2v.changes index a138fb5..d877f65 100644 --- a/virt-v2v.changes +++ b/virt-v2v.changes @@ -1,9 +1,11 @@ ------------------------------------------------------------------- -Thu May 2 14:32:22 MDT 2024 - carnold@suse.com +Tue May 7 08:59:53 MDT 2024 - carnold@suse.com - bsc#1223444 - New virt-v2v dependency on btrfsprogs causes error with zypper dup on systems without btrfs installed - Add additional Requires for filesystem tools in the spec file + Drop Requires on the following packages and move them into + libguestfs-appliance + btrfsprogs, curl, dhcp-client, e2fsprogs, gptfdisk ------------------------------------------------------------------- Fri Apr 19 09:03:27 MDT 2024 - carnold@suse.com diff --git a/virt-v2v.spec b/virt-v2v.spec index dbf61d4..76dec3e 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -63,12 +63,8 @@ Requires: %{_bindir}/gawk Requires: %{_bindir}/gzip Requires: %{_bindir}/qemu-nbd Requires: %{_bindir}/virsh -Requires: btrfsprogs -Requires: curl -Requires: dhcp-client -Requires: e2fsprogs -Requires: gptfdisk Requires: guestfs-tools >= 1.42 +Requires: libguestfs >= 1.42 Requires: libguestfs-winsupport Requires: libguestfs0 >= 1.42 Requires: libnbd From 67ea30eb8459b44269868cd39d80fe829056a0e32dfc1f6bc5396a4e1af99d1f Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Tue, 7 May 2024 20:53:20 +0000 Subject: [PATCH 3/4] Increase miminum version of libguestfs to run virt-v2v OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-v2v?expand=0&rev=58 --- virt-v2v.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/virt-v2v.spec b/virt-v2v.spec index 76dec3e..4b8f05c 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -37,7 +37,7 @@ BuildRequires: file-devel BuildRequires: gcc BuildRequires: gettext-devel BuildRequires: glib2-devel -BuildRequires: libguestfs-devel >= 1.42 +BuildRequires: libguestfs-devel >= 1.49 BuildRequires: libjansson-devel BuildRequires: libosinfo-devel BuildRequires: libvirt-devel @@ -63,10 +63,10 @@ Requires: %{_bindir}/gawk Requires: %{_bindir}/gzip Requires: %{_bindir}/qemu-nbd Requires: %{_bindir}/virsh -Requires: guestfs-tools >= 1.42 -Requires: libguestfs >= 1.42 +Requires: guestfs-tools >= 1.49 +Requires: libguestfs >= 1.49 Requires: libguestfs-winsupport -Requires: libguestfs0 >= 1.42 +Requires: libguestfs0 >= 1.49 Requires: libnbd Requires: nbdkit Requires: nbdkit-curl-plugin From e58b19888dfd4ab8d9c1906ab5f7e6579b604e77831cb79e1a5e085a711dcfdd Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Tue, 7 May 2024 21:11:41 +0000 Subject: [PATCH 4/4] Drop Requires on ntfsprogs, xfsprogs OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-v2v?expand=0&rev=59 --- virt-v2v.changes | 1 + virt-v2v.spec | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/virt-v2v.changes b/virt-v2v.changes index d877f65..5b1f0a4 100644 --- a/virt-v2v.changes +++ b/virt-v2v.changes @@ -6,6 +6,7 @@ Tue May 7 08:59:53 MDT 2024 - carnold@suse.com Drop Requires on the following packages and move them into libguestfs-appliance btrfsprogs, curl, dhcp-client, e2fsprogs, gptfdisk + ntfsprogs, xfsprogs ------------------------------------------------------------------- Fri Apr 19 09:03:27 MDT 2024 - carnold@suse.com diff --git a/virt-v2v.spec b/virt-v2v.spec index 4b8f05c..48a3dfc 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -76,11 +76,9 @@ Requires: nbdkit-ssh-plugin %ifarch x86_64 Requires: nbdkit-vddk-plugin %endif -Requires: ntfsprogs Requires: openssh-clients Requires: ovmf Requires: unzip -Requires: xfsprogs # Build only for architectures that have a kernel ExclusiveArch: x86_64 ppc64le s390x aarch64 riscv64 %if 0%{patches_touch_autotools}