|
| 1 | +diff --git a/Makefile b/Makefile |
| 2 | +index f23b041..8a5d68d 100644 |
| 3 | +--- a/Makefile |
| 4 | ++++ b/Makefile |
| 5 | +@@ -22,25 +22,6 @@ ifeq ($(shell test -f "$(SRCDIR)/configure" && echo 1 || echo 0), 0) |
| 6 | + cd $(SRCDIR); meson subprojects download |
| 7 | + endif |
| 8 | + |
| 9 | +-PC_BIOS_FW_PURGE_LIST_IN = \ |
| 10 | +- hppa-firmware.img \ |
| 11 | +- hppa-firmware64.img \ |
| 12 | +- openbios-ppc \ |
| 13 | +- openbios-sparc32 \ |
| 14 | +- openbios-sparc64 \ |
| 15 | +- palcode-clipper \ |
| 16 | +- s390-ccw.img \ |
| 17 | +- s390-netboot.img \ |
| 18 | +- u-boot.e500 \ |
| 19 | +- .*[a-zA-Z0-9]\.dtb \ |
| 20 | +- .*[a-zA-Z0-9]\.dts \ |
| 21 | +- qemu_vga.ndrv \ |
| 22 | +- slof.bin \ |
| 23 | +- opensbi-riscv.*-generic-fw_dynamic.bin \ |
| 24 | +- |
| 25 | +-BLOB_PURGE_SED_CMDS = $(foreach FILE,$(PC_BIOS_FW_PURGE_LIST_IN),-e "/$(FILE)/d") |
| 26 | +-BLOB_PURGE_FILTER = $(foreach FILE,$(PC_BIOS_FW_PURGE_LIST_IN),-e "$(FILE)") |
| 27 | +- |
| 28 | + $(BUILDDIR): submodule |
| 29 | + # check if qemu/ was used for a build |
| 30 | + # if so, please run 'make distclean' in the submodule and try again |
| 31 | +@@ -49,8 +30,6 @@ $(BUILDDIR): submodule |
| 32 | + cp -a $(SRCDIR) $@.tmp |
| 33 | + cp -a debian $@.tmp/debian |
| 34 | + rm -rf $@.tmp/roms/edk2 # packaged separately |
| 35 | +- find $@.tmp/pc-bios -type f | grep $(BLOB_PURGE_FILTER) | xargs rm -f |
| 36 | +- sed -i $(BLOB_PURGE_SED_CMDS) $@.tmp/pc-bios/meson.build |
| 37 | + echo "git clone git://git.proxmox.com/git/pve-qemu.git\\ngit checkout $(GITVERSION)" > $@.tmp/debian/SOURCE |
| 38 | + mv $@.tmp $@ |
| 39 | + |
| 40 | +diff --git a/debian/control b/debian/control |
| 41 | +index b228c00..01c6621 100644 |
| 42 | +--- a/debian/control |
| 43 | ++++ b/debian/control |
| 44 | +@@ -13,6 +13,7 @@ Build-Depends: debhelper-compat (= 13), |
| 45 | + libfdt-dev, |
| 46 | + libgbm-dev, |
| 47 | + libglusterfs-dev (>= 5.2-2), |
| 48 | ++ libgtk-3-dev, |
| 49 | + libgnutls28-dev, |
| 50 | + libiscsi-dev (>= 1.12.0), |
| 51 | + libjpeg-dev, |
| 52 | +diff --git a/debian/parse-machines.pl b/debian/parse-machines.pl |
| 53 | +index a0f449c..e179f9b 100755 |
| 54 | +--- a/debian/parse-machines.pl |
| 55 | ++++ b/debian/parse-machines.pl |
| 56 | +@@ -14,11 +14,11 @@ while (<STDIN>) { |
| 57 | + |
| 58 | + s/^\s+//; |
| 59 | + my @machine = split(/\s+/); |
| 60 | +- next if $machine[0] !~ m/^pc-(i440fx|q35)-(.+)$/; |
| 61 | ++ next if $machine[0] !~ m/^virt-(.+)$/; |
| 62 | + push @$machines, { |
| 63 | + 'id' => $machine[0], |
| 64 | +- 'type' => $1, |
| 65 | +- 'version' => $2, |
| 66 | ++ 'type' => 'virt', |
| 67 | ++ 'version' => $1, |
| 68 | + }; |
| 69 | + } |
| 70 | + |
| 71 | +diff --git a/debian/pve-qemu-kvm.links b/debian/pve-qemu-kvm.links |
| 72 | +index 7314aa4..2c4b8e1 100644 |
| 73 | +--- a/debian/pve-qemu-kvm.links |
| 74 | ++++ b/debian/pve-qemu-kvm.links |
| 75 | +@@ -1,6 +1,5 @@ |
| 76 | + # also use aarch64 for 32 bit arm |
| 77 | + usr/bin/qemu-system-aarch64 usr/bin/qemu-system-arm |
| 78 | +-usr/bin/qemu-system-x86_64 usr/bin/kvm |
| 79 | + # qemu-system-i386 and qemu-system-x86_64 provides the same hardware emulation |
| 80 | + usr/bin/qemu-system-x86_64 usr/bin/qemu-system-i386 |
| 81 | + # upstream provides a qemu man page, |
| 82 | +diff --git a/debian/rules b/debian/rules |
| 83 | +index 51f56c5..2988432 100755 |
| 84 | +--- a/debian/rules |
| 85 | ++++ b/debian/rules |
| 86 | +@@ -12,7 +12,7 @@ PACKAGE=pve-qemu-kvm |
| 87 | + destdir := $(CURDIR)/debian/$(PACKAGE) |
| 88 | + |
| 89 | + flagfile := $(destdir)/usr/share/kvm/recognized-CPUID-flags-x86_64 |
| 90 | +-machinefile := $(destdir)/usr/share/kvm/machine-versions-x86_64.json |
| 91 | ++machinefile := $(destdir)/usr/share/kvm/machine-versions-aarch64.json |
| 92 | + |
| 93 | + # default QEMU out-of-tree build directory is ./build |
| 94 | + BUILDDIR=build |
| 95 | +@@ -35,7 +35,7 @@ endif |
| 96 | + ifneq "$(wildcard /usr/share/misc/config.guess)" "" |
| 97 | + cp -f /usr/share/misc/config.guess config.guess |
| 98 | + endif |
| 99 | +- |
| 100 | ++ echo "usr/bin/qemu-system-${HOST_CPU} usr/bin/kvm" >> debian/pve-qemu-kvm.links |
| 101 | + # guest-agent is only required for guest systems |
| 102 | + ./configure \ |
| 103 | + --disable-download \ |
| 104 | +@@ -43,14 +43,13 @@ endif |
| 105 | + --localstatedir=/var \ |
| 106 | + --prefix=/usr \ |
| 107 | + --sysconfdir=/etc \ |
| 108 | +- --target-list=$(HOST_CPU)-softmmu,aarch64-softmmu \ |
| 109 | + --with-suffix="kvm" \ |
| 110 | + --with-pkgversion="${DEB_SOURCE}_${DEB_VERSION_UPSTREAM_REVISION}" \ |
| 111 | + --audio-drv-list="alsa" \ |
| 112 | + --datadir=/usr/share \ |
| 113 | + --libexecdir=/usr/lib/kvm \ |
| 114 | + --disable-capstone \ |
| 115 | +- --disable-gtk \ |
| 116 | ++ --enable-gtk \ |
| 117 | + --disable-guest-agent \ |
| 118 | + --disable-guest-agent-msi \ |
| 119 | + --disable-libnfs \ |
| 120 | +@@ -121,7 +120,7 @@ install: build |
| 121 | + |
| 122 | + # CPU flags are static for QEMU version, allows avoiding more costly checks |
| 123 | + $(destdir)/usr/bin/qemu-system-x86_64 -cpu help | ./debian/parse-cpu-flags.pl > $(flagfile) |
| 124 | +- $(destdir)/usr/bin/qemu-system-x86_64 -machine help | ./debian/parse-machines.pl > $(machinefile) |
| 125 | ++ $(destdir)/usr/bin/qemu-system-aarch64 -machine help | ./debian/parse-machines.pl > $(machinefile) |
| 126 | + |
| 127 | + # Build architecture-independent files here. |
| 128 | + binary-indep: build install |
0 commit comments