X-Git-Url: https://git.proxmox.com/?p=pve-qemu-kvm.git;a=blobdiff_plain;f=debian%2Frules;h=ecacfa35e2bc445d2356791bb7f0b03b61f39c1e;hp=e06e534ec52f5d49189f99e503e75cdd6da7c43d;hb=f7149dd489fbd3a63e6d8192d28c3eee31b9490a;hpb=aad5ffd754a09c8b11bfe6471132923c0cfeb834

diff --git a/debian/rules b/debian/rules
index e06e534..ecacfa3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,6 +15,8 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
+ARCH ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
+
 PACKAGE=pve-qemu-kvm
 destdir := $(CURDIR)/debian/$(PACKAGE)
 
@@ -33,7 +35,7 @@ endif
 config.status: configure
 	dh_testdir
 	# Add here commands to configure the package.
-	./configure --with-confsuffix="/kvm" --target-list=x86_64-softmmu --prefix=/usr --datadir=/usr/share --docdir=/usr/share/doc/pve-qemu-kvm --sysconfdir=/etc --localstatedir=/var --disable-xen --enable-vnc-tls --enable-sdl --enable-uuid --enable-linux-aio --enable-rbd --enable-libiscsi --disable-smartcard-nss --audio-drv-list="alsa" --enable-spice --enable-usb-redir --enable-glusterfs --enable-libusb --disable-gtk --enable-xfsctl --enable-numa --disable-strip
+	./configure --with-confsuffix="/kvm" --target-list=$(ARCH)-softmmu --prefix=/usr --datadir=/usr/share --docdir=/usr/share/doc/pve-qemu-kvm --sysconfdir=/etc --localstatedir=/var --disable-xen --enable-gnutls --enable-sdl --enable-linux-aio --enable-rbd --enable-libiscsi --disable-smartcard --audio-drv-list="alsa" --enable-spice --enable-usb-redir --enable-glusterfs --enable-libusb --disable-gtk --enable-xfsctl --enable-numa --disable-strip --enable-jemalloc --enable-virtfs --disable-libnfs --disable-fdt
 
 build: patch build-stamp
 
@@ -73,25 +75,24 @@ install: build
 	# Add here commands to install the package into debian/pve-kvm.
 	$(MAKE) DESTDIR=$(destdir) install
 
-	mv $(destdir)/usr/bin/qemu-system-x86_64 $(destdir)/usr/bin/kvm
+	mv $(destdir)/usr/bin/qemu-system-$(ARCH) $(destdir)/usr/bin/kvm
 	mv $(destdir)/usr/share/man/man1/qemu.1 $(destdir)/usr/share/man/man1/kvm.1
 
 	# Install the userspace utilities
-	install -m 0755 scripts/kvm/kvm_stat $(destdir)/usr/bin/
 	install -s -m 0755 vma $(destdir)/usr/bin/
 
 	install -D -m 0755 $(CURDIR)/debian/kvm-ifup $(destdir)/etc/kvm/kvm-ifup
 	install -D -m 0755 $(CURDIR)/debian/kvm-ifdown $(destdir)/etc/kvm/kvm-ifdown
 
-	# do not install empty file (now in /usr/share/kvm/cpus-x86_64.conf)
-	rm $(destdir)/etc/kvm/target-x86_64.conf
+	#install ovmf uefi rom
+	install -D -m 0644 $(CURDIR)/debian/OVMF_CODE-pure-efi.fd $(destdir)/usr/share/kvm/OVMF_CODE-pure-efi.fd
+	install -D -m 0644 $(CURDIR)/debian/OVMF_VARS-pure-efi.fd $(destdir)/usr/share/kvm/OVMF_VARS-pure-efi.fd
 
 	# we do not need openbios files (sparc/ppc)
 	rm -rf $(destdir)/usr/share/kvm/openbios-*
 	# remove ppc files
 	rm $(destdir)/usr/share/kvm/*.dtb
 	rm $(destdir)/usr/share/kvm/ppc_rom.bin
-	rm $(destdir)/usr/share/kvm/s390-zipl.rom
 	rm $(destdir)/usr/share/kvm/s390-ccw.img
 	rm $(destdir)/usr/share/kvm/slof.bin
 	rm $(destdir)/usr/share/kvm/spapr-rtas.bin