rpms
/
qemu
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Backport commit 38f419f (configure: Fix CONFIG_QEMU_HELPERDIR generation, 2012-10-17)

This commit is contained in:
Paolo Bonzini 2012-11-16 09:11:16 +01:00
parent 773d5bd0fe
commit 31bb198284
2 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
0805-configure-Fix-CONFIG_QEMU_HELPERDIR-generation.patch Normal file
View File

@ -0,0 +1,31 @@
From 38f419f35225decdbaea9fe1fd00218f8924ce84 Mon Sep 17 00:00:00 2001
From: Jan Kiszka <jan.kiszka@siemens.com>
Date: Wed, 17 Oct 2012 19:09:25 +0200
Subject: [PATCH] configure: Fix CONFIG_QEMU_HELPERDIR generation
We need to evaluate $libexecdir in configure, otherwise we literally end
up with "${prefix}/libexec" instead of the absolute path as
CONFIG_QEMU_HELPERDIR.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
---
configure | 2 +-
1 file modificato, 1 inserzione(+). 1 rimozione(-)
diff --git a/configure b/configure
index f9c31f4..9f33c7d 100755
--- a/configure
+++ b/configure
@@ -3200,7 +3200,7 @@ echo "qemu_confdir=$qemu_confdir" >> $config_host_mak
echo "qemu_datadir=$qemu_datadir" >> $config_host_mak
echo "qemu_docdir=$qemu_docdir" >> $config_host_mak
echo "qemu_localstatedir=$local_statedir" >> $config_host_mak
-echo "CONFIG_QEMU_HELPERDIR=\"$libexecdir\"" >> $config_host_mak
+echo "CONFIG_QEMU_HELPERDIR=\"`eval echo $libexecdir`\"" >> $config_host_mak
echo "ARCH=$ARCH" >> $config_host_mak
if test "$debug_tcg" = "yes" ; then
--
1.7.12.1

9
qemu.spec
View File

@ -109,7 +109,7 @@
Summary: QEMU is a FAST! processor emulator
Name: qemu
Version: 1.2.0
Release: 20%{?dist}
Release: 21%{?dist}
# Epoch because we pushed a qemu-1.0 package. AIUI this can't ever be dropped
Epoch: 2
License: GPLv2+ and LGPLv2+ and BSD
@ -479,6 +479,8 @@ Patch803: 0803-dtrace-backend-add-function-to-reserved-words.patch
# Drop assertion that was triggering when pausing guests w/ qxl (bz
# 870972)
Patch804: 0804-wip-hw-qxl-inject-interrupts-in-any-state.patch
# 38f419f (configure: Fix CONFIG_QEMU_HELPERDIR generation, 2012-10-17)
Patch805: 0805-configure-Fix-CONFIG_QEMU_HELPERDIR-generation.patch
BuildRequires: SDL-devel
@ -1219,6 +1221,7 @@ such as kvm_stat.
%patch802 -p1
%patch803 -p1
%patch804 -p1
%patch805 -p1
%build
@ -1816,6 +1819,10 @@ fi
%{_mandir}/man1/qemu-img.1*
%changelog
* Fri Nov 16 2012 Paolo Bonzini <pbonzini@redhat.com> - 2:1.2.0-21
- Backport commit 38f419f (configure: Fix CONFIG_QEMU_HELPERDIR generation,
2012-10-17)
* Thu Nov 15 2012 Paolo Bonzini <pbonzini@redhat.com> - 2:1.2.0-20
- Install qemu-bridge-helper as suid root
- Distribute a sample /etc/qemu/bridge.conf file