From 7ff4f2fa187054584e9c2b0d60791f22b743d8ff3de66f286a52845c1e4c9b97 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Tue, 8 Jul 2014 10:53:33 +0000 Subject: [PATCH 1/8] - Handle empty /lib/mkinitrd/scripts gracefully OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=299 --- libguestfs.changes | 5 +++++ libguestfs.spec | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/libguestfs.changes b/libguestfs.changes index 71cf274..28e09f5 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/libguestfs.spec b/libguestfs.spec index 9ab38f0..2d3e507 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -677,7 +677,14 @@ 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" + break + 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 From 121e93d121828d68fcfb847a70acde2c8c58f212acc84b424ebcddccf429e2ae Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Tue, 8 Jul 2014 10:54:08 +0000 Subject: [PATCH 2/8] remove incorrect break statement, introduced by previous commit OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=300 --- libguestfs.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/libguestfs.spec b/libguestfs.spec index 2d3e507..6541057 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -682,7 +682,6 @@ do if test -f "$i" then cp -avbt mkinitrd/scripts "$i" - break fi done mkdir -vp mkinitrd/setup mkinitrd/boot From 86b12d53c728c14037bebc35be5d7bea817b346d77de87dec89e14ea23ce1964 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Tue, 8 Jul 2014 10:54:55 +0000 Subject: [PATCH 3/8] - Use /usr/bin/qemu-system-ppc64 as kvm_binary on ppc64le OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=301 --- libguestfs.changes | 5 +++++ libguestfs.spec | 3 +++ 2 files changed, 8 insertions(+) diff --git a/libguestfs.changes b/libguestfs.changes index 28e09f5..9bfe5f8 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jul 8 12:54:34 CEST 2014 - ohering@suse.de + +- Use /usr/bin/qemu-system-ppc64 as kvm_binary on ppc64le + ------------------------------------------------------------------- Tue Jul 8 12:52:58 CEST 2014 - ohering@suse.de diff --git a/libguestfs.spec b/libguestfs.spec index 6541057..cdc472b 100644 --- a/libguestfs.spec +++ b/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 From 58ad5a6bf0dc7e782564ad50e7774c01c3a201a41361dd232fcbe91784ea66de Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Tue, 8 Jul 2014 10:55:39 +0000 Subject: [PATCH 4/8] - Use /usr/bin/qemu-system-ppc64 as kvm_binary on ppc64le (bnc#884564) OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=302 --- libguestfs.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libguestfs.changes b/libguestfs.changes index 9bfe5f8..0540c81 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Tue Jul 8 12:54:34 CEST 2014 - ohering@suse.de -- Use /usr/bin/qemu-system-ppc64 as kvm_binary on ppc64le +- Use /usr/bin/qemu-system-ppc64 as kvm_binary on ppc64le (bnc#884564) ------------------------------------------------------------------- Tue Jul 8 12:52:58 CEST 2014 - ohering@suse.de From e24e300c1064550ef5dc00a77183935679c802d677b080a9c02af31c9ca50629 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Tue, 8 Jul 2014 15:26:15 +0000 Subject: [PATCH 5/8] restore qemu version requirement, 2.0 this time OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=303 --- libguestfs.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libguestfs.spec b/libguestfs.spec index cdc472b..9caa867 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -225,7 +225,7 @@ License: GPL-2.0 Group: System/Filesystems Provides: %{name} = %{version} Obsoletes: %{name} < %{version} -Requires: %{kvm_binary} +Requires: %{kvm_binary} >= 2.0 %if %{with bash_completion} Recommends: bash-completion >= 2.0 %endif From b7316c8489ffc27574129ddeb81f1a4958c60cd81463e26039f8441c022b18c1 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Tue, 8 Jul 2014 15:30:01 +0000 Subject: [PATCH 6/8] remove versioned requires again, does not work OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=304 --- libguestfs.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libguestfs.spec b/libguestfs.spec index 9caa867..cdc472b 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -225,7 +225,7 @@ License: GPL-2.0 Group: System/Filesystems Provides: %{name} = %{version} Obsoletes: %{name} < %{version} -Requires: %{kvm_binary} >= 2.0 +Requires: %{kvm_binary} %if %{with bash_completion} Recommends: bash-completion >= 2.0 %endif From d9b94223a5f0f10d3e15d57f477043dead96e2b5e36f33dcdfafa9d2f4acbf1c Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Tue, 8 Jul 2014 15:34:31 +0000 Subject: [PATCH 7/8] - add Requires: qemu 2 to guestfs-tools to restore versioned kvm OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=305 --- libguestfs.changes | 5 +++++ libguestfs.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/libguestfs.changes b/libguestfs.changes index 0540c81..3544bf2 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/libguestfs.spec b/libguestfs.spec index cdc472b..79a9597 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -226,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 From c7c8c8231b81bb2911519ecd01b97c51ff91665214a244c422bdb3d710ff9da9 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Wed, 9 Jul 2014 08:04:24 +0000 Subject: [PATCH 8/8] - Include fdisk and bc (bnc#886372) OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=306 --- libguestfs.changes | 5 +++++ libguestfs.mkinitrd.boot.sh | 3 +++ libguestfs.spec | 1 + 3 files changed, 9 insertions(+) diff --git a/libguestfs.changes b/libguestfs.changes index 3544bf2..2942ad2 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/libguestfs.mkinitrd.boot.sh b/libguestfs.mkinitrd.boot.sh index 2362b95..3efac4a 100644 --- a/libguestfs.mkinitrd.boot.sh +++ b/libguestfs.mkinitrd.boot.sh @@ -211,6 +211,9 @@ #%programs: chroot #%programs: umount # +#%programs: bc +#%programs: fdisk +# # Generated at build time: #@GUESTFS_EXT_CMDS@ # diff --git a/libguestfs.spec b/libguestfs.spec index 79a9597..73c6791 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -384,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