diff options
| author | Richard Jones <rjones@redhat.com> | 2009-04-20 23:40:50 +0100 |
|---|---|---|
| committer | Richard Jones <rjones@redhat.com> | 2009-04-20 23:40:50 +0100 |
| commit | 936108f54cbf8e81132a0a0a8c093a4056f0e11c (patch) | |
| tree | 9a8819916ee5833c36cf6a2b3621d196a393c37b | |
| parent | 89f060b5cfecc11558174b7e0b3867f2b8d9c135 (diff) | |
| download | libguestfs-936108f54cbf8e81132a0a0a8c093a4056f0e11c.tar.gz libguestfs-936108f54cbf8e81132a0a0a8c093a4056f0e11c.tar.xz libguestfs-936108f54cbf8e81132a0a0a8c093a4056f0e11c.zip | |
Various fixes to build and test in Koji.1.0.4
| -rw-r--r-- | libguestfs.spec.in | 4 | ||||
| -rw-r--r-- | src/guestfs.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/libguestfs.spec.in b/libguestfs.spec.in index fb95c189..ef07ea89 100644 --- a/libguestfs.spec.in +++ b/libguestfs.spec.in @@ -13,6 +13,10 @@ URL: http://et.redhat.com/~rjones/libguestfs/ Source0: http://et.redhat.com/~rjones/libguestfs/files/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +# Currently fails on non-x86 because of this error: +# "qemu: linux kernel too old to load a ram disk" +ExclusiveArch: %{ix86} x86_64 + # Basic build requirements: BuildRequires: /usr/bin/pod2man BuildRequires: /usr/bin/pod2text diff --git a/src/guestfs.c b/src/guestfs.c index 74fd76b0..0b3142c7 100644 --- a/src/guestfs.c +++ b/src/guestfs.c @@ -730,7 +730,9 @@ guestfs_launch (guestfs_h *g) add_cmdline (g, "-m"); add_cmdline (g, "384"); /* XXX Choose best size. */ +#if defined(__i386__) || defined(__x86_64) add_cmdline (g, "-no-kqemu"); /* Avoids a warning. */ +#endif add_cmdline (g, "-kernel"); add_cmdline (g, (char *) kernel); add_cmdline (g, "-initrd"); |