Readd patch to fix virtio-serial test for qemu 0.15.
This commit is contained in:
parent
21b563e902
commit
3036d99169
|
@ -0,0 +1,25 @@
|
||||||
|
Only in libguestfs-1.12.0: autom4te.cache
|
||||||
|
diff -ur libguestfs-1.12.0.old/configure libguestfs-1.12.0/configure
|
||||||
|
--- libguestfs-1.12.0.old/configure 2011-07-20 16:40:27.000000000 +0100
|
||||||
|
+++ libguestfs-1.12.0/configure 2011-07-20 18:48:50.261315374 +0100
|
||||||
|
@@ -36849,7 +36849,7 @@
|
||||||
|
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for virtio-serial support in $QEMU" >&5
|
||||||
|
$as_echo_n "checking for virtio-serial support in $QEMU... " >&6; }
|
||||||
|
- if $QEMU -nographic -device \? 2>&1 | grep -sq virtio-serial; then
|
||||||
|
+ if $QEMU -machine accel=tcg -nographic -device \? 2>&1 | grep -sq virtio-serial; then
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||||
|
$as_echo "yes" >&6; }
|
||||||
|
else
|
||||||
|
diff -ur libguestfs-1.12.0.old/configure.ac libguestfs-1.12.0/configure.ac
|
||||||
|
--- libguestfs-1.12.0.old/configure.ac 2011-07-20 16:35:50.000000000 +0100
|
||||||
|
+++ libguestfs-1.12.0/configure.ac 2011-07-20 18:48:41.251139811 +0100
|
||||||
|
@@ -326,7 +326,7 @@
|
||||||
|
fi
|
||||||
|
|
||||||
|
AC_MSG_CHECKING([for virtio-serial support in $QEMU])
|
||||||
|
- if $QEMU -nographic -device \? 2>&1 | grep -sq virtio-serial; then
|
||||||
|
+ if $QEMU -machine accel=tcg -nographic -device \? 2>&1 | grep -sq virtio-serial; then
|
||||||
|
AC_MSG_RESULT([yes])
|
||||||
|
else
|
||||||
|
AC_MSG_RESULT([no])
|
|
@ -30,7 +30,7 @@ Summary: Access and modify virtual machine disk images
|
||||||
Name: libguestfs
|
Name: libguestfs
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 1.12.0
|
Version: 1.12.0
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
URL: http://libguestfs.org/
|
URL: http://libguestfs.org/
|
||||||
|
@ -44,6 +44,9 @@ Patch0: libguestfs-1.7.13-no-fuse-test.patch
|
||||||
# See: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=628522
|
# See: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=628522
|
||||||
Patch1: 0001-perl-Don-t-set-CCFLAGS.patch
|
Patch1: 0001-perl-Don-t-set-CCFLAGS.patch
|
||||||
|
|
||||||
|
# Force qemu-kvm test to run with -machine accel=tcg flag.
|
||||||
|
Patch2: libguestfs-1.12.0-configure-force-machine-accel-tcg.patch
|
||||||
|
|
||||||
# Basic build requirements:
|
# Basic build requirements:
|
||||||
BuildRequires: /usr/bin/pod2man
|
BuildRequires: /usr/bin/pod2man
|
||||||
BuildRequires: /usr/bin/pod2text
|
BuildRequires: /usr/bin/pod2text
|
||||||
|
@ -496,6 +499,7 @@ for %{name}.
|
||||||
|
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
|
%patch2 -p1
|
||||||
|
|
||||||
mkdir -p daemon/m4
|
mkdir -p daemon/m4
|
||||||
|
|
||||||
|
@ -860,6 +864,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jul 20 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.12.0-2
|
||||||
|
- Readd patch to fix virtio-serial test for qemu 0.15.
|
||||||
|
|
||||||
* Wed Jul 20 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.12.0-1
|
* Wed Jul 20 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.12.0-1
|
||||||
- New stable version 1.12.0 for Fedora 16.
|
- New stable version 1.12.0 for Fedora 16.
|
||||||
- Remove upstream patch.
|
- Remove upstream patch.
|
||||||
|
|
Loading…
Reference in New Issue