From 34293310c765da1e0e694bc8a772d3ddf5233fdc8319742ab341315763d85bea Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Mon, 20 Jul 2015 07:39:13 +0000 Subject: [PATCH 1/5] - Refresh libguestfs.mkinitrd.1310.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=337 --- libguestfs.changes | 5 +++++ libguestfs.mkinitrd.1310.patch | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/libguestfs.changes b/libguestfs.changes index e05a27c..ff6b9ed 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/libguestfs.mkinitrd.1310.patch b/libguestfs.mkinitrd.1310.patch index 6295c97..a92014d 100644 --- a/libguestfs.mkinitrd.1310.patch +++ b/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 From 862033cc60ce9db1f07872ba2190e174910159bfb90a6b286f60e9ae8314e159 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Mon, 20 Jul 2015 07:58:02 +0000 Subject: [PATCH 2/5] Upddate mkinitrd.tar.bz2 from openSUSE:Maintenance:3876 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=338 --- libguestfs.mkinitrd.tar.bz2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libguestfs.mkinitrd.tar.bz2 b/libguestfs.mkinitrd.tar.bz2 index 5c9b516..9e52137 100644 --- a/libguestfs.mkinitrd.tar.bz2 +++ b/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 From 01b335e3ad566609c73a8b899518fc9cdca32d7dc4667276a2b90586cb31f036 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Fri, 24 Jul 2015 12:35:04 +0000 Subject: [PATCH 3/5] - Add rpmlintrc to surpress binaryinfo-readelf-failed to reduce build-compare noise OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=339 --- libguestfs.changes | 6 ++++++ libguestfs.rpmlintrc | 1 + 2 files changed, 7 insertions(+) create mode 100644 libguestfs.rpmlintrc diff --git a/libguestfs.changes b/libguestfs.changes index ff6b9ed..b778e04 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/libguestfs.rpmlintrc b/libguestfs.rpmlintrc new file mode 100644 index 0000000..9f44a0c --- /dev/null +++ b/libguestfs.rpmlintrc @@ -0,0 +1 @@ +addFilter("binaryinfo-readelf-failed") From b70f50280e4ef2959d47c9d4c40841fa82a7fa8ec43ffa96eecda19e7e5960f4 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Tue, 28 Jul 2015 15:10:47 +0000 Subject: [PATCH 4/5] Accepting request 319128 from home:cbosdonnat:branches:Virtualization - Make sure gpg-agent isn't blocking unmount operations for fedora 22+ images. boo#939105 OBS-URL: https://build.opensuse.org/request/show/319128 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=340 --- 0000-hotfix.patch | 15 ++++++++++----- libguestfs.changes | 6 ++++++ libguestfs.spec | 2 +- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/0000-hotfix.patch b/0000-hotfix.patch index 2710ab6..bd715a5 100644 --- a/0000-hotfix.patch +++ b/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 diff --git a/libguestfs.changes b/libguestfs.changes index b778e04..fb0fd43 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/libguestfs.spec b/libguestfs.spec index 6f48347..49e9f7a 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -1,7 +1,7 @@ # # spec file for package libguestfs # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2011 Michal Hrusecky # # All modifications and additions to the file contributed by third parties From b57c032050f5c235f38026790bce9c406ccddc5b88bae14e3f93bf870f73a9f8 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Fri, 31 Jul 2015 07:45:51 +0000 Subject: [PATCH 5/5] libguestfs.rpmlintrc OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=341 --- libguestfs.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libguestfs.spec b/libguestfs.spec index 49e9f7a..bf4209c 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -1,7 +1,7 @@ # # spec file for package libguestfs # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2011 Michal Hrusecky # # All modifications and additions to the file contributed by third parties @@ -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