- New upstream version 1.13.15.

- Add lzop program to the appliance (for compress-out API).
- Remove upstream patch.
This commit is contained in:
Richard W.M. Jones 2011-09-28 22:17:06 +01:00
parent c723eb18c8
commit 47082bfc07
4 changed files with 11 additions and 38 deletions

1
.gitignore vendored
View File

@ -101,3 +101,4 @@ libguestfs-1.5.3.tar.gz
/libguestfs-1.13.12.tar.gz
/libguestfs-1.13.13.tar.gz
/libguestfs-1.13.14.tar.gz
/libguestfs-1.13.15.tar.gz

View File

@ -1,31 +0,0 @@
From 322106521f546d7c70c5a38255db7d243a456a6b Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 26 Sep 2011 13:34:12 +0100
Subject: [PATCH] Add no_timer_check to disable faulty test during boot
(RHBZ#502058).
See:
https://bugzilla.redhat.com/show_bug.cgi?id=502058#c15
https://bugzilla.redhat.com/show_bug.cgi?id=698842#c8
This updates commit 79e66f89e2f6c27486476d7857da58feb491bf5c.
---
src/launch.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/launch.c b/src/launch.c
index 515ccd5..80eadef 100644
--- a/src/launch.c
+++ b/src/launch.c
@@ -606,6 +606,7 @@ launch_appliance (guestfs_h *g)
"panic=1 " /* force kernel to panic if daemon exits */ \
"console=ttyS0 " /* serial console */ \
"udevtimeout=300 " /* good for very slow systems (RHBZ#480319) */ \
+ "no_timer_check " /* fix for RHBZ#502058 */ \
"acpi=off " /* we don't need ACPI, turn it off */ \
"printk.time=1 " /* display timestamp before kernel messages */ \
"cgroup_disable=memory " /* saves us about 5 MB of RAM */
--
1.7.6

View File

@ -29,8 +29,8 @@
Summary: Access and modify virtual machine disk images
Name: libguestfs
Epoch: 1
Version: 1.13.14
Release: 2%{?dist}
Version: 1.13.15
Release: 1%{?dist}
License: LGPLv2+
Group: Development/Libraries
URL: http://libguestfs.org/
@ -49,9 +49,6 @@ Patch2: libguestfs-1.12.0-configure-force-machine-accel-tcg.patch
# while.
Patch3: 0001-Fix-qemu-machine-option-for-latest-qemu-thanks-Marku.patch
# Upstream patch to fix timer check failures during boot.
Patch4: 0001-Add-no_timer_check-to-disable-faulty-test-during-boo.patch
# Basic build requirements:
BuildRequires: /usr/bin/pod2man
BuildRequires: /usr/bin/pod2text
@ -94,6 +91,7 @@ BuildRequires: jfsutils, xfsprogs
BuildRequires: vim-minimal
BuildRequires: binutils
BuildRequires: cryptsetup-luks
BuildRequires: lzop
%ifarch %{ix86} x86_64
#BuildRequires: grub
BuildRequires: ntfsprogs
@ -110,6 +108,7 @@ Requires: jfsutils, xfsprogs
Requires: vim-minimal
Requires: binutils
Requires: cryptsetup-luks
Requires: lzop
%ifarch %{ix86} x86_64
#Requires: grub
Requires: ntfsprogs
@ -521,7 +520,6 @@ for %{name}.
%patch0 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
mkdir -p daemon/m4
@ -901,6 +899,11 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Wed Sep 28 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.13.15-1
- New upstream version 1.13.15.
- Add lzop program to the appliance (for compress-out API).
- Remove upstream patch.
* Mon Sep 26 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.13.14-2
- Upstream patch to fix timer check failures during boot (RHBZ#502058).

View File

@ -1 +1 @@
0322ad313034fb79d6f132b0c15a0f92 libguestfs-1.13.14.tar.gz
9c2826021ca23fbd965adb5d2e2d5ad2 libguestfs-1.13.15.tar.gz