Hello community, here is the log from the commit of package libguestfs for openSUSE:Factory checked in at 2016-06-07 23:46:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libguestfs (Old) and /work/SRC/openSUSE:Factory/.libguestfs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libguestfs" Changes: -------- --- /work/SRC/openSUSE:Factory/libguestfs/libguestfs.changes 2015-10-06 13:26:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libguestfs.new/libguestfs.changes 2016-06-07 23:46:26.000000000 +0200 @@ -1,0 +2,46 @@ +Mon Mar 14 08:41:08 UTC 2016 - [email protected] + +- Update to version 1.32.4 +- Backported commits (fate#316274): + * f5a9cdf: api: add mountable_device and mountable_subvolume + * 1c30c23: fish: fix btrfs subvolumes display in error case + * 1f24364: v2v: win <= 7: reduce registry patch + * f0dce24: v2v: win >= 8: reduce registry patch + * 9a441b0: v2v: win >= 8: simplify registry patching + * e07459d: v2v: win: factor out common bits in registry patching + * 47aa64a: v2v: add support for virtio-scsi + * bba9ea9: v2v: also search for windows virtio drivers in symlinks + * 3bf7d30: Update packagelist for SLES and openSUSE + * 89ae53e: appliance: skip /etc/mtab creation is already existing + * ee78c06: customize: add support for pvvxsvc + * 25848b5: v2v: document SUSE's Xen as a working input hypervisor + * e9082ea: v2v: rename RHEL 5 Xen input section into Xen in man + * 75fe93e: v2v: improve initrd search + * 536ef6f: customize: change windows firstboot path + * 07f7bfa: customize: fix windows firstboot script + * c466d4c: v2v: add support for SUSE VMDP drivers + * 9de9300: v2v: handle subfolders in ova files +- Removed patches: + * 1000-force-virtio_blk-in-old-guest-kernel.patch + * libguestfs.mkinitrd.1110.patch + * libguestfs.mkinitrd.1115.patch + * libguestfs.mkinitrd.1140.patch + * libguestfs.mkinitrd.1210.patch + * libguestfs.mkinitrd.1220.patch + * libguestfs.mkinitrd.1230.patch + * libguestfs.mkinitrd.1310.patch + * libguestfs.mkinitrd.boot-btrfs.sh + * libguestfs.mkinitrd.boot-dm.sh + * libguestfs.mkinitrd.boot-lvm2.sh + * libguestfs.mkinitrd.boot-md.sh + * libguestfs.mkinitrd.boot-nfs.sh + * libguestfs.mkinitrd.boot.sh + * libguestfs.mkinitrd.setup-btrfs.sh + * libguestfs.mkinitrd.setup-dm.sh + * libguestfs.mkinitrd.setup-lvm2.sh + * libguestfs.mkinitrd.setup-md.sh + * libguestfs.mkinitrd.setup-nfs.sh + * libguestfs.mkinitrd.setup.sh + * libguestfs.mkinitrd.tar.bz2 + +------------------------------------------------------------------- Old: ---- 1000-force-virtio_blk-in-old-guest-kernel.patch libguestfs-1.26.10.tar.xz libguestfs.mkinitrd.1110.patch libguestfs.mkinitrd.1115.patch libguestfs.mkinitrd.1140.patch libguestfs.mkinitrd.1210.patch libguestfs.mkinitrd.1220.patch libguestfs.mkinitrd.1230.patch libguestfs.mkinitrd.1310.patch libguestfs.mkinitrd.boot-btrfs.sh libguestfs.mkinitrd.boot-dm.sh libguestfs.mkinitrd.boot-lvm2.sh libguestfs.mkinitrd.boot-md.sh libguestfs.mkinitrd.boot-nfs.sh libguestfs.mkinitrd.boot.sh libguestfs.mkinitrd.setup-btrfs.sh libguestfs.mkinitrd.setup-dm.sh libguestfs.mkinitrd.setup-lvm2.sh libguestfs.mkinitrd.setup-md.sh libguestfs.mkinitrd.setup-nfs.sh libguestfs.mkinitrd.setup.sh libguestfs.mkinitrd.tar.bz2 New: ---- libguestfs-1.32.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libguestfs.spec ++++++ --- /var/tmp/diff_new_pack.owmiq3/_old 2016-06-07 23:46:27.000000000 +0200 +++ /var/tmp/diff_new_pack.owmiq3/_new 2016-06-07 23:46:27.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libguestfs # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2011 Michal Hrusecky <[email protected]> # # All modifications and additions to the file contributed by third parties @@ -15,9 +15,10 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +# needsbinariesforbuild -Version: 1.26.10 +Version: 1.32.4 Release: 0 %define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) @@ -47,6 +48,7 @@ %bcond_without zerofree %bcond_with ext4_writeable %endif +%define with_p2v 0 %bcond_without fuse @@ -120,8 +122,9 @@ # Name: libguestfs %if "%{?_ignore_exclusive_arch}" == "" -ExclusiveArch: x86_64 ppc64 ppc64le s390x +ExclusiveArch: x86_64 ppc64 ppc64le s390x aarch64 %endif +%{ocaml_preserve_bytecode} BuildRequires: aaa_base BuildRequires: attr-devel BuildRequires: augeas-devel >= 1.0.0 @@ -129,8 +132,12 @@ BuildRequires: automake %if %{with bash_completion} BuildRequires: bash-completion >= 2.0 +%if 0%{?suse_version} >= 1330 +BuildRequires: bash-completion-devel >= 2.0 +%endif %endif BuildRequires: bison +BuildRequires: fdupes BuildRequires: file-devel BuildRequires: flex BuildRequires: gcc @@ -146,17 +153,27 @@ BuildRequires: libxml2-devel BuildRequires: ncurses-devel %if %{with perl_bindings} +BuildRequires: perl(Module::Build) %if %suse_version < 1140 BuildRequires: perl-macros %endif %endif +BuildRequires: createrepo +BuildRequires: db48-utils +BuildRequires: dhcp-client BuildRequires: pcre-devel BuildRequires: pkg-config +BuildRequires: qemu-tools BuildRequires: readline-devel -%if %{with ocaml_bindings} +BuildRequires: supermin >= 5.1.6 # Required to build tools, its independent from bindings +BuildRequires: glib2-devel BuildRequires: ocaml BuildRequires: ocaml-findlib + +# +BuildRequires: ocaml-rpm-macros >= 4.02.1 +%if %{with ocaml_bindings} %define _configure_ocaml --enable-ocaml %endif # @@ -167,41 +184,24 @@ # %if %{with hivex} BuildRequires: glibc-locale +BuildRequires: hivex BuildRequires: hivex-devel %endif # +%if %{with_p2v} +BuildRequires: gtk2-devel +%endif +# Url: http://libguestfs.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Compatibility package for guestfs-tools License: GPL-2.0 Group: System/Filesystems Patch0: 0000-hotfix.patch -Patch1000: 1000-force-virtio_blk-in-old-guest-kernel.patch + Source0: %{name}-%{version}.tar.xz Source1: libguestfs.rpmlintrc -Source42: libguestfs.mkinitrd.tar.bz2 Source789653: Pod-Simple-3.23.tar.xz -Source10: libguestfs.mkinitrd.boot.sh -Source11: libguestfs.mkinitrd.setup.sh -# -Source12: libguestfs.mkinitrd.boot-dm.sh -Source13: libguestfs.mkinitrd.setup-dm.sh -Source14: libguestfs.mkinitrd.boot-lvm2.sh -Source15: libguestfs.mkinitrd.setup-lvm2.sh -Source16: libguestfs.mkinitrd.boot-md.sh -Source17: libguestfs.mkinitrd.setup-md.sh -Source18: libguestfs.mkinitrd.boot-nfs.sh -Source19: libguestfs.mkinitrd.setup-nfs.sh -Source20: libguestfs.mkinitrd.boot-btrfs.sh -Source21: libguestfs.mkinitrd.setup-btrfs.sh -# -Source1310: libguestfs.mkinitrd.1310.patch -Source1230: libguestfs.mkinitrd.1230.patch -Source1220: libguestfs.mkinitrd.1220.patch -Source1210: libguestfs.mkinitrd.1210.patch -Source1140: libguestfs.mkinitrd.1140.patch -Source1115: libguestfs.mkinitrd.1115.patch -Source1110: libguestfs.mkinitrd.1110.patch # Source10001: libguestfs.test.simple.run-libugestfs-test-tool.sh Source10002: libguestfs.test.simple.create-opensuse-guest.sh @@ -211,6 +211,7 @@ # Requires: guestfs-tools +Requires: virt-v2v %description libguestfs is a set of tools for accessing and modifying virtual machine (VM) @@ -234,8 +235,7 @@ Group: System/Filesystems Provides: %{name} = %{version} Obsoletes: %{name} < %{version} -Requires: %{kvm_binary} -Requires: qemu >= 2.0 +Requires: python-evtx %if %{with bash_completion} Recommends: bash-completion >= 2.0 %endif @@ -409,7 +409,6 @@ %if %{with ext4_writeable} BuildRequires: ext4-writeable-kmp-default %endif -BuildRequires: fdupes BuildRequires: file BuildRequires: findutils BuildRequires: gawk @@ -429,21 +428,34 @@ BuildRequires: mkinitrd %endif BuildRequires: module-init-tools +BuildRequires: ncurses-utils BuildRequires: nfs-client BuildRequires: ntfs-3g BuildRequires: ntfsprogs +BuildRequires: pam-config BuildRequires: parted +BuildRequires: pciutils +BuildRequires: pciutils-ids BuildRequires: psmisc BuildRequires: reiserfs BuildRequires: rsync +BuildRequires: sg3_utils BuildRequires: strace %ifarch %ix86 x86_64 BuildRequires: syslinux %endif +%if %suse_version >= 1210 +BuildRequires: systemd +BuildRequires: systemd-sysvinit +%else +BuildRequires: sysvinit +%endif BuildRequires: tar BuildRequires: terminfo-base +BuildRequires: tunctl BuildRequires: udev BuildRequires: util-linux +BuildRequires: util-linux-lang BuildRequires: xfsprogs BuildRequires: xz %if %{with zerofree} @@ -488,6 +500,14 @@ Summary: Runtime library of libguestfs License: LGPL-2.1 Group: System/Filesystems +Requires: %{kvm_binary} +Requires: qemu >= 2.0 +Requires: supermin >= 5.1.6 +%if %suse_version == 1315 +%if 0%{?is_opensuse} == 0 +Recommends: guestfs-winsupport +%endif +%endif %description -n libguestfs0 Library for libguestfs. @@ -508,14 +528,25 @@ virtual machines. +%package -n virt-v2v +Summary: Convert a virtual machine to run on KVM +License: GPL-2.0 +Group: System/Management +Requires: libguestfs0 = %{version} +Requires: qemu-block-ssh + +%description -n virt-v2v +virt-v2v is a tool for converting and importing virtual machines to +libvirt-managed KVM, or Red Hat Enterprise Virtualization. It can import a +variety of guest operating systems from libvirt-managed hosts and VMware ESX. %prep : _ignore_exclusive_arch '%{?_ignore_exclusive_arch}' -%setup -q -a 789653 -a 42 +%setup -q -a 789653 %patch0 -p1 -%patch1000 -p1 %build +bison --version # [Bug 789653] sles11 perl obsoletes perl-Pod-Simple unconditionally export PERLLIB=`echo $PWD/Pod-Simple-*/lib` # disable qemu test. @@ -566,7 +597,7 @@ --enable-install-daemon \ --with-qemu=$QEMU \ --without-java \ - --disable-appliance \ + --with-supermin-packager-config="$PWD/zypper.priv.conf --use-installed --verbose" \ --disable-haskell \ --disable-php \ %{_configure_fuse} \ @@ -577,6 +608,8 @@ %{_configure_ruby} \ --disable-rpath \ --disable-static +#Workaround an autotools bug +make -j1 -C builder index-parse.c # 'INSTALLDIRS' ensures that perl libs are installed in the vendor dir instead of the site dir make \ INSTALLDIRS=vendor \ @@ -589,9 +622,9 @@ # strip kills the bytecode part of ELF binaries export NO_BRP_STRIP_DEBUG=true %endif -%makeinstall udevrulesdir=%{udevrulesdir} -rm -rfv $RPM_BUILD_ROOT%{_libdir}/guestfs/supermin.d -# +%makeinstall \ + INSTALLDIRS=vendor \ + udevrulesdir=%{udevrulesdir} mkdir -p $RPM_BUILD_ROOT%{_datadir}/guestfs cp -avLt $RPM_BUILD_ROOT%{_datadir}/guestfs \ %{S:10005} \ @@ -613,8 +646,6 @@ %if %{with perl_bindings} # Delete empty perl bootstrap files find $RPM_BUILD_ROOT -name "*.bs" -size 0c -print -delete -# Delete unused perl script without executable permissions -find $RPM_BUILD_ROOT%perl_vendorarch/ -name bindtests.pl -print -delete %perl_process_packlist %perl_gen_filelist # the macro above packages everything, here only the perl files are desrired @@ -627,178 +658,21 @@ # touch %{name}.lang %find_lang %{name} -# -ext_cmds="` -objcopy -j .guestfsd_ext_cmds -O binary $RPM_BUILD_ROOT/usr/sbin/guestfsd /dev/stdout | -tr '\0' '\n' | -sort -u -`" -test -n "$ext_cmds" -# -> ext_cmds.txt -> missing_cmds.txt -# guestfs may call mkfs, but it cant tell in advance which filesystems -# it must support. Collect a manual list of possible filesystems so that -# the commands get included in the initrd. -ext_cmds="$ext_cmds -sparsify -strace -` for fs in \ - ext2 \ - ext3 \ - ext4 \ - fuse \ - ntfs \ - ntfs-3g \ - reiserfs \ - jfs \ - gfs \ - gfs2 \ - vfat \ - msdos \ - ufs \ -; do - if test -x /sbin/mount.$fs || test -x /usr/sbin/mount.$fs - then - echo mount.$fs - fi - echo mkfs.$fs - echo fsck.$fs -done -` " -# -for cmd in ls $ext_cmds -do - if test -n "` PATH=$PATH:/sbin:/usr/sbin type -p $cmd `" - then - echo "#%%programs: $cmd" >> ext_cmds.txt - else - echo "# missing: $cmd" >> ext_cmds.txt - echo "$cmd" >> missing_cmds.txt - fi -done -head -n 1234 ext_cmds.txt missing_cmds.txt -%if %{use_included_mkinitrd} -ln -sfvbn mkinitrd-2.8.1 mkinitrd -ln -sfvbn mkinitrd/sbin/mkinitrd_setup mkinitrd_setup.sh -ln -sfvbn mkinitrd/sbin/mkinitrd mkinitrd.sh -cp -avL %{S:12} mkinitrd/scripts/boot-dm.sh -cp -avL %{S:13} mkinitrd/scripts/setup-dm.sh -cp -avL %{S:14} mkinitrd/scripts/boot-lvm2.sh -cp -avL %{S:15} mkinitrd/scripts/setup-lvm2.sh -cp -avL %{S:16} mkinitrd/scripts/boot-md.sh -cp -avL %{S:17} mkinitrd/scripts/setup-md.sh -cp -avL %{S:18} mkinitrd/scripts/boot-nfs.sh -cp -avL %{S:19} mkinitrd/scripts/setup-nfs.sh -cp -avL %{S:20} mkinitrd/scripts/setup-btrfs.sh -cp -avL %{S:21} mkinitrd/scripts/setup-btrfs.sh -for i in /lib/mkinitrd/scripts/* -do - if test -f "$i" - then - cp -avbt mkinitrd/scripts "$i" - fi -done -mkdir -vp mkinitrd/setup mkinitrd/boot -ln -sfvbn lib/mkinitrd/bin mkinitrd/bin -sed -i~ "s@^INITRD_PATH=/lib/mkinitrd@INITRD_PATH=$PWD/mkinitrd@" mkinitrd/sbin/mkinitrd -%else -rm -rf mkinitrd -cp -av /lib/mkinitrd . -ln -sfvbn /sbin/mkinitrd_setup mkinitrd_setup.sh -ln -sfvbn /sbin/mkinitrd mkinitrd.sh -%endif -for bad in \ - setup-storage.sh \ - boot-storage.sh \ - ; -do - rm mkinitrd/scripts/${bad} -done -cp -avL %{S:10} mkinitrd/scripts/boot-guestfs.sh -cp -avL %{S:11} mkinitrd/scripts/setup-guestfs.sh -chmod 755 mkinitrd/scripts/*guestfs.sh -sed -i~ ' -/^#@GUESTFS_EXT_CMDS@/ { -s@^.*@@ -r ext_cmds.txt -} -/@GUESTFS_MISSING_CMDS@/ { -s@^.*@missing_commands="@ -r missing_cmds.txt -a \ -" -} -' mkinitrd/scripts/boot-guestfs.sh -diff -u mkinitrd/scripts/boot-guestfs.sh~ mkinitrd/scripts/boot-guestfs.sh || : -# -pushd mkinitrd -patched= -for p in \ - %{S:1310} \ - %{S:1230} \ - %{S:1220} \ - %{S:1210} \ - %{S:1140} \ - %{S:1115} \ - %{S:1110} \ - ; -do - if patch --dry-run -p2 < $p - then - patch -p2 < $p - patched=$p - break - elif patch --dry-run -R -p2 < $p - then - patched=$p - break - fi -done -popd -test -n "$patched" +%fdupes -s $RPM_BUILD_ROOT -./mkinitrd_setup.sh \ - -s $PWD/mkinitrd/scripts \ - -i $PWD/mkinitrd -mkdir mkinitrd/boot_tmp -kver=`env PATH=/sbin:/usr/sbin:$PATH get_kernel_version '%{kernel_binary}'` -test -n "${kver}" -arch=`arch` -%ifarch %ix86 -arch=i586 -%endif -cp -avL '%{kernel_binary}' mkinitrd/boot_tmp/vmlinuz.${arch} -cp -avL /boot/System.map-${kver} mkinitrd/boot_tmp -%if 0 -# [Bug 778149] mkinitrd does not copy links correctly -mkdir mkinitrd/bin_tmp -for cmd in ` awk '/^#%%programs:/ { print $2 }' mkinitrd/scripts/boot-guestfs.sh | sort -u ` -do - cp -v ` PATH=${RPM_BUILD_ROOT}/usr/bin:${RPM_BUILD_ROOT}/usr/sbin:${PATH}:/sbin:/usr/sbin type -p $cmd ` mkinitrd/bin_tmp/ || : -done -chmod -v 755 mkinitrd/bin_tmp/* -%endif -# -additional_modules=" -" -env PATH=${RPM_BUILD_ROOT}/usr/bin:${RPM_BUILD_ROOT}/usr/sbin:${PATH} \ -LIBGUESTFS_SRC_APPLIANCE_DIR=`cd $PWD/appliance ; pwd -P` \ -bash -x \ -./mkinitrd.sh \ - -l $PWD/mkinitrd \ - -k vmlinuz.${arch} \ - -i initramfs.${arch}.img \ - -b $PWD/mkinitrd/boot_tmp \ - -m "$additional_modules" \ - -f "lvm2 dm md network nfs btrfs usb" \ - -B -# -mkdir -vp $RPM_BUILD_ROOT%{_libdir}/guestfs -cp -avLt $RPM_BUILD_ROOT%{_libdir}/guestfs/ \ - mkinitrd/boot_tmp/initramfs.${arch}.img \ - mkinitrd/boot_tmp/vmlinuz.${arch} -chmod 644 $RPM_BUILD_ROOT%{_libdir}/guestfs/initramfs.${arch}.img +# SLES has a different way to provide ntfs-3g feature. +%if %suse_version == 1315 +%if 0%{?is_opensuse} == 1 +mkdir -p $RPM_BUILD_ROOT/tmp/etc/alternatives +pushd $RPM_BUILD_ROOT/tmp/etc/alternatives +ln -s /sbin/mount.ntfs-3g mount.ntfs +popd +pushd $RPM_BUILD_ROOT/tmp +tar czf $RPM_BUILD_ROOT/%{_libdir}/guestfs/supermin.d/zz-ntfs-symlink.tar.gz etc +popd +rm -rf $RPM_BUILD_ROOT/tmp +%endif +%endif %clean rm -rf $RPM_BUILD_ROOT @@ -813,6 +687,7 @@ %files -n guestfs-data %defattr(-,root,root) %{_libdir}/guestfs +%exclude %{_libdir}/guestfs/supermin.d/zz-packages-* %if %{with ocaml_bindings} %files -n ocaml-libguestfs @@ -873,28 +748,44 @@ %{_libdir}/*.so %{_libdir}/pkgconfig/* %{_includedir}/guestfs.h +%{_includedir}/guestfs-gobject +%{_includedir}/guestfs-gobject.h +%{_datadir}/gtk-doc/html/guestfs %{_mandir}/man3/* %files -n guestfsd %defattr(-,root,root) +%{udevrulesdir} %{_sbindir}/guestfsd %{_mandir}/man8/* %files -n guestfs-tools -f %{name}.lang %defattr(-,root,root) %doc COPYING +%{_sbindir}/libguestfs-make-fixed-appliance %{_bindir}/* +%exclude %{_bindir}/virt-v2v %config(noreplace) /etc/libguestfs-tools.conf -%if %{with ocaml_bindings} /etc/virt-builder %dir /etc/xdg/virt-builder %dir /etc/xdg/virt-builder/repos.d %config /etc/xdg/virt-builder/repos.d/* -%endif %if %{with bash_completion} %{_datadir}/bash-completion +%exclude %{_datadir}/bash-completion/*/virt-v2v %endif %{_mandir}/man1/* +%exclude %{_mandir}/man1/virt-v2v.* %{_mandir}/man5/* +%files -n virt-v2v +%defattr(-,root,root) +%{_bindir}/virt-v2v +%{_datadir}/bash-completion/*/virt-v2v +%{_mandir}/man1/virt-v2v.* +%if %{with_p2v} +%{_prefix}/lib/virt-p2v +%{_datadir}/virt-p2v +%endif + %changelog ++++++ 0000-hotfix.patch ++++++ ++++ 1478 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/libguestfs/0000-hotfix.patch ++++ and /work/SRC/openSUSE:Factory/.libguestfs.new/0000-hotfix.patch ++++++ libguestfs-1.26.10.tar.xz -> libguestfs-1.32.4.tar.xz ++++++ /work/SRC/openSUSE:Factory/libguestfs/libguestfs-1.26.10.tar.xz /work/SRC/openSUSE:Factory/.libguestfs.new/libguestfs-1.32.4.tar.xz differ: char 13, line 1 ++++++ libguestfs.rpmlintrc ++++++ --- /var/tmp/diff_new_pack.owmiq3/_old 2016-06-07 23:46:27.000000000 +0200 +++ /var/tmp/diff_new_pack.owmiq3/_new 2016-06-07 23:46:27.000000000 +0200 @@ -1 +1,4 @@ -addFilter("binaryinfo-readelf-failed") +addFilter("shlib-policy-nonversioned-dir") +addFilter("shlib-policy-missing-lib") +# This script is supposed to be run from within the appliance only +addFilter("non-executable-script /usr/share/virt-p2v/launch-virt-p2v")
