Hello community, here is the log from the commit of package virt-v2v for openSUSE:Factory checked in at 2014-01-22 14:06:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/virt-v2v (Old) and /work/SRC/openSUSE:Factory/.virt-v2v.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "virt-v2v" Changes: -------- --- /work/SRC/openSUSE:Factory/virt-v2v/virt-v2v.changes 2014-01-10 21:23:06.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.virt-v2v.new/virt-v2v.changes 2014-01-23 15:57:54.000000000 +0100 @@ -1,0 +2,17 @@ +Tue Jan 21 22:44:29 UTC 2014 - mlatimer@suse.com + +- Removed RHEV specific help in virt-v2v, as this output type is not + supported in SUSE environments + * remove_rhev_help.patch + +------------------------------------------------------------------- +Fri Jan 17 23:15:44 UTC 2014 - mlatimer@suse.com + +- Updated Windows conversion code to use pvvxsvc.exe to install vmdp through + a service. +- Added a new parameter 'vmdp=[auto,always,never]', to determine when the vmdp + should be automatically added. Default option is auto - only install if vmdp + is found on source guest. + * win_convert_on_suse.patch + +------------------------------------------------------------------- New: ---- remove_rhev_help.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virt-v2v.spec ++++++ --- /var/tmp/diff_new_pack.3v3i7W/_old 2014-01-23 15:57:55.000000000 +0100 +++ /var/tmp/diff_new_pack.3v3i7W/_new 2014-01-23 15:57:55.000000000 +0100 @@ -31,6 +31,7 @@ Patch2: mask_unused_hv_features.patch Patch3: win_convert_on_suse.patch Patch4: fix_manifest.patch +Patch5: remove_rhev_help.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Backported upstream patches @@ -125,6 +126,7 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build %{__perl} Build.PL ++++++ remove_rhev_help.patch ++++++ Remove RHEV specific help in virt-v2v, as this version of virt-v2v should only be ran on SUSE servers. virt-v2v.pl | 104 +++++------------------------------------------------------- 1 file changed, 10 insertions(+), 94 deletions(-) diff -Nurp a/v2v/virt-v2v.pl b/v2v/virt-v2v.pl --- a/v2v/virt-v2v.pl 2014-01-17 16:30:19.018596294 -0700 +++ b/v2v/virt-v2v.pl 2014-01-21 15:33:52.062302607 -0700 @@ -1,6 +1,7 @@ #!/usr/bin/perl # virt-v2v # Copyright (C) 2009-2012 Red Hat Inc. +# Copyright (C) 2013 SUSE Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -47,19 +48,16 @@ virt-v2v - Convert a guest to use KVM virt-v2v -i libvirtxml -os imported --network default guest-domain.xml - virt-v2v -ic esx://esx.server/ -os imported --network default esx_guest + virt-v2v -ic xen+ssh://xen.server/ -os imported --network default xen_guest - virt-v2v -ic esx://esx.server/ \ - -o rhev -os rhev.nfs.storage:/export_domain --network rhevm \ - esx_guest + virt-v2v -ic esx://esx.server/ -os imported --network default esx_guest =head1 DESCRIPTION -virt-v2v converts guests from a foreign hypervisor to run on KVM, managed by -libvirt or Red Hat Enterprise Virtualisation (RHEV) version 2.2 or later. It -can currently convert Red Hat Enterprise Linux, SUSE Linux Enterprise Server, -and Windows guests running on Xen, VirtualBox, and VMware ESX. It will enable -VirtIO drivers in the converted guest if possible. +virt-v2v converts guests from a foreign hypervisor to run on KVM,managed by +libvirt. It can currently convert SUSE Linux Enterprise Server, Red Hat +Enterprise Linux, and Windows guests running on Xen, VirtualBox, and +VMware ESX. It will enable VirtIO drivers in the converted guest if possible. =head1 OPTIONS @@ -110,7 +108,8 @@ my $output_method = "libvirt"; =item B<-o method> -Specifies the output method. Supported output methods are: +Specifies the output method. In SUSE environments, the only supported output +method is: =over @@ -121,12 +120,6 @@ libvirt output method. Also see the I<-oc> option. -=item rhev - -Create a guest on a RHEV 'Export' storage domain, which can later be imported -into RHEV using the UI. I<-os> must specify the location of a RHEV export -storage domain for the RHEV output method. - =back If no output type is specified, it defaults to libvirt. @@ -156,26 +149,6 @@ converted guest. For the I<libvirt> output method, this must be the name of a storage pool. -For the I<rhev> output method, this specifies the NFS path to a RHEV Export -storage domain. Note that the storage domain must have been previously -initialised by RHEV. The domain must be in the format <host>:<path>, eg: - - rhev-storage.example.com:/rhev/export - -The nfs export must be mountable and writable by the machine running virt-v2v. - -=item B<-op pool> - -See I<-os> for the I<libvirt> output method. - -B<DEPRECATED> Use I<-os> instead. - -=item B<-osd domain> - -See I<-os> for the I<rhev> output method. - -B<DEPRECATED> Use I<-os> instead. - =cut my $output_format; @@ -210,64 +183,7 @@ as the input name. =cut my $vmtype; - -=item B<--vmtype type> - -Specify the type of guest which will be created on a RHEV target. Options are -I<desktop> or I<server>. If this option is not specified, a default option will -be chosen based on the detected guest operating system: - -=over - -=item Desktop - -=over - -=item * - -Fedora - -=item * - -openSUSE - -=item * - -RHEL Client/Workstation/Desktop - -=item * - -SUSE Linux Enterprise Desktop - -=item * - -Windows XP/Vista/7 - -=back - -=item Server - -=over - -=item * - -RHEL Server/AS/ES - -=item * - -SUSE Linux Enterprise Server - -=item * - -Windows 2003/2003r2/2008/2008r2 - -=back - -=back - -If the guest OS is not detected as any of the above, it will default to server. - -=cut +# $vmtype is not used in SUSE conversions my @config_files; ++++++ win_convert_on_suse.patch ++++++ ++++ 606 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/virt-v2v/win_convert_on_suse.patch ++++ and /work/SRC/openSUSE:Factory/.virt-v2v.new/win_convert_on_suse.patch -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org