From: Konrad Rzeszutek Wilk Date: Thu, 14 Jun 2018 00:01:16 +0000 (-0400) Subject: Makefile: include (in /usr/local) the upstream QEMU build. X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=dab1ac8303673d452a5f2186911d2a9364b4f8cc;p=xentesttools%2Fbootstrap.git Makefile: include (in /usr/local) the upstream QEMU build. Signed-off-by: Konrad Rzeszutek Wilk --- diff --git a/root_image/Makefile b/root_image/Makefile index edf30c4..1d296ff 100644 --- a/root_image/Makefile +++ b/root_image/Makefile @@ -192,7 +192,8 @@ root_image-userspace-install: $(USERSPACE_INSTALL) add-libs add-bins add-debug-b tools-install wget-install vim-install rsync-install openssh-install \ xtt-tools-install netperf-install lvm2-install \ pciutils-install iscsi-install bridge-utils-install xend-install \ - perl-core nfs-install fio-install irqbalance-install + perl-core nfs-install fio-install irqbalance-install \ + qemu-install rm -rf userspace/man rm -rf userspace/usr/share/man @@ -1061,7 +1062,7 @@ qemu-install: userspace-prep if ! [ -e qemu/config.h ]; then \ (cd qemu;./configure --enable-vhost-net --enable-kvm --disable-xen \ --disable-curses --disable-slirp --disable-opengl --disable-sdl \ - --disable-vnc-sasl --disable-vnc-tls --prefix=/usr/kvm \ + --disable-vnc-sasl --disable-gtk --prefix=/usr/local \ --target-list=$(ARCH)-softmmu); \ echo "#include \"config-host.h\"" > qemu/config.h; \ echo "#include \"config-target.h\"" >> qemu/config.h; \