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