diff --git a/qemu-add-cache-utils-to-block-objs.patch b/qemu-add-cache-utils-to-block-objs.patch new file mode 100644 index 0000000..59c0fb5 --- /dev/null +++ b/qemu-add-cache-utils-to-block-objs.patch @@ -0,0 +1,12 @@ +diff -up ./qemu-kvm-devel-85/qemu/Makefile.add-cache-utils-to-block-objs ./qemu-kvm-devel-85/qemu/Makefile +--- ./qemu-kvm-devel-85/qemu/Makefile.add-cache-utils-to-block-objs 2009-04-27 15:54:16.000000000 +0100 ++++ ./qemu-kvm-devel-85/qemu/Makefile 2009-04-27 15:53:51.000000000 +0100 +@@ -49,7 +49,7 @@ recurse-all: $(SUBDIR_RULES) + ####################################################################### + # BLOCK_OBJS is code used by both qemu system emulation and qemu-img + +-BLOCK_OBJS=cutils.o qemu-malloc.o ++BLOCK_OBJS=cutils.o cache-utils.o qemu-malloc.o + BLOCK_OBJS+=block-cow.o block-qcow.o aes.o block-vmdk.o block-cloop.o + BLOCK_OBJS+=block-dmg.o block-bochs.o block-vpc.o block-vvfat.o + BLOCK_OBJS+=block-qcow2.o block-parallels.o block-nbd.o diff --git a/qemu.spec b/qemu.spec index 4790d19..49853db 100644 --- a/qemu.spec +++ b/qemu.spec @@ -37,6 +37,9 @@ Patch06: qemu-fix-arm-framebuffer-build.patch # Disable preadv()/pwritev() until bug #497429 is fixed Patch07: qemu-disable-preadv.patch +# Fix build on ppc; cutils.c needs cache-utils.c +Patch08: qemu-add-cache-utils-to-block-objs.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel BuildRequires: rsync dev86 iasl @@ -219,6 +222,7 @@ such as kvmtrace and kvm_stat. %patch05 -p1 -b .virtio-blk-boot-on %patch06 -p1 -b .framebuffer-build-fix %patch07 -p1 -b .disable-preadv +%patch08 -p1 -b .add-cache-utils-to-block-objs %build # systems like rhel build system does not have a recent enough linker so @@ -465,6 +469,7 @@ fi - Drop upstreamed patches - Fix missing kernel/include/asm symlink in upstream tarball - Fix target-arm build +- Fix build on ppc - Disable preadv()/pwritev() until bug #497429 is fixed - Kill more .kernelrelease uselessness - Make non-kvm qemu build verbose