commit virt-v2v for openSUSE:Factory
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.changes 2015-09-13 09:45:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.virt-v2v.new/virt-v2v.changes 2015-09-24 06:14:27.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Sep 18 20:26:43 UTC 2015 - mlatimer@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.000000000 +0200 +++ /var/tmp/diff_new_pack.bMCHBw/_new 2015-09-24 06:14:28.000000000 +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.000000000 +0200 +++ /var/tmp/diff_new_pack.bMCHBw/_new 2015-09-24 06:14:28.000000000 +0200 @@ -566,7 +566,7 @@ + + <!-- SUSE Virtual Machine Driver Pack (VMDP) setup program --> + <app os='windows' name='vmdp'> -+ <path>windows/VMDP-WIN-2.1.exe</path> ++ <path>windows/VMDP-WIN-2.2.exe</path> </app> <!-- Default file locations -->
participants (1)
-
root@hilbert.suse.de