From 7788d147699bf30d9e17e3d6957b4b865c76fe51caf9385cce434f3bffc72fa8 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Thu, 31 Jul 2014 12:57:18 +0000 Subject: [PATCH 1/4] - Use Image instead of uImage on ARM OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=311 --- libguestfs.changes | 5 +++++ libguestfs.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libguestfs.changes b/libguestfs.changes index 6b8b79e..7ddff44 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jul 31 14:56:52 CEST 2014 - ohering@suse.de + +- Use Image instead of uImage on ARM + ------------------------------------------------------------------- Mon Jul 28 09:27:51 CEST 2014 - ohering@suse.de diff --git a/libguestfs.spec b/libguestfs.spec index 27e6e7b..8929d8d 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -92,7 +92,7 @@ Release: 0 %define kernel_binary /boot/image %endif %ifarch %arm -%define kernel_binary /boot/uImage +%define kernel_binary /boot/Image %endif # # use 'env LIBGUESTFS_HV=/path/to/kvm libguestfs-test-tool' to verify From b47555b18a396ae47ad01bb1a474ae63b5fffca4f8990b1a9084f8762b5ba03a Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Thu, 31 Jul 2014 13:06:46 +0000 Subject: [PATCH 2/4] - define kernel_binary on aarch64 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=312 --- libguestfs.changes | 2 +- libguestfs.spec | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libguestfs.changes b/libguestfs.changes index 7ddff44..f03a3b3 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Thu Jul 31 14:56:52 CEST 2014 - ohering@suse.de -- Use Image instead of uImage on ARM +- define kernel_binary on aarch64 ------------------------------------------------------------------- Mon Jul 28 09:27:51 CEST 2014 - ohering@suse.de diff --git a/libguestfs.spec b/libguestfs.spec index 8929d8d..b4eb935 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -92,6 +92,9 @@ Release: 0 %define kernel_binary /boot/image %endif %ifarch %arm +%define kernel_binary /boot/uImage +%endif +%ifarch aarch64 %define kernel_binary /boot/Image %endif # From fa2f6c99c9cf5f48c363ca732f9e1ad1779e7bcf6f9086c981ccd1267a58a60f Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Thu, 31 Jul 2014 13:21:59 +0000 Subject: [PATCH 3/4] - Update to version 1.26.7 * launch: Close file descriptors after fork (RHBZ#1123007). * Revert "launch: Close file descriptors after fork (RHBZ#1123007)." * launch: direct: check for null paths in make_uri * make-fs: do not leak the fd from mkstemp * make-fs: respect libguestfs' temporary dir OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=313 --- libguestfs-1.26.6.tar.xz | 3 --- libguestfs-1.26.7.tar.xz | 3 +++ libguestfs.changes | 10 ++++++++++ libguestfs.spec | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) delete mode 100644 libguestfs-1.26.6.tar.xz create mode 100644 libguestfs-1.26.7.tar.xz diff --git a/libguestfs-1.26.6.tar.xz b/libguestfs-1.26.6.tar.xz deleted file mode 100644 index e31e8cc..0000000 --- a/libguestfs-1.26.6.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:836b03938054309a8236f4b9d8da4bf85ef52046ea7900cb2c7ceb0e5af0cc72 -size 5009240 diff --git a/libguestfs-1.26.7.tar.xz b/libguestfs-1.26.7.tar.xz new file mode 100644 index 0000000..5aa75e3 --- /dev/null +++ b/libguestfs-1.26.7.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:56627a4879bf26cd248f5ee0d827308f53583d7e5f943f1969c2da322b448603 +size 5010156 diff --git a/libguestfs.changes b/libguestfs.changes index f03a3b3..355b696 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Jul 31 15:11:49 CEST 2014 - ohering@suse.de + +- Update to version 1.26.7 + * launch: Close file descriptors after fork (RHBZ#1123007). + * Revert "launch: Close file descriptors after fork (RHBZ#1123007)." + * launch: direct: check for null paths in make_uri + * make-fs: do not leak the fd from mkstemp + * make-fs: respect libguestfs' temporary dir + ------------------------------------------------------------------- Thu Jul 31 14:56:52 CEST 2014 - ohering@suse.de diff --git a/libguestfs.spec b/libguestfs.spec index b4eb935..9c7c763 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -17,7 +17,7 @@ # -Version: 1.26.6 +Version: 1.26.7 Release: 0 %define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) From e4ddf29ca26a5da711e4f774aa8eb65993c33cc274f9dfaaa380d346307820ba Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Thu, 31 Jul 2014 13:54:21 +0000 Subject: [PATCH 4/4] - Fix build without ocaml OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=314 --- libguestfs.changes | 5 +++++ libguestfs.spec | 2 ++ 2 files changed, 7 insertions(+) diff --git a/libguestfs.changes b/libguestfs.changes index 355b696..4229904 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jul 31 15:53:57 CEST 2014 - ohering@suse.de + +- Fix build without ocaml + ------------------------------------------------------------------- Thu Jul 31 15:11:49 CEST 2014 - ohering@suse.de diff --git a/libguestfs.spec b/libguestfs.spec index 9c7c763..fde4403 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -873,10 +873,12 @@ rm -rf $RPM_BUILD_ROOT %doc COPYING %{_bindir}/* %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 %endif