Remove 0001-i386-Add-noapic-flag-to-work-around-a-qemu-or-kernel.patch.
This patch is now upstream, since the bug seems to be persistent in qemu 1.2.
This commit is contained in:
parent
39332b91c4
commit
78c77a02ff
@ -1,14 +0,0 @@
|
||||
diff --git a/src/launch.c b/src/launch.c
|
||||
index cb1d80b..31d5c65 100644
|
||||
--- a/src/launch.c
|
||||
+++ b/src/launch.c
|
||||
@@ -812,6 +812,9 @@ guestfs___appliance_command_line (guestfs_h *g, const char *appliance_dev)
|
||||
ret = safe_asprintf
|
||||
(g,
|
||||
"panic=1" /* force kernel to panic if daemon exits */
|
||||
+#ifdef __i386__
|
||||
+ " noapic" /* workaround for RHBZ#857026 */
|
||||
+#endif
|
||||
" console=" SERIAL_CONSOLE /* serial console */
|
||||
" udevtimeout=600" /* good for very slow systems (RHBZ#480319) */
|
||||
" no_timer_check" /* fix for RHBZ#502058 */
|
@ -33,10 +33,6 @@ Patch1: ruby-1.9-vendor-not-site.patch
|
||||
BuildRequires: autoconf, automake, libtool, gettext-devel
|
||||
%endif
|
||||
|
||||
# Non-upstream patch to add the noapic flag on the kernel command line
|
||||
# on i386 only. This works around a bug in 32-bit qemu (RHBZ#857026).
|
||||
Patch3: 0001-i386-Add-noapic-flag-to-work-around-a-qemu-or-kernel.patch
|
||||
|
||||
# Basic build requirements:
|
||||
BuildRequires: perl(Pod::Simple)
|
||||
BuildRequires: perl(Pod::Man)
|
||||
@ -680,7 +676,6 @@ fi
|
||||
%patch1 -p1
|
||||
autoreconf -i
|
||||
%endif
|
||||
%patch3 -p1
|
||||
|
||||
mkdir -p daemon/m4
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user