commit virt-v2v for openSUSE:Factory

2015-09-23 Thread h_root 
Hello community,

here is the log from the commit of package virt-v2v for openSUSE:Factory 
checked in at 2015-09-24 06:14:23

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.changes2015-09-13 
09:45:34.0 +0200
+++ /work/SRC/openSUSE:Factory/.virt-v2v.new/virt-v2v.changes   2015-09-24 
06:14:27.0 +0200
@@ -1,0 +2,8 @@
+Fri Sep 18 20:26:43 UTC 2015 - mlati...@suse.com
+
+- Prevent 'uninitialized value $kernel' warning if default kernel
+  is a symlink (bsc#946467).
+  follow_default_kernel_symlink.patch
+- Bump default VMDP version to 2.2.
+
+---

New:

  follow_default_kernel_symlink.patch



Other differences:
--
++ virt-v2v.spec ++
--- /var/tmp/diff_new_pack.bMCHBw/_old  2015-09-24 06:14:28.0 +0200
+++ /var/tmp/diff_new_pack.bMCHBw/_new  2015-09-24 06:14:28.0 +0200
@@ -46,6 +46,7 @@
 Patch17:handle_existing_storage.patch
 Patch18:check_net_oldname.patch
 Patch19:support_macvtap_networks.patch
+Patch20:follow_default_kernel_symlink.patch
 Patch50:meta_license_to_list.patch
 Patch99:remove_esx_examples.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
@@ -174,6 +175,7 @@
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
+%patch20 -p1
 # Apply meta_license_to_list.patch only for versions > SLES12
 %if 0%{?suse_version} >= 1320
 %patch50 -p1

++ follow_default_kernel_symlink.patch ++
Index: virt-v2v-0.9.1/lib/Sys/VirtConvert/Converter/Linux.pm
===
--- virt-v2v-0.9.1.orig/lib/Sys/VirtConvert/Converter/Linux.pm
+++ virt-v2v-0.9.1/lib/Sys/VirtConvert/Converter/Linux.pm
@@ -500,9 +500,9 @@ sub list_kernels
 
 my @kernels;
 
-# Start by adding the default kernel
+# Start by adding the default kernel (symlink target only)
 my $default = $self->get_default_image();
-push(@kernels, $default) if length($default) > 0;
+push(@kernels, ($g->realpath($default))) if (length($default) > 0 );
 
 # This is how the grub2 config generator enumerates kernels
 foreach my $kernel ($g->glob_expand('/boot/kernel-*'),
@@ -2898,6 +2898,9 @@ sub _supports_virtio
 "virtio_blk" => 0
 );
 
+# Skip if undefined kernel version
+return 0 if (!defined($kernel));
+
 # Search the installed kernel's modules for the virtio drivers
 foreach my $module ($g->find("/lib/modules/$kernel")) {
 foreach my $driver (keys(%checklist)) {
++ win_convert_on_suse.patch ++
--- /var/tmp/diff_new_pack.bMCHBw/_old  2015-09-24 06:14:28.0 +0200
+++ /var/tmp/diff_new_pack.bMCHBw/_new  2015-09-24 06:14:28.0 +0200
@@ -566,7 +566,7 @@
 +
 +  
 +  
-+windows/VMDP-WIN-2.1.exe
++windows/VMDP-WIN-2.2.exe

commit virt-v2v for openSUSE:Factory

2015-09-13 Thread h_root 
Hello community,

here is the log from the commit of package virt-v2v for openSUSE:Factory 
checked in at 2015-09-13 09:45:26

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.changes2015-07-22 
09:20:02.0 +0200
+++ /work/SRC/openSUSE:Factory/.virt-v2v.new/virt-v2v.changes   2015-09-13 
09:45:34.0 +0200
@@ -1,0 +2,14 @@
+Fri Sep 11 02:58:45 UTC 2015 - mlati...@suse.com
+
+- Prevent 'uninitialized value $oldname' warnings if network name
+  is not defined (bsc#939542).
+  check_net_oldname.patch
+- Support conversions of domains using direct (macvtap) network
+  configurations. Automatic remapping is only possible through the
+  --network or --bridge parameter.
+  support_macvtap_networks.patch
+- Change 'ExclusiveArch' to x86_64 as Xen sources are x86_64 only,
+  and the target running virt-v2v must be the same arch (remote
+  targets are not supported).
+
+---

New:

  check_net_oldname.patch
  support_macvtap_networks.patch



Other differences:
--
++ virt-v2v.spec ++
--- /var/tmp/diff_new_pack.u49pa2/_old  2015-09-13 09:45:35.0 +0200
+++ /var/tmp/diff_new_pack.u49pa2/_new  2015-09-13 09:45:35.0 +0200
@@ -44,6 +44,8 @@
 Patch15:support_any_opensuse_ver.patch
 Patch16:use_x86_64_for_i586.patch
 Patch17:handle_existing_storage.patch
+Patch18:check_net_oldname.patch
+Patch19:support_macvtap_networks.patch
 Patch50:meta_license_to_list.patch
 Patch99:remove_esx_examples.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
@@ -58,7 +60,7 @@
 # Unfortunately, despite really being noarch, we have to make virt-v2v arch
 # dependent to avoid build failures on architectures where libguestfs isn't
 # available.
-ExclusiveArch:  x86_64 ppc64 ppc64le s390x
+ExclusiveArch:  x86_64
 
 # Build system direct requirements
 BuildRequires:  gettext
@@ -170,6 +172,8 @@
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
+%patch18 -p1
+%patch19 -p1
 # Apply meta_license_to_list.patch only for versions > SLES12
 %if 0%{?suse_version} >= 1320
 %patch50 -p1

++ check_net_oldname.patch ++
In some network configurations (e.g. macvtap), it is possible to see the
following error during the conversion:

 Use of uninitialized value $oldname in concatenation (.) or string at
 /usr/lib/perl5/vendor_perl/5.18.2/Sys/VirtConvert/Config.pm line 489.

Prevent the error by ensure $oldname and $oldtype are defined before
attempting to use them.

Index: virt-v2v-0.9.1/lib/Sys/VirtConvert/Config.pm
===
--- virt-v2v-0.9.1.orig/lib/Sys/VirtConvert/Config.pm
+++ virt-v2v-0.9.1/lib/Sys/VirtConvert/Config.pm
@@ -486,10 +486,12 @@ sub map_network
 
 my $mapping;
 foreach my $root (@search) {
-($mapping) = $root->findnodes
-("network[\@type='$oldtype' and \@name='$oldname']/network");
+if (defined($oldtype) && defined($oldname)) {
+($mapping) = $root->findnodes
+("network[\@type='$oldtype' and \@name='$oldname']/network");
 
-last if defined($mapping);
+last if defined($mapping);
+}
 }
 
 unless (defined($mapping)) {
++ support_macvtap_networks.patch ++
Support network configurations such as:

 
   
   
   
   
 

which should be converted to:

 
   
   
   
   
 

It is not possible to map this to another network through the virt-v2v
configuration file, or to validate that the interface works on the target.
Remapping during conversion can be done through the --network or --bridge
parameters.


Index: virt-v2v-0.9.1/lib/Sys/VirtConvert/Connection/LibVirt.pm
===
--- virt-v2v-0.9.1.orig/lib/Sys/VirtConvert/Connection/LibVirt.pm
+++ virt-v2v-0.9.1/lib/Sys/VirtConvert/Connection/LibVirt.pm
@@ -225,6 +225,13 @@ sub _parse_dom
 $info{mac} = _node_val($nic, 'mac/@address');
 $info{vnet} = _node_val($nic, 'source/@network | source/@bridge');
 $info{vnet_type} = _node_val($nic, '@type');
+if (($info{vnet_type} eq 'direct') && (!defined($info{vnet}))) {
+my ($source) = $root->findnodes('devices/interface/source');
+if (defined($source)) {
+$info{vnet_source}->{dev} = _node_val($source, '@dev');
+$info{vnet_source}->{mode} = _node_val($source, '@mode');
+}
+}
 
 push(@{$meta{nics}}, \%info);
 }
Index: virt-v2v-0.9.1/lib/Sys/VirtConvert/Connection/LibVirtTarget.pm

commit virt-v2v for openSUSE:Factory

2015-07-22 Thread h_root 
Hello community,

here is the log from the commit of package virt-v2v for openSUSE:Factory 
checked in at 2015-07-22 09:19:59

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.changes2015-07-14 
17:44:37.0 +0200
+++ /work/SRC/openSUSE:Factory/.virt-v2v.new/virt-v2v.changes   2015-07-22 
09:20:02.0 +0200
@@ -1,0 +2,8 @@
+Mon Jul 13 01:29:56 UTC 2015 - mlati...@suse.com
+
+- Add new --storage_conflict_action=(abort|overwrite|use) option to
+  help prevent unintended disk conversions if the destination storage
+  volume already exists.
+  handle_existing_storage.patch
+
+---

New:

  handle_existing_storage.patch



Other differences:
--
++ virt-v2v.spec ++
--- /var/tmp/diff_new_pack.OFMeoD/_old  2015-07-22 09:20:03.0 +0200
+++ /var/tmp/diff_new_pack.OFMeoD/_new  2015-07-22 09:20:03.0 +0200
@@ -43,6 +43,7 @@
 Patch14:handle_ova_files.patch
 Patch15:support_any_opensuse_ver.patch
 Patch16:use_x86_64_for_i586.patch
+Patch17:handle_existing_storage.patch
 Patch50:meta_license_to_list.patch
 Patch99:remove_esx_examples.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
@@ -168,6 +169,7 @@
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
+%patch17 -p1
 # Apply meta_license_to_list.patch only for versions  SLES12
 %if 0%{?suse_version} = 1320
 %patch50 -p1

++ handle_existing_storage.patch ++
Index: virt-v2v-0.9.1/v2v/virt-v2v.pl
===
--- virt-v2v-0.9.1.orig/v2v/virt-v2v.pl
+++ virt-v2v-0.9.1/v2v/virt-v2v.pl
@@ -304,6 +304,22 @@ drivers have been manually copied to the
 
 =cut
 
+my $storage_conflict_action = abort;
+
+=item B--storage_conflict_action=abort
+
+=item B--storage_conflict_action=overwrite
+
+=item B--storage_conflict_action=use
+
+Specifies the action to take when the storage volume already exists in the
+target storage pool. The default setting is abort, which causes the virt-v2v
+process to abort the copy. The overwrite option causes the existing volume
+to be overwritten. The use option causes the existing volume to be used in
+place (and the storage copy skipped).
+
+=cut
+
 my $verbose;
 
 =item B-v | --verbose
@@ -347,6 +363,7 @@ GetOptions (help|?  = sub {
 print $Sys::VirtConvert::VERSION\n;
 exit(0);
 },
+storage_conflict_action=s = \$storage_conflict_action,
 v|verbose+  = \$verbose,
 vv  = sub {
 $verbose  += 2;
@@ -580,7 +597,7 @@ if (defined($verbose)) {
 logmsg NOTICE, __x('Copying virtual machine storage to target '.
'({output})', output = $output_method)
 }
-$source-copy_storage($target, $output_format, $output_sparse);
+$source-copy_storage($target, $output_format, $output_sparse, 
$storage_conflict_action);
 
 # Open a libguestfs handle on the guest's storage devices
 if (defined($verbose)) { logmsg NOTICE, __x('Starting guestfs') }
Index: virt-v2v-0.9.1/lib/Sys/VirtConvert/Connection/Source.pm
===
--- virt-v2v-0.9.1.orig/lib/Sys/VirtConvert/Connection/Source.pm
+++ virt-v2v-0.9.1/lib/Sys/VirtConvert/Connection/Source.pm
@@ -157,7 +157,7 @@ reflect their new locations and properti
 sub copy_storage
 {
 my $self = shift;
-my ($target, $output_format, $output_sparse) = @_;
+my ($target, $output_format, $output_sparse, $storage_conflict_action) = 
@_;
 
 my $meta = $self-get_meta();
 
@@ -165,11 +165,23 @@ sub copy_storage
 my $src = $disk-{src};
 my $dst;
 if ($target-volume_exists($src-get_name())) {
-logmsg WARN, __x('Storage volume {name} already exists on the '.
- 'target. NOT copying it again. Delete the volume 
'.
- 'and retry to copy again.',
+if ($storage_conflict_action eq use) {
+logmsg WARN, __x('Using existing storage volume {name}',
+ name = $src-get_name());
+$dst = $target-get_volume($src-get_name());
+} elsif ($storage_conflict_action eq overwrite) {
+logmsg WARN, __x('Overwriting existing storage volume {name}',
+ name = $src-get_name());
+$dst = $target-get_volume($src-get_name());
+$dst-get_local_path();
+_volume_copy($src, $dst);
+} else {
+v2vdie

commit virt-v2v for openSUSE:Factory

2015-07-14 Thread h_root 
Hello community,

here is the log from the commit of package virt-v2v for openSUSE:Factory 
checked in at 2015-07-14 17:43:35

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.changes2015-01-22 
21:49:31.0 +0100
+++ /work/SRC/openSUSE:Factory/.virt-v2v.new/virt-v2v.changes   2015-07-14 
17:44:37.0 +0200
@@ -1,0 +2,6 @@
+Thu Jul  2 21:39:36 UTC 2015 - mlati...@suse.com
+
+- Use x86_64 architecture type for i586 and i686 guests (bsc#936920)
+  use_x86_64_for_i586.patch 
+
+---

New:

  use_x86_64_for_i586.patch



Other differences:
--
++ virt-v2v.spec ++
--- /var/tmp/diff_new_pack.FAeVS8/_old  2015-07-14 17:44:39.0 +0200
+++ /var/tmp/diff_new_pack.FAeVS8/_new  2015-07-14 17:44:39.0 +0200
@@ -42,6 +42,7 @@
 Patch13:reset_virtio_after_config.patch
 Patch14:handle_ova_files.patch
 Patch15:support_any_opensuse_ver.patch
+Patch16:use_x86_64_for_i586.patch
 Patch50:meta_license_to_list.patch
 Patch99:remove_esx_examples.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
@@ -166,6 +167,7 @@
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
 # Apply meta_license_to_list.patch only for versions  SLES12
 %if 0%{?suse_version} = 1320
 %patch50 -p1

++ use_x86_64_for_i586.patch ++
All i586 and i686 machines should be treated as x86_64 machines as
emulated by qemu. (bsc#936920)

Index: virt-v2v-0.9.1/lib/Sys/VirtConvert/Connection/LibVirtTarget.pm
===
--- virt-v2v-0.9.1.orig/lib/Sys/VirtConvert/Connection/LibVirtTarget.pm
+++ virt-v2v-0.9.1/lib/Sys/VirtConvert/Connection/LibVirtTarget.pm
@@ -538,6 +538,12 @@ sub _configure_capabilities
 
 my $arch = $guestcaps-{arch};
 
+# i586 and i686 architectures should be treated as x86_64
+if ($arch =~ /i[56]86/) {
+$guestcaps-{arch} = 'x86_64';
+$arch = 'x86_64';
+}
+
 (my $guestcap) = $caps-findnodes
 (/capabilities/guest[arch[\@name='$arch']/domain/\@type='kvm']);

commit virt-v2v for openSUSE:Factory

2015-01-22 Thread h_root 
Hello community,

here is the log from the commit of package virt-v2v for openSUSE:Factory 
checked in at 2015-01-22 21:49:23

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.changes2014-12-03 
22:49:03.0 +0100
+++ /work/SRC/openSUSE:Factory/.virt-v2v.new/virt-v2v.changes   2015-01-22 
21:49:31.0 +0100
@@ -1,0 +2,6 @@
+Mon Jan  5 22:22:00 UTC 2015 - mlati...@suse.com
+
+- Remove openSUSE version requirements from virt-v2v.db (bsc#909046)
+  support_any_opensuse_ver.patch 
+
+---

New:

  support_any_opensuse_ver.patch



Other differences:
--
++ virt-v2v.spec ++
--- /var/tmp/diff_new_pack.XTABwM/_old  2015-01-22 21:49:32.0 +0100
+++ /var/tmp/diff_new_pack.XTABwM/_new  2015-01-22 21:49:32.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package virt-v2v
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -41,6 +41,7 @@
 Patch12:rename_vb_examples.patch
 Patch13:reset_virtio_after_config.patch
 Patch14:handle_ova_files.patch
+Patch15:support_any_opensuse_ver.patch
 Patch50:meta_license_to_list.patch
 Patch99:remove_esx_examples.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
@@ -164,6 +165,7 @@
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 # Apply meta_license_to_list.patch only for versions  SLES12
 %if 0%{?suse_version} = 1320
 %patch50 -p1

++ support_any_opensuse_ver.patch ++
openSUSE Factory/Tumbleweed uses the date of the build, rather than a
major/minor version number. In order to ensure these guests can be converted
the major/minor number requirement must be dropped from virt-v2v.db (This is
safe as all current versions of openSUSE support virtio in the default
kernel.) (bsc#909046)

Index: virt-v2v-0.9.1/v2v/virt-v2v.db
===
--- virt-v2v-0.9.1.orig/v2v/virt-v2v.db
+++ virt-v2v-0.9.1/v2v/virt-v2v.db
@@ -61,19 +61,10 @@ the modifications or additions to /etc/v
 dep name='xorg-x11-driver-video'/
   /capability
 
-  !-- openSUSE 11/12/13 supports virtio in the default kernel --
-  capability os='linux' distro='opensuse' major='13' name='virtio'
+  !-- openSUSE supports virtio in the default kernel --
+  capability os='linux' distro='opensuse' name='virtio'
 dep name='kernel'/
   /capability
-  capability os='linux' distro='opensuse' major='12' name='virtio'
-dep name='kernel'/
-  /capability
-  capability os='linux' distro='opensuse' major='11' name='virtio'
-dep name='kernel'/
-  /capability
-  capability os='linux' distro='opensuse' major='10' name='virtio'
-dep name='kernel' minversion='2.6.25.5-1.1'/
-  /capability
   !-- openSUSE packages the cirrus driver in xorg-x11-driver-video --
   capability os='linux' distro='opensuse' name='cirrus'
 dep name='xorg-x11-driver-video'/
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit virt-v2v for openSUSE:Factory

2014-12-03 Thread h_root 
Hello community,

here is the log from the commit of package virt-v2v for openSUSE:Factory 
checked in at 2014-12-03 22:48:25

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.changes2014-07-24 
01:23:09.0 +0200
+++ /work/SRC/openSUSE:Factory/.virt-v2v.new/virt-v2v.changes   2014-12-03 
22:49:03.0 +0100
@@ -1,0 +2,5 @@
+Tue Dec  2 20:38:50 UTC 2014 - mplus...@suse.com
+
+- Fix dependency on perl-Module-Pluggable
+
+---



Other differences:
--
++ virt-v2v.spec ++
--- /var/tmp/diff_new_pack.tMe22z/_old  2014-12-03 22:49:04.0 +0100
+++ /var/tmp/diff_new_pack.tMe22z/_new  2014-12-03 22:49:04.0 +0100
@@ -87,6 +87,7 @@
 BuildRequires:  perl-Win-Hivex = 1.2.2
 
 Requires:   perl-base
+Requires:   perl(Module::Pluggable)
 # Required for the name optional argument to add_drive_opts
 Requires:   perl-Sys-Guestfs = 1.14.0
 

++ remove-duplicate-btrfs-roots.patch ++
--- /var/tmp/diff_new_pack.tMe22z/_old  2014-12-03 22:49:04.0 +0100
+++ /var/tmp/diff_new_pack.tMe22z/_new  2014-12-03 22:49:04.0 +0100
@@ -1,6 +1,6 @@
 When the guest is using btrfs on the root filesystem, duplicate root devices
-will be detected. If this happens, strip out the 'btrfsvol' version, and use
-the standard partition entry.
+can be detected. If this happens, remove the standard parition entry, and
+use the 'btrfsvol' version.
 
 Index: virt-v2v-0.9.1/v2v/virt-v2v.pl
 ===
@@ -12,7 +12,7 @@
  
 +# If using btrfs, it is possible to have the same partition listed using
 +# two different names (e.g. '/dev/sda2' and 'btrfsvol:/dev/sda2/@').
-+# In this case, filter out the duplicate 'btrfsvol' entry.
++# In this case, remove the device entry, and use the 'btrfsvol' version.
 +if ((@roots == 2)  (btrfsvol:$roots[0]/@ eq $roots[1])) {
 +@roots = grep(/^btrfsvol/, @roots);
 +}

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit virt-v2v for openSUSE:Factory

2014-07-23 Thread h_root 
Hello community,

here is the log from the commit of package virt-v2v for openSUSE:Factory 
checked in at 2014-07-23 22:07:08

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.changes2014-05-14 
10:48:36.0 +0200
+++ /work/SRC/openSUSE:Factory/.virt-v2v.new/virt-v2v.changes   2014-07-24 
01:23:09.0 +0200
@@ -1,0 +2,7 @@
+Tue Jul 22 21:23:48 UTC 2014 - mlati...@suse.com
+
+- Prevent build failures (due to META.yml failing to build) by changing
+  the meta 'resources-license' from a scalar to a list. (bnc#888461) 
+  meta_license_to_list.patch
+
+---

New:

  meta_license_to_list.patch



Other differences:
--
++ virt-v2v.spec ++
--- /var/tmp/diff_new_pack.soVrg2/_old  2014-07-24 01:23:10.0 +0200
+++ /var/tmp/diff_new_pack.soVrg2/_new  2014-07-24 01:23:10.0 +0200
@@ -41,6 +41,7 @@
 Patch12:rename_vb_examples.patch
 Patch13:reset_virtio_after_config.patch
 Patch14:handle_ova_files.patch
+Patch50:meta_license_to_list.patch
 Patch99:remove_esx_examples.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
@@ -162,6 +163,10 @@
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+# Apply meta_license_to_list.patch only for versions  SLES12
+%if 0%{?suse_version} = 1320
+%patch50 -p1
+%endif
 # Apply remove_esx_example.patch only under SLES12
 %if 0%{?suse_version} == 1315
 %patch99 -p1

++ meta_license_to_list.patch ++
With CPAN-Meta commits a210f190 and 333e5c94, the resource-license value is
now required to be a list. Previous to these commits, a scalar was legal, and
converted to a list automatically (for meta-spec v2.0). This change is included
in perl-5.20, and it requires the license meta value to be changed to a list in
Build.PL.

Changing resource-license to a list is not compatible with the meta-spec v1.4,
which is included with perl-5.18. Therefore this patch must only be applied to
environments newer than SLE-12.


Index: virt-v2v-0.9.1/Build.PL
===
--- virt-v2v-0.9.1.orig/Build.PL
+++ virt-v2v-0.9.1/Build.PL
@@ -316,7 +316,7 @@ my $build = $class-new (
 script_files = [ 'v2v/virt-v2v.pl', 'p2v/server/virt-p2v-server.pl' ],
 meta_add = {
 resources = {
-  license = http://www.gnu.org/licenses/gpl.html;,
+  license = [ http://www.gnu.org/licenses/gpl.html; ],
   homepage =  http://people.redhat.com/mbooth/virt-v2v/;,
   repository = git://git.fedorahosted.org/virt-v2v.git,
   MailingList = http://www.redhat.com/mailman/listinfo/libguestfs;,
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit virt-v2v for openSUSE:Factory

2014-05-14 Thread h_root 
Hello community,

here is the log from the commit of package virt-v2v for openSUSE:Factory 
checked in at 2014-05-14 10:48:35

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.changes2014-04-03 
17:20:36.0 +0200
+++ /work/SRC/openSUSE:Factory/.virt-v2v.new/virt-v2v.changes   2014-05-14 
10:48:36.0 +0200
@@ -1,0 +2,44 @@
+Mon May  5 16:54:05 UTC 2014 - mlati...@suse.com
+
+- Add missing dependencies (bnc#876317)
+- Update OVA conversion code for improved support of OVF 2.0.
+  handle_ova_files.patch
+- Update preallocation change to effect all target storage types
+  other than dir, fs and netfs.
+  preallocate-if-lvm.patch
+
+---
+Thu May 01 19:06:29 UTC 2014 - mlati...@suse.com
+
+- Ignore SLES12 specific error when a package is not found.
+  catch_sles12_pkg_not_found.patch
+- Rename VirtualBox image names in examples to be more generic.
+  rename_vb_examples.patch
+- As SLES12 does not provide a libvirt driver for VMware ESX, examples
+  and docs regarding this driver are no longer provided (bnc#875622)
+  remove_esx_examples.patch
+- Check virtio capabilities of any kernel installed (after installing
+  virtio capabilities.
+  reset_virtio_after_config.patch
+- Resolve 'Failed to open {path}' message with OVA files (bnc#875857)
+  handle_ova_files.patch
+
+---
+Thu Apr 28 22:48:04 UTC 2014 - mlati...@suse.com
+
+- Add guest conversion support for:
+SUSE Linux Enterprise Server (SLES) 12
+Microsoft Windows 7
+Microsoft Windows 8/8.1
+Microsoft Windows 2012/2012r2
+  add_sles12_win7-2012.patch
+- Ensure initrd paths have a leading / and device.map is updated
+  in grub2 environments.
+  catch_invalid_initrd_path.patch
+- If guest is using btrfs for root, remove duplicate entries to avoid
+  prompting the user.
+  remove-duplicate-btrfs-roots.patch
+- Force preallocation if outputting to an LVM storage pool (bnc#874782).
+  preallocate-if-lvm.patch
+
+---

New:

  add_sles12_win7-2012.patch
  catch_invalid_initrd_path.patch
  catch_sles12_pkg_not_found.patch
  handle_ova_files.patch
  preallocate-if-lvm.patch
  remove-duplicate-btrfs-roots.patch
  remove_esx_examples.patch
  rename_vb_examples.patch
  reset_virtio_after_config.patch



Other differences:
--
++ virt-v2v.spec ++
--- /var/tmp/diff_new_pack.hybTRb/_old  2014-05-14 10:48:37.0 +0200
+++ /var/tmp/diff_new_pack.hybTRb/_new  2014-05-14 10:48:37.0 +0200
@@ -33,6 +33,15 @@
 Patch4: fix_manifest.patch
 Patch5: remove_rhev_help.patch
 Patch6: suppress_warnings.patch
+Patch7: add_sles12_win7-2012.patch
+Patch8: catch_invalid_initrd_path.patch
+Patch9: remove-duplicate-btrfs-roots.patch
+Patch10:preallocate-if-lvm.patch
+Patch11:catch_sles12_pkg_not_found.patch
+Patch12:rename_vb_examples.patch
+Patch13:reset_virtio_after_config.patch
+Patch14:handle_ova_files.patch
+Patch99:remove_esx_examples.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 # Backported upstream patches
@@ -104,6 +113,16 @@
 # For ssh transfers
 Requires:   /usr/bin/ssh
 
+# For libvirt and ESX connections and transfers
+Requires:   perl(URI)
+
+# For Windows conversions 
+Requires:   perl(IO::String)
+
+# For OVA conversions 
+Requires:   perl(Archive::Extract)
+Requires:   perl(Digest::SHA1)
+
 #Additional requirements to run on openSUSE 12.3
 Requires:   guestfs-tools = 1.22
 Requires:   perl-DateTime = 0.72
@@ -135,6 +154,18 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+# Apply remove_esx_example.patch only under SLES12
+%if 0%{?suse_version} == 1315
+%patch99 -p1
+%endif
 
 %build
 %{__perl} Build.PL

++ add_sles12_win7-2012.patch ++
Add support for SLES12 and Windows 7 - 2012r2 to virt-v2v.db.

Index: virt-v2v-0.9.1/v2v/virt-v2v.db
===
--- virt-v2v-0.9.1.orig/v2v/virt-v2v.db
+++ virt-v2v-0.9.1/v2v/virt-v2v.db
@@ -49,7 +49,10 @@ the modifications or additions to /etc/v
 dep name='xorg-x11-drv-qxl'/
   /capability
 
-  !-- SLES 11 supports virtio in the default kernel--
+  !-- SLES 11+ supports virtio in the default kernel--
+  capability os='linux' distro='sles' major='12' name='virtio'
+dep name='kernel'/
+  /capability

commit virt-v2v for openSUSE:Factory

2014-04-03 Thread h_root 
Hello community,

here is the log from the commit of package virt-v2v for openSUSE:Factory 
checked in at 2014-04-03 17:20:35

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.changes2014-03-21 
14:07:07.0 +0100
+++ /work/SRC/openSUSE:Factory/.virt-v2v.new/virt-v2v.changes   2014-04-03 
17:20:36.0 +0200
@@ -1,0 +2,6 @@
+Wed Mar 26 17:00:53 UTC 2014 - mlati...@suse.com
+
+- Remove virt-p2v-server binary due to runtime requirements and the
+  corresponding virt-p2v utility is not yet available on SUSE. 
+
+---
@@ -4,2 +10,2 @@
-- Set 'ExclusiveArch: x86_64' to avoid build failures on architectures where
-  libguestfs isn't available
+- Set 'ExclusiveArch' to only build on architectures where libguestfs
+  is available



Other differences:
--
++ virt-v2v.spec ++
--- /var/tmp/diff_new_pack.ctIdvo/_old  2014-04-03 17:20:37.0 +0200
+++ /var/tmp/diff_new_pack.ctIdvo/_new  2014-04-03 17:20:37.0 +0200
@@ -45,7 +45,7 @@
 # Unfortunately, despite really being noarch, we have to make virt-v2v arch
 # dependent to avoid build failures on architectures where libguestfs isn't
 # available.
-ExclusiveArch:  x86_64
+ExclusiveArch:  x86_64 ppc64 ppc64le s390x
 
 # Build system direct requirements
 BuildRequires:  gettext
@@ -174,6 +174,11 @@
 # virt-v2v. It isn't packaged, though, so we need to delete it.
 find %{buildroot} -name .packlist -type f | xargs rm
 
+# Remove virt-p2v-server as it has a runtime requirement of YAML::Tiny, and 
+# virt-p2v is not yet available on SUSE
+rm %{buildroot}%{_bindir}/virt-p2v-server
+rm %{buildroot}%{_mandir}/man1/virt-p2v-server.*
+
 %check
 ./Build test
 
@@ -185,7 +190,6 @@
 
 %doc TODO.txt
 %doc META.yml
-#%doc ChangeLog
 %doc COPYING COPYING.LIB
 
 # For noarch packages: vendorlib
@@ -198,7 +202,6 @@
 
 # Executables
 %attr(0755,root,root) %{_bindir}/virt-v2v
-%attr(0755,root,root) %{_bindir}/virt-p2v-server
 
 %dir %{_localstatedir}/lib/virt-v2v
 

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit virt-v2v for openSUSE:Factory

2014-03-21 Thread h_root 
Hello community,

here is the log from the commit of package virt-v2v for openSUSE:Factory 
checked in at 2014-03-21 14:07:05

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.changes2014-01-30 
11:38:29.0 +0100
+++ /work/SRC/openSUSE:Factory/.virt-v2v.new/virt-v2v.changes   2014-03-21 
14:07:07.0 +0100
@@ -1,0 +2,12 @@
+Wed Mar 19 14:29:15 UTC 2014 - mlati...@suse.com
+
+- Set 'ExclusiveArch: x86_64' to avoid build failures on architectures where
+  libguestfs isn't available
+
+---
+Thu Feb 27 16:48:34 UTC 2014 - mlati...@suse.com
+
+- Suppress deprecated and experimental perl module warnings (bnc#866060)
+ *suppress_warnings.patch 
+
+---

New:

  suppress_warnings.patch



Other differences:
--
++ virt-v2v.spec ++
--- /var/tmp/diff_new_pack.wsDcu0/_old  2014-03-21 14:07:08.0 +0100
+++ /var/tmp/diff_new_pack.wsDcu0/_new  2014-03-21 14:07:08.0 +0100
@@ -32,6 +32,7 @@
 Patch3: win_convert_on_suse.patch
 Patch4: fix_manifest.patch
 Patch5: remove_rhev_help.patch
+Patch6: suppress_warnings.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 # Backported upstream patches
@@ -41,6 +42,11 @@
 #  local seq no: the order the patches should be applied in
 #  git commit:   the first 8 characters of the git commit hash
 
+# Unfortunately, despite really being noarch, we have to make virt-v2v arch
+# dependent to avoid build failures on architectures where libguestfs isn't
+# available.
+ExclusiveArch:  x86_64
+
 # Build system direct requirements
 BuildRequires:  gettext
 BuildRequires:  perl
@@ -128,6 +134,7 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 %{__perl} Build.PL

++ suppress_warnings.patch ++
Index: virt-v2v-0.9.1/lib/Sys/VirtConvert/Converter.pm
===
--- virt-v2v-0.9.1.orig/lib/Sys/VirtConvert/Converter.pm
+++ virt-v2v-0.9.1/lib/Sys/VirtConvert/Converter.pm
@@ -19,6 +19,7 @@ package Sys::VirtConvert::Converter;
 
 use strict;
 use warnings;
+no warnings 'deprecated';
 
 use Carp;
 
Index: virt-v2v-0.9.1/lib/Sys/VirtConvert/Connection/VMwareOVASource.pm
===
--- virt-v2v-0.9.1.orig/lib/Sys/VirtConvert/Connection/VMwareOVASource.pm
+++ virt-v2v-0.9.1/lib/Sys/VirtConvert/Connection/VMwareOVASource.pm
@@ -19,6 +19,7 @@ package Sys::VirtConvert::Connection::VM
 
 use strict;
 use warnings;
+no warnings 'deprecated';
 
 use File::Basename;
 use File::Temp qw(tempdir);
Index: virt-v2v-0.9.1/lib/Sys/VirtConvert/Connection/LibVirtTarget.pm
===
--- virt-v2v-0.9.1.orig/lib/Sys/VirtConvert/Connection/LibVirtTarget.pm
+++ virt-v2v-0.9.1/lib/Sys/VirtConvert/Connection/LibVirtTarget.pm
@@ -17,6 +17,7 @@
 
 use strict;
 use warnings;
+no if $] = 5.017011, warnings = 'experimental::smartmatch';
 
 package Sys::VirtConvert::Connection::LibVirtTarget;
 
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit virt-v2v for openSUSE:Factory

2014-01-30 Thread h_root 
Hello community,

here is the log from the commit of package virt-v2v for openSUSE:Factory 
checked in at 2014-01-30 11:38:28

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.changes2014-01-23 
15:57:54.0 +0100
+++ /work/SRC/openSUSE:Factory/.virt-v2v.new/virt-v2v.changes   2014-01-30 
11:38:29.0 +0100
@@ -1,0 +2,6 @@
+Fri Jan 24 22:36:56 UTC 2014 - mlati...@suse.com
+
+- Removed dependency on libvirt from spec file, as perl(Sys::Virt) dependency
+  is sufficient - as it requires libvirt-client.
+
+---



Other differences:
--
++ virt-v2v.spec ++
--- /var/tmp/diff_new_pack.fSXT6U/_old  2014-01-30 11:38:29.0 +0100
+++ /var/tmp/diff_new_pack.fSXT6U/_new  2014-01-30 11:38:29.0 +0100
@@ -85,8 +85,9 @@
 Requires:   perl(Net::HTTPS)
 Requires:   perl(Net::SSL)
 
+# The perl(Sys::Virt) requirement should satisfy the libvirt requirement
 # Need = 0.8.1 for rpc fix talking to RHEL 5 libvirt
-Requires:   libvirt = 0.8.1
+#Requires:   libvirt = 0.8.1
 
 # For GuestOS transfer image
 Requires:   /usr/bin/mkisofs

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit virt-v2v for openSUSE:Factory

2014-01-23 Thread h_root 
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.changes2014-01-10 
21:23:06.0 +0100
+++ /work/SRC/openSUSE:Factory/.virt-v2v.new/virt-v2v.changes   2014-01-23 
15:57:54.0 +0100
@@ -1,0 +2,17 @@
+Tue Jan 21 22:44:29 UTC 2014 - mlati...@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 - mlati...@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.0 +0100
+++ /var/tmp/diff_new_pack.3v3i7W/_new  2014-01-23 15:57:55.0 +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 Ilibvirt output method, this must be the name of a storage pool.
 
-For the Irhev 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

commit virt-v2v for openSUSE:Factory

2014-01-10 Thread h_root 
Hello community,

here is the log from the commit of package virt-v2v for openSUSE:Factory 
checked in at 2014-01-10 21:23:04

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.changes2014-01-02 
11:15:33.0 +0100
+++ /work/SRC/openSUSE:Factory/.virt-v2v.new/virt-v2v.changes   2014-01-10 
21:23:06.0 +0100
@@ -1,0 +2,8 @@
+Thu Jan  9 23:59:17 UTC 2014 - mlati...@suse.com
+
+- Updated Windows conversion code to support VMDP installation through
+  RunOnce or RHSrvAny service. Virtio drivers are all installed if found
+  on target host (in /usr/share/virtio-win). 
+ * win_convert_on_suse.patch
+
+---



Other differences:
--
++ virt-v2v.spec ++
--- /var/tmp/diff_new_pack.OA2VXj/_old  2014-01-10 21:23:06.0 +0100
+++ /var/tmp/diff_new_pack.OA2VXj/_new  2014-01-10 21:23:06.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package virt-v2v
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -104,6 +104,13 @@
 Requires:   perl-XML-DOM-XPath = 0.14
 Requires:   perl-XML-XPathEngine = 0.13
 
+# For building rhsrvany
+#BuildRequires:  autoconf
+#BuildRequires:  automake
+#BuildRequires:  mingw32-cross-gcc
+#BuildRequires:  mingw32-filesystem
+#BuildRequires:  mingw32-gcc
+
 %description
 virt-v2v is a tool for converting and importing virtual machines to
 libvirt-managed KVM, or Red Hat Enterprise Virtualization. It can import a
@@ -122,6 +129,7 @@
 %build
 %{__perl} Build.PL
 ./Build
+#./Build rhsrvany
 
 # perl doesn't need debuginfo
 %define debug_package %{nil}
@@ -142,8 +150,9 @@
 windir=$statedir/software/windows
 mkdir -p $windir
 
-# Not yet required for SUSE
-#cp windows/rhsrvany.exe windows/firstboot.bat $windir/
+# Copy built rhsrvany.exe into place. There's no need for it to be executable
+#cp rhsrvany/RHSrvAny/rhsrvany.exe $windir/
+#chmod 0644 $windir/rhsrvany.exe
 
 mkdir -p %{buildroot}%{_sysconfdir}
 cp v2v/virt-v2v.conf %{buildroot}%{_sysconfdir}/

++ win_convert_on_suse.patch ++
--- /var/tmp/diff_new_pack.OA2VXj/_old  2014-01-10 21:23:06.0 +0100
+++ /var/tmp/diff_new_pack.OA2VXj/_new  2014-01-10 21:23:06.0 +0100
@@ -1,15 +1,21 @@
 In order to convert Windows guests on a SUSE host, several modifications are
 required to support the VMDP.
 

- lib/Sys/VirtConvert/Converter/Windows.pm |  160 
++-
- v2v/virt-v2v.db  |   14 +-
- 2 files changed, 61 insertions(+), 113 deletions(-)
+ lib/Sys/VirtConvert/Converter/Windows.pm |  301 
+--
+ v2v/virt-v2v.db  |   27 ++
+ 2 files changed, 194 insertions(+), 134 deletions(-)
 
 diff -Nurp a/lib/Sys/VirtConvert/Converter/Windows.pm 
b/lib/Sys/VirtConvert/Converter/Windows.pm
 --- a/lib/Sys/VirtConvert/Converter/Windows.pm 2013-12-16 14:14:29.352268302 
-0700
-+++ b/lib/Sys/VirtConvert/Converter/Windows.pm 2013-12-16 14:15:12.499251060 
-0700
-@@ -53,7 +53,7 @@ Sys::VirtConvert::Converter::Windows - P
 b/lib/Sys/VirtConvert/Converter/Windows.pm 2014-01-09 16:53:53.159607751 
-0700
+@@ -1,5 +1,6 @@
+ # Sys::VirtConvert::Converter::Windows
+ # Copyright (C) 2009-2012 Red Hat Inc.
++# Copyright (C) 2013 SUSE Inc.
+ #
+ # This library is free software; you can redistribute it and/or
+ # modify it under the terms of the GNU Lesser General Public
+@@ -53,7 +54,7 @@ Sys::VirtConvert::Converter::Windows - P
  Sys::VirtConvert::Converter::Windows does the pre-conversion steps
  required to get a Windows guest to boot on KVM.  Unlike the associated
  LSys::VirtConvert::Converter::Linux(3) module, this doesn't do a full
@@ -18,16 +24,64 @@
  virtio block) driver, so that the Windows guest will be able to boot
  on the target.  A RunOnce script is also added to the VM which does
  all the rest of the conversion the first time the Windows VM is booted
-@@ -143,7 +143,7 @@ sub convert
- _configure_firstboot($g, $root, $config, $tmpdir, $h_sys, 
$current_cs);
+@@ -137,21 +138,42 @@ sub convert
+ my $current_cs = $h_sys-node_get_value($select, 'Current');
+ $current_cs = sprintf(ControlSet%03i, $h_sys-value_dword($current_cs));
+ 
+-# Initialise firstboot
+-# N.B. This may fail, and $firstboot will be undef
+-my ($firstboot, $firstboot_tmp, $firstboot_dir) =
+-_configure_firstboot($g,

commit virt-v2v for openSUSE:Factory

2014-01-02 Thread h_root 
Hello community,

here is the log from the commit of package virt-v2v for openSUSE:Factory 
checked in at 2014-01-02 11:15:32

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.changes2013-10-24 
14:14:58.0 +0200
+++ /work/SRC/openSUSE:Factory/.virt-v2v.new/virt-v2v.changes   2014-01-02 
11:15:33.0 +0100
@@ -1,0 +2,9 @@
+Thu Dec 12 22:16:07 UTC 2013 - mlati...@suse.com
+
+- Update to upstream (version 0.9.1, commit 441cf090), which includes
+  accepted SUSE guest conversion support.
+ * Remove redhat_to_linux.patch
+ * Remove add_suse_capabilities.patch
+ * Remove add_suse_to_man.patch
+
+---

Old:

  add_suse_capabilities.patch
  add_suse_to_man.patch
  redhat_to_linux.patch
  virt-v2v-0.9.1-9193a294.tar.gz

New:

  virt-v2v-0.9.1-441cf090.tar.gz



Other differences:
--
++ virt-v2v.spec ++
--- /var/tmp/diff_new_pack.3c9THr/_old  2014-01-02 11:15:34.0 +0100
+++ /var/tmp/diff_new_pack.3c9THr/_new  2014-01-02 11:15:34.0 +0100
@@ -24,16 +24,13 @@
 Group:  System/Management
 
 Url:http://git.fedorahosted.org/git/virt-v2v.git
-Source0:%{name}-%{version}-9193a294.tar.gz
+Source0:%{name}-%{version}-441cf090.tar.gz
 Source1:%{name}-rpmlintrc
-Patch0: add_suse_to_man.patch
-Patch1: add_suse_capabilities.patch
-Patch2: redhat_to_linux.patch
-Patch3: remove_ide_iface.patch
-Patch4: add_verbose_messaging.patch
-Patch5: mask_unused_hv_features.patch
-Patch6: win_convert_on_suse.patch
-Patch7: fix_manifest.patch
+Patch0: remove_ide_iface.patch
+Patch1: add_verbose_messaging.patch
+Patch2: mask_unused_hv_features.patch
+Patch3: win_convert_on_suse.patch
+Patch4: fix_manifest.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 # Backported upstream patches
@@ -121,9 +118,6 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
 
 %build
 %{__perl} Build.PL

++ fix_manifest.patch ++
--- /var/tmp/diff_new_pack.3c9THr/_old  2014-01-02 11:15:34.0 +0100
+++ /var/tmp/diff_new_pack.3c9THr/_new  2014-01-02 11:15:34.0 +0100
@@ -1,7 +1,5 @@
-Index: virt-v2v-0.9.1/MANIFEST
-===
 virt-v2v-0.9.1.orig/MANIFEST
-+++ virt-v2v-0.9.1/MANIFEST
+--- a/MANIFEST 2013-12-12 17:05:37.189104810 -0700
 b/MANIFEST 2013-12-12 17:11:30.258276947 -0700
 @@ -2,7 +2,6 @@
  augeas/README.txt
  autobuild.sh
@@ -10,15 +8,6 @@
  COPYING
  COPYING.LIB
  lib/Sys/VirtConvert.pm
-@@ -16,7 +15,7 @@ lib/Sys/VirtConvert/Connection/Source.pm
- lib/Sys/VirtConvert/Connection/VMwareOVASource.pm
- lib/Sys/VirtConvert/Connection/Volume.pm
- lib/Sys/VirtConvert/Converter.pm
--lib/Sys/VirtConvert/Converter/RedHat.pm
-+lib/Sys/VirtConvert/Converter/Linux.pm
- lib/Sys/VirtConvert/Converter/Windows.pm
- lib/Sys/VirtConvert/ExecHelper.pm
- lib/Sys/VirtConvert/GuestfsHandle.pm
 @@ -26,8 +25,6 @@ lib/Sys/VirtConvert/Transfer/SSH.pm
  lib/Sys/VirtConvert/Util.pm
  MANIFEST  This list of files

++ mask_unused_hv_features.patch ++
--- /var/tmp/diff_new_pack.3c9THr/_old  2014-01-02 11:15:34.0 +0100
+++ /var/tmp/diff_new_pack.3c9THr/_new  2014-01-02 11:15:34.0 +0100
@@ -9,7 +9,7 @@
 ===
 --- virt-v2v-v0.9.1.orig/lib/Sys/VirtConvert/Connection/LibVirtTarget.pm
 +++ virt-v2v-v0.9.1/lib/Sys/VirtConvert/Connection/LibVirtTarget.pm
-@@ -545,9 +545,13 @@ sub _configure_capabilities
+@@ -556,9 +556,13 @@ sub _configure_capabilities
  my @new_features = ();
  foreach my $feature (@{$meta-{features}}) {
  if (!exists($features{$feature})) {
@@ -26,3 +26,4 @@
  }
  
  elsif ($feature eq 'acpi'  !$guestcaps-{acpi}) {
+

++ virt-v2v-0.9.1-9193a294.tar.gz - virt-v2v-0.9.1-441cf090.tar.gz ++
 5823 lines of diff (skipped)

++ win_convert_on_suse.patch ++
--- /var/tmp/diff_new_pack.3c9THr/_old  2014-01-02 11:15:34.0 +0100
+++ /var/tmp/diff_new_pack.3c9THr/_new  2014-01-02 11:15:34.0 +0100
@@ -7,8 +7,8 @@
  2 files changed, 61 insertions(+), 113 deletions(-)
 
 diff -Nurp a/lib/Sys/VirtConvert/Converter/Windows.pm 
b/lib/Sys/VirtConvert/Converter/Windows.pm
 a/lib/Sys/VirtConvert/Converter/Windows.pm 2013-10-14 15:12:37.149063027 
-0600
-+++ b/lib/Sys/VirtConvert/Converter/Windows.pm 2013-10-14 16:11:48.701651903 
-0600
+---

commit virt-v2v for openSUSE:Factory

2013-10-24 Thread h_root 
Hello community,

here is the log from the commit of package virt-v2v for openSUSE:Factory 
checked in at 2013-10-24 14:14:57

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.changes2013-09-16 
10:18:48.0 +0200
+++ /work/SRC/openSUSE:Factory/.virt-v2v.new/virt-v2v.changes   2013-10-24 
14:14:58.0 +0200
@@ -1,0 +2,35 @@
+Tue Oct 15 19:13:10 UTC 2013 - mlati...@suse.com
+
+- Update to upstream (version 0.9.1, commit 9193a294).
+ * Remove obsolete fix_redhat_dup_grub_entries.patch (upstream)
+- Replace RedHat and SUSE converter with general Linux converter.
+ * Remove add_suse_converter.patch
+ * redhat_to_linux.patch
+- Add openSUSE 13.1 support to capabilities database.
+ * Updated add_suse_capabilities.patch
+- Remove missing files from MANIFEST
+ * fix_manifest.patch
+
+---
+Wed Sep 25 20:43:43 UTC 2013 - mlati...@suse.com
+
+- Cleaned up SUSE converter as per upstream comments.
+- Added modifications to Windows.pm to support SUSE environment with
+  VMDP.
+ * win_convert_on_suse.patch
+- Masked the reporting of missing hypervisor features which are
+  supported, but not reported under SUSE.
+ * mask_unused_hv_features.patch
+
+---
+Mon Sep 23 23:13:11 UTC 2013 - mlati...@suse.com
+
+- Improved logic for -base kernel support.
+- Added xen unconfigure code to fixup INITRD_MODULES.
+- Reverted to static IP address support, instead of dhcp during guestfs
+  converstion.
+- Added documentation for SUSE support in virt-v2v(1).
+ * add_suse_to_man.patch
+- Fixed rpm warning messages getting lost.
+
+---

Old:

  add_suse_converter.patch
  fix_redhat_dup_grub_entries.patch
  virt-v2v-v0.9.1.tar.gz

New:

  add_suse_to_man.patch
  fix_manifest.patch
  mask_unused_hv_features.patch
  redhat_to_linux.patch
  virt-v2v-0.9.1-9193a294.tar.gz
  win_convert_on_suse.patch



Other differences:
--
++ virt-v2v.spec ++
--- /var/tmp/diff_new_pack.HpR2WS/_old  2013-10-24 14:15:02.0 +0200
+++ /var/tmp/diff_new_pack.HpR2WS/_new  2013-10-24 14:15:02.0 +0200
@@ -24,13 +24,16 @@
 Group:  System/Management
 
 Url:http://git.fedorahosted.org/git/virt-v2v.git
-Source0:%{name}-v%{version}.tar.gz
+Source0:%{name}-%{version}-9193a294.tar.gz
 Source1:%{name}-rpmlintrc
-Patch0: add_suse_capabilities.patch
-Patch1: add_suse_converter.patch
-Patch2: remove_ide_iface.patch
-Patch3: fix_redhat_dup_grub_entries.patch
+Patch0: add_suse_to_man.patch
+Patch1: add_suse_capabilities.patch
+Patch2: redhat_to_linux.patch
+Patch3: remove_ide_iface.patch
 Patch4: add_verbose_messaging.patch
+Patch5: mask_unused_hv_features.patch
+Patch6: win_convert_on_suse.patch
+Patch7: fix_manifest.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 # Backported upstream patches
@@ -111,13 +114,16 @@
 
 
 %prep
-%setup -q -n %{name}-v%{version}
+%setup -q -n %{name}-%{version}
 
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %build
 %{__perl} Build.PL
@@ -142,7 +148,8 @@
 windir=$statedir/software/windows
 mkdir -p $windir
 
-cp windows/rhsrvany.exe windows/firstboot.bat $windir/
+# Not yet required for SUSE
+#cp windows/rhsrvany.exe windows/firstboot.bat $windir/
 
 mkdir -p %{buildroot}%{_sysconfdir}
 cp v2v/virt-v2v.conf %{buildroot}%{_sysconfdir}/
@@ -165,7 +172,7 @@
 
 %doc TODO.txt
 %doc META.yml
-%doc ChangeLog
+#%doc ChangeLog
 %doc COPYING COPYING.LIB
 
 # For noarch packages: vendorlib

++ add_suse_capabilities.patch ++
--- /var/tmp/diff_new_pack.HpR2WS/_old  2013-10-24 14:15:02.0 +0200
+++ /var/tmp/diff_new_pack.HpR2WS/_new  2013-10-24 14:15:02.0 +0200
@@ -1,8 +1,9 @@
 The following modifications are required to adds conversion capabilities to
 the virt-v2v.db for SLES and openSUSE through:
 
-  - Adding virtio capabilities for SLES10/11 and openSUSE 10/11/12.
+  - Adding virtio capabilities for SLES10/11 and openSUSE 10/11/12/13.
   - Designating the rpm containing the cirrus video driver in SLES/openSUSE
+  - Adding app definitions for SLES10/11 kernels.
 
 This patch also adds the following SUSE examples to /etc/virt-v2v.conf:
 
@@ -10,13 +11,13 @@
   - Sample network conversion using SUSE naming defaults (br0 - default).
 
 ---
- virt-v2v.conf |8 
- virt-v2v.db   |   33

commit virt-v2v for openSUSE:Factory

2013-09-16 Thread h_root 
Hello community,

here is the log from the commit of package virt-v2v for openSUSE:Factory 
checked in at 2013-09-16 10:18:47

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.changes2013-09-12 
14:28:38.0 +0200
+++ /work/SRC/openSUSE:Factory/.virt-v2v.new/virt-v2v.changes   2013-09-16 
10:18:48.0 +0200
@@ -1,0 +2,7 @@
+Sat Sep 14 19:08:34 UTC 2013 - mlati...@suse.com
+
+- Replaced grubby functionality with Bootloader::Tools.
+- Removed pre-convert capability as grubby is no longer required.
+- Replaced warning with temporary workaround for bnc836521.
+
+---



Other differences:
--
++ add_suse_capabilities.patch ++
--- /var/tmp/diff_new_pack.zHSkUz/_old  2013-09-16 10:18:48.0 +0200
+++ /var/tmp/diff_new_pack.zHSkUz/_new  2013-09-16 10:18:48.0 +0200
@@ -3,8 +3,6 @@
 
   - Adding virtio capabilities for SLES10/11 and openSUSE 10/11/12.
   - Designating the rpm containing the cirrus video driver in SLES/openSUSE
-  - Adding a 'pre-convert' capability to install 'grubby' prior to beginning
-the convert process.
 
 This patch also adds the following SUSE examples to /etc/virt-v2v.conf:
 
@@ -12,13 +10,13 @@
   - Sample network conversion using SUSE naming defaults (br0 - default).
 
 ---
- virt-v2v.conf |8 +++
- virt-v2v.db   |   61 
++
- 2 files changed, 57 insertions(+), 12 deletions(-)
+ virt-v2v.conf |8 
+ virt-v2v.db   |   33 +
+ 2 files changed, 29 insertions(+), 12 deletions(-)
 
 diff -Nurp a/v2v/virt-v2v.conf b/v2v/virt-v2v.conf
 a/v2v/virt-v2v.conf2013-09-09 15:00:54.628956517 -0600
-+++ b/v2v/virt-v2v.conf2013-09-09 16:10:04.253725981 -0600
+--- a/v2v/virt-v2v.conf2013-09-14 13:00:17.148819499 -0600
 b/v2v/virt-v2v.conf2013-09-14 13:00:41.118810452 -0600
 @@ -40,12 +40,20 @@ configuration data in /var/lib/virt-v2v/
capability os='linux' distro='rhel' major='6' name='user-install'
  dep name='mypackage'/
@@ -28,7 +26,7 @@
 +dep name='mypackage'/
 +  /capability
--
-
+ 
!-- Networks --
!-- Mappings for the defaults in Xen, ESX and libvirt/KVM
 to the default in libvirt/KVM --
@@ -41,9 +39,9 @@
  network type='network' name='default'/
/network
 diff -Nurp a/v2v/virt-v2v.db b/v2v/virt-v2v.db
 a/v2v/virt-v2v.db  2013-09-09 15:01:02.198933701 -0600
-+++ b/v2v/virt-v2v.db  2013-09-09 16:10:12.272696566 -0600
-@@ -11,39 +11,62 @@ the modifications or additions to /etc/v
+--- a/v2v/virt-v2v.db  2013-09-14 13:00:25.755817235 -0600
 b/v2v/virt-v2v.db  2013-09-14 13:00:32.478814644 -0600
+@@ -11,39 +11,54 @@ the modifications or additions to /etc/v
!-- Capabilities --
!-- RHEL 6 has always supported virtio --
capability os='linux' distro='rhel' major='6' name='virtio'/
@@ -70,7 +68,7 @@
 -
!-- RHEL 4 bundles the cirrus driver with the main X package --
capability os='linux' distro='rhel' major='4' name='cirrus'/
-
+ 
!-- All current versions of Fedora support VirtIO --
capability os='linux' distro='fedora' name='virtio'/
 -
@@ -79,7 +77,7 @@
capability os='linux' distro='fedora' name='cirrus'
  dep name='xorg-x11-drv-cirrus'/
/capability
-
+ 
 +  !-- SLES 11 has always supported virtio --
 +  capability os='linux' distro='sles' major='11' name='virtio'/
 +  capability os='linux' distro='sles' major='10' name='virtio'
@@ -89,10 +87,6 @@
 +  capability os='linux' distro='sles' name='cirrus'
 +dep name='xorg-x11-driver-video'/
 +  /capability
-+  !-- Packages required for SLES conversions --
-+  capability os='linux' distro='sles' name='pre-convert'
-+dep name='grubby'/
-+  /capability
 +
 +  !-- openSUSE 11/12 has always supported virtio --
 +  capability os='linux' distro='opensuse' major='12' name='virtio'/
@@ -104,18 +98,14 @@
 +  capability os='linux' distro='opensuse' name='cirrus'
 +dep name='xorg-x11-driver-video'/
 +  /capability
-+  !-- Packages required for openSUSE conversions --
-+  capability os='linux' distro='opensuse' name='pre-convert'
-+dep name='grubby'/
-+  /capability
 +
!-- RHEL clones: copied from above with distro altered --
!-- CentOS --
capability os='linux' distro='centos' major='6' name='virtio'/
-@@ -83,12 +106,6 @@ the modifications or additions to /etc/v
+@@ -83,12 +98,6 @@ the modifications or additions to /etc/v
/capability
capability os='linux' distro='scientificlinux' major='4' name='cirrus'/
-
+ 
 -  !-- All current

commit virt-v2v for openSUSE:Factory

2013-09-12 Thread h_root 
Hello community,

here is the log from the commit of package virt-v2v for openSUSE:Factory 
checked in at 2013-09-12 14:28:37

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.changes2013-08-27 
21:22:43.0 +0200
+++ /work/SRC/openSUSE:Factory/.virt-v2v.new/virt-v2v.changes   2013-09-12 
14:28:38.0 +0200
@@ -1,0 +2,33 @@
+Mon Sep  9 23:11:48 UTC 2013 - mlati...@suse.com
+
+- Added support for packages to be installed prior to the conversion
+- Added progress messages to virt-v2v
+ * add_progress_messages.patch
+- Finalized virt-v2v.db changes to support pre-convert installation
+  of packages (specifically grubby).
+- Merged add_suse_v2v_conf.patch and add_suse_capabilities.patch
+- Reworked package installation code to provide better status updates
+- Corrected i686 to i586
+- Added warning for (hd0) issue with older perl-Bootloaders (bnc#836521)
+
+---
+Wed Aug 28 21:51:38 UTC 2013 - mlati...@suse.com
+
+- Updated SUSE.pm conversion module to allow kernel updates during
+  conversion through zypper
+- Added fix for multiple grub entries on RedHat machines
+ * fix_redhat_dup_grub_entries.patch
+- Added SUSE examples to /etc/virt-v2v.conf
+ * add_suse_v2v_conf.patch
+
+---
+Fri Aug 16 23:03:41 UTC 2013 - mlati...@suse.com
+
+- Removed iface=ide option, which does not work with libvirt
+ * remove_ide_iface.patch
+- Added SUSE to the list of environments which support libvirt
+ * add_suse_capabilities.patch
+- Added menu.lst to the list of files which need root and resume
+  devices modified (in a PV environment) 
+
+---

New:

  add_suse_capabilities.patch
  add_verbose_messaging.patch
  fix_redhat_dup_grub_entries.patch
  remove_ide_iface.patch



Other differences:
--
++ virt-v2v.spec ++
--- /var/tmp/diff_new_pack.cZyGCa/_old  2013-09-12 14:28:39.0 +0200
+++ /var/tmp/diff_new_pack.cZyGCa/_new  2013-09-12 14:28:39.0 +0200
@@ -26,7 +26,11 @@
 Url:http://git.fedorahosted.org/git/virt-v2v.git
 Source0:%{name}-v%{version}.tar.gz
 Source1:%{name}-rpmlintrc
-Patch0: add_suse_converter.patch
+Patch0: add_suse_capabilities.patch
+Patch1: add_suse_converter.patch
+Patch2: remove_ide_iface.patch
+Patch3: fix_redhat_dup_grub_entries.patch
+Patch4: add_verbose_messaging.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 # Backported upstream patches
@@ -93,6 +97,7 @@
 Requires:   /usr/bin/ssh
 
 #Additional requirements to run on openSUSE 12.3
+Requires:   guestfs-tools = 1.22
 Requires:   perl-DateTime  = 0.72
 Requires:   perl-Term-ProgressBar = 2.10
 Requires:   perl-XML-DOM = 1.44
@@ -109,6 +114,10 @@
 %setup -q -n %{name}-v%{version}
 
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 %{__perl} Build.PL
@@ -145,7 +154,6 @@
 # virt-v2v. It isn't packaged, though, so we need to delete it.
 find %{buildroot} -name .packlist -type f | xargs rm
 
-
 %check
 ./Build test
 

++ add_suse_capabilities.patch ++
The following modifications are required to adds conversion capabilities to
the virt-v2v.db for SLES and openSUSE through:

  - Adding virtio capabilities for SLES10/11 and openSUSE 10/11/12.
  - Designating the rpm containing the cirrus video driver in SLES/openSUSE
  - Adding a 'pre-convert' capability to install 'grubby' prior to beginning
the convert process.

This patch also adds the following SUSE examples to /etc/virt-v2v.conf:

  - A 'user-install' example for SLES 11.
  - Sample network conversion using SUSE naming defaults (br0 - default).

---
 virt-v2v.conf |8 +++
 virt-v2v.db   |   61 ++
 2 files changed, 57 insertions(+), 12 deletions(-)

diff -Nurp a/v2v/virt-v2v.conf b/v2v/virt-v2v.conf
--- a/v2v/virt-v2v.conf 2013-09-09 15:00:54.628956517 -0600
+++ b/v2v/virt-v2v.conf 2013-09-09 16:10:04.253725981 -0600
@@ -40,12 +40,20 @@ configuration data in /var/lib/virt-v2v/
   capability os='linux' distro='rhel' major='6' name='user-install'
 dep name='mypackage'/
   /capability
+
+  capability os='linux' distro='sles' major='11' name='user-install'
+dep name='mypackage'/
+  /capability
   --

   !-- Networks --
   !-- Mappings for the defaults in Xen, ESX and libvirt/KVM
to the default in libvirt/KVM --
   !--
+  network type='bridge' name='br0'
+network type='network'