Accepting request 241350 from Virtualization

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/241350
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libguestfs?expand=0&rev=25

libguestfs.changes

@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Wed Jul  9 09:54:31 CEST 2014 - ohering@suse.de
+
+- Include fdisk and bc (bnc#886372)
+
+-------------------------------------------------------------------
+Tue Jul  8 17:33:56 CEST 2014 - ohering@suse.de
+
+- add Requires: qemu 2 to guestfs-tools to restore versioned kvm
+
+-------------------------------------------------------------------
+Tue Jul  8 12:54:34 CEST 2014 - ohering@suse.de
+
+- Use /usr/bin/qemu-system-ppc64 as kvm_binary on ppc64le (bnc#884564)
+
+-------------------------------------------------------------------
+Tue Jul  8 12:52:58 CEST 2014 - ohering@suse.de
+
+- Handle empty /lib/mkinitrd/scripts gracefully
+
 -------------------------------------------------------------------
 Mon Jul  7 10:12:36 CEST 2014 - ohering@suse.de
 

libguestfs.mkinitrd.boot.sh

@@ -211,6 +211,9 @@
 #%programs: chroot
 #%programs: umount
 #
+#%programs: bc
+#%programs: fdisk
+#
 # Generated at build time:
 #@GUESTFS_EXT_CMDS@
 #

libguestfs.spec

@@ -100,6 +100,9 @@ Release:        0
 %ifarch aarch64
 %define kvm_binary /usr/bin/qemu-system-aarch64
 %endif
+%ifarch ppc64le
+%define kvm_binary /usr/bin/qemu-system-ppc64
+%endif
 %ifarch ppc64
 %define kvm_binary /usr/bin/qemu-system-ppc64
 %endif
@@ -223,6 +226,7 @@ Group:          System/Filesystems
 Provides:       %{name} = %{version}
 Obsoletes:      %{name} < %{version}
 Requires:       %{kvm_binary}
+Requires:       qemu >= 2.0
 %if %{with bash_completion}
 Recommends:     bash-completion >= 2.0
 %endif
@@ -380,6 +384,7 @@ This package contains testcases to verify libguestfs functionality.
 BuildRequires:  sles-release
 %endif
 BuildRequires:  augeas-lenses
+BuildRequires:  bc
 BuildRequires:  btrfsprogs
 BuildRequires:  bzip2
 BuildRequires:  cdrkit-cdrtools-compat
@@ -677,7 +682,13 @@ 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
-cp -avb /lib/mkinitrd/scripts/* mkinitrd/scripts
+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