Accepting request 321043 from Virtualization

Automatic submission by obs-autosubmit

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

0000-hotfix.patch

@@ -28,13 +28,18 @@ index 7a4d43d..ceea593 100644
      ADD_ARG (argv, i, fs_buf);
      ADD_ARG (argv, i, NULL);
  
-Index: libguestfs-1.26.9/customize/customize_run.ml
+Index: libguestfs-1.26.10/customize/customize_run.ml
 ===================================================================
---- libguestfs-1.26.9.orig/customize/customize_run.ml
-+++ libguestfs-1.26.9/customize/customize_run.ml
-@@ -105,8 +105,7 @@ exec >>%s 2>&1
+--- libguestfs-1.26.10.orig/customize/customize_run.ml
++++ libguestfs-1.26.10/customize/customize_run.ml
+@@ -103,10 +103,11 @@ exec >>%s 2>&1
+     | "urpmi" ->
+       sprintf "urpmi %s" quoted_args
      | "yum" ->
-       sprintf "yum -y install %s" quoted_args
+-      sprintf "yum -y install %s" quoted_args
++      sprintf "
++        yum -y install %s
++        pkill gpg-agent" quoted_args
      | "zypper" ->
 -      (* XXX Should we use -n option? *)
 -      sprintf "zypper in %s" quoted_args

libguestfs.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Tue Jul 28 13:53:53 UTC 2015 - cbosdonnat@suse.com
+
+- Make sure gpg-agent isn't blocking unmount operations for
+  fedora 22+ images. boo#939105
+
+-------------------------------------------------------------------
+Fri Jul 24 12:33:51 UTC 2015 - ohering@suse.de
+
+- Add rpmlintrc to surpress binaryinfo-readelf-failed to reduce
+  build-compare noise
+
+-------------------------------------------------------------------
+Mon Jul 20 07:38:45 UTC 2015 - ohering@suse.de
+
+- Refresh libguestfs.mkinitrd.1310.patch
+
 -------------------------------------------------------------------
 Mon Mar  9 14:14:52 UTC 2015 - ohering@suse.de
 

libguestfs.mkinitrd.1310.patch

@@ -8,9 +8,8 @@ Index: 1310/mkinitrd/scripts/setup-ibft.sh
 ===================================================================
 --- 1310.orig/mkinitrd/scripts/setup-ibft.sh
 +++ 1310/mkinitrd/scripts/setup-ibft.sh
-@@ -21,22 +21,22 @@ ibft_set_iface() {
- 	interface=$iface
- 	drvlink=$(get_network_module $interface)
+@@ -22,22 +22,22 @@ ibft_set_iface() {
+ 	drvlink="$drvlink $(get_network_module $interface)"
  	if [ ! "$nettype" -a -e $ibft_nic/dhcp ]; then
  	    nettype=dhcp
  	    read ibft_dhcp < $ibft_nic/dhcp
@@ -22,6 +21,7 @@ Index: 1310/mkinitrd/scripts/setup-ibft.sh
  }
  
  ibft_nic=/sys/firmware/ibft/ethernet0
+ ibft_nic2=/sys/firmware/ibft/ethernet1
 -ibft_hostname=$(hostname)
 +ibft_hostname=localhost
  

libguestfs.mkinitrd.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:82185e3f7204a84e95306ca7df3500838cefa5b21ff386e7b70663588b8fe41c
-size 81391
+oid sha256:dc4d1703ee39e5e79ede0e22049cdbbd02e1c9f652a5786572bb8521994a4df0
+size 88226

libguestfs.rpmlintrc

@@ -0,0 +1 @@
+addFilter("binaryinfo-readelf-failed")

libguestfs.spec

@@ -178,6 +178,7 @@ 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