1
diff --git a/debian/changelog b/debian/changelog
2
index dbafc80..d4215fa 100644
3
--- a/debian/changelog
4
+++ b/debian/changelog
5
@@ -1,3 +1,15 @@
6
1
qemu (1:8.2.0+ds-4ubuntu2) noble; urgency=medium
7
2
8
3
  * Move glusterfs storage driver to Universe in a new package
9
4
    (LP: #2045063):
10
5
    - d/control{,-in}: new package qemu-block-supplemental for drivers
11
6
      we want in Universe
12
7
    - d/rules: we only want block-gluster.so in the new
13
8
      qemu-block-supplemental package. Adjust dynamically-created
14
9
      maintainer scripts for qemu-block-extra and -supplemental.
15
10
16
11
 -- Andreas Hasenack <andreas@canonical.com>  Fri, 02 Feb 2024 14:07:00 -0300
17
12
18
1
qemu (1:8.2.0+ds-4ubuntu1) noble; urgency=medium
13
qemu (1:8.2.0+ds-4ubuntu1) noble; urgency=medium
19
2
14
20
3
  * Merge with Debian unstable (LP: #2048802, #2048776). Remaining changes:
15
  * Merge with Debian unstable (LP: #2048802, #2048776). Remaining changes:
21
diff --git a/debian/control b/debian/control
22
index 9b9fd93..8383fe5 100644
23
--- a/debian/control
24
+++ b/debian/control
25
@@ -197,6 +197,31 @@ Description: extra block backend modules for qemu-system and qemu-utils
26
197
 emulation and qemu-img from qemu-utils package, which are rarely used and
197
 emulation and qemu-img from qemu-utils package, which are rarely used and
27
198
 has extra dependencies.
198
 has extra dependencies.
28
199
199
29
200
Package: qemu-block-supplemental
30
201
# For now, this package only ships glusterfs, which does not build in 32bit architectures
31
202
Architecture: amd64 arm64 ppc64el riscv64 s390x
32
203
Multi-Arch: no
33
204
Depends: ${misc:Depends}, ${shlibs:Depends},
34
205
# qemu-block-extra has the run-qemu.mount unit which we need
35
206
 qemu-block-extra (= ${binary:Version}),
36
207
# we need to ensure qemu-block-supplemental is upgraded with qemu-system-* or qemu-utils
37
208
 qemu-system-any (= ${binary:Version}) [amd64 arm64 armhf ppc64el riscv64 s390x] | qemu-utils (= ${binary:Version}),
38
209
Enhances: qemu-utils, qemu-system-misc,
39
210
 qemu-system-arm, qemu-system-mips, qemu-system-sparc, qemu-system-x86,
40
211
Breaks: qemu-block-extra (<< 1:8.2.0+ds-4ubuntu2~)
41
212
Replaces: qemu-block-extra (<< 1:8.2.0+ds-4ubuntu2)
42
213
Description: supplemental block backend modules for qemu-system and qemu-utils
43
214
 QEMU is a fast processor emulator: currently the package supports Alpha, ARM,
44
215
 CRIS, i386, LoongArch, M68k (ColdFire), MicroBlaze, MIPS, PowerPC, RISC-V,
45
216
 S390x, SH4, SPARC, x86-64, Xtensa and other emulations. By using dynamic
46
217
 translation it achieves reasonable speed while being easy to port on new host
47
218
 CPUs.
48
219
 .
49
220
 This package provides supplemental block device backend modules for qemu-system
50
221
 emulation and qemu-img from qemu-utils package.
51
222
 .
52
223
 Currently, the following module is shipped in this package: block-glusterfs
53
224
54
200
Package: qemu-system-data
225
Package: qemu-system-data
55
201
Architecture: all
226
Architecture: all
56
202
Multi-Arch: foreign
227
Multi-Arch: foreign
57
diff --git a/debian/control-in b/debian/control-in
58
index 201f4bf..f24a39a 100644
59
--- a/debian/control-in
60
+++ b/debian/control-in
61
@@ -202,6 +202,31 @@ Description: extra block backend modules for qemu-system and qemu-utils
62
202
 This package provides extra block device backend modules for qemu-system
202
 This package provides extra block device backend modules for qemu-system
63
203
 emulation and qemu-img from qemu-utils package, which are rarely used and
203
 emulation and qemu-img from qemu-utils package, which are rarely used and
64
204
 has extra dependencies.
204
 has extra dependencies.
65
205
:ubuntu:
66
206
:ubuntu:Package: qemu-block-supplemental
67
207
:ubuntu:# For now, this package only ships glusterfs, which does not build in 32bit architectures
68
208
:ubuntu:Architecture: amd64 arm64 ppc64el riscv64 s390x
69
209
:ubuntu:Multi-Arch: no
70
210
:ubuntu:Depends: ${misc:Depends}, ${shlibs:Depends},
71
211
:ubuntu:# qemu-block-extra has the run-qemu.mount unit which we need
72
212
:ubuntu: qemu-block-extra (= ${binary:Version}),
73
213
:ubuntu:# we need to ensure qemu-block-supplemental is upgraded with qemu-system-* or qemu-utils
74
214
:ubuntu: qemu-system-any (= ${binary:Version}) [amd64 arm64 armhf ppc64el riscv64 s390x] | qemu-utils (= ${binary:Version}),
75
215
:ubuntu:Enhances: qemu-utils, qemu-system-misc,
76
216
:ubuntu: qemu-system-arm, qemu-system-mips, qemu-system-sparc, qemu-system-x86,
77
217
:ubuntu:Breaks: qemu-block-extra (<< 1:8.2.0+ds-4ubuntu2~)
78
218
:ubuntu:Replaces: qemu-block-extra (<< 1:8.2.0+ds-4ubuntu2)
79
219
:ubuntu:Description: supplemental block backend modules for qemu-system and qemu-utils
80
220
:ubuntu: QEMU is a fast processor emulator: currently the package supports Alpha, ARM,
81
221
:ubuntu: CRIS, i386, LoongArch, M68k (ColdFire), MicroBlaze, MIPS, PowerPC, RISC-V,
82
222
:ubuntu: S390x, SH4, SPARC, x86-64, Xtensa and other emulations. By using dynamic
83
223
:ubuntu: translation it achieves reasonable speed while being easy to port on new host
84
224
:ubuntu: CPUs.
85
225
:ubuntu: .
86
226
:ubuntu: This package provides supplemental block device backend modules for qemu-system
87
227
:ubuntu: emulation and qemu-img from qemu-utils package.
88
228
:ubuntu: .
89
229
:ubuntu: Currently, the following module is shipped in this package: block-glusterfs
90
205
230
91
206
Package: qemu-system-data
231
Package: qemu-system-data
92
207
Architecture: all
232
Architecture: all
93
diff --git a/debian/rules b/debian/rules
94
index 38e6b72..485e01f 100755
95
--- a/debian/rules
96
+++ b/debian/rules
97
@@ -69,6 +69,11 @@ enable-user-static = $(if $(filter qemu-user-static,${BUILD_PACKAGES}),y)
98
69
QEMU_XEN = /usr/libexec/xen-qemu-system-i386
69
QEMU_XEN = /usr/libexec/xen-qemu-system-i386
99
70
PKGVERSION = Debian ${DEB_VERSION}
70
PKGVERSION = Debian ${DEB_VERSION}
100
71
SAVEMODDIR = /run/qemu/$(shell echo -n "${PKGVERSION}" | tr --complement '[:alnum:]+-.~' '_')
71
SAVEMODDIR = /run/qemu/$(shell echo -n "${PKGVERSION}" | tr --complement '[:alnum:]+-.~' '_')
101
72
# New Ubuntu package qemu-block-supplemental to hold modules we want in Universe
102
73
# glusterfs is in universe, see LP: #2045063
103
74
# This variable specifies a space-separated list of module filenames
104
75
# If altering this list, please also update the package description in d/control*
105
76
BLOCK_SUPPLEMENTAL_MODULES = block-gluster.so
106
72
sysdataidir = debian/qemu-system-data/usr/share/qemu
77
sysdataidir = debian/qemu-system-data/usr/share/qemu
107
73
libdir = /usr/lib/${DEB_HOST_MULTIARCH}
78
libdir = /usr/lib/${DEB_HOST_MULTIARCH}
108
74
FIRMWAREPATH = /usr/share/qemu:/usr/share/seabios:/usr/lib/ipxe/qemu
79
FIRMWAREPATH = /usr/share/qemu:/usr/share/seabios:/usr/lib/ipxe/qemu
109
@@ -281,12 +286,19 @@ endif # ubuntu
110
281
# save block-extra loadable modules on upgrades
286
# save block-extra loadable modules on upgrades
111
282
# other module types for now (5.0) can't be loaded at runtime, only at startup
287
# other module types for now (5.0) can't be loaded at runtime, only at startup
112
283
# the maintscript fragments include version string so we have to generate them
288
# the maintscript fragments include version string so we have to generate them
114
284
	echo 'case $$1 in (upgrade|deconfigure) [ -d /run/qemu ] || exit 0; ! findmnt --noheadings --target /run/qemu/ | grep -q noexec || exit 0; mkdir -p ${SAVEMODDIR}; cp -p ${libdir}/qemu/block-*.so ${SAVEMODDIR}/;; esac' \
289
	echo 'case $$1 in (upgrade|deconfigure) [ -d /run/qemu ] || exit 0; ! findmnt --noheadings --target /run/qemu/ | grep -q noexec || exit 0; mkdir -p ${SAVEMODDIR}; for m in ${libdir}/qemu/block-*.so; do if echo "${BLOCK_SUPPLEMENTAL_MODULES}" | grep -qF `basename "$$m"`; then continue; else cp -p $$m ${SAVEMODDIR}/; fi;  done;; esac' \
115
285
	  >> debian/qemu-block-extra.prerm.debhelper
290
	  >> debian/qemu-block-extra.prerm.debhelper
117
286
	echo 'case $$1 in (remove) rm -f ${SAVEMODDIR}/block-*.so;; esac' \
291
	echo 'case $$1 in (remove) for m in ${libdir}/qemu/block-*.so; do if echo "${BLOCK_SUPPLEMENTAL_MODULES}" | grep -qF `basename "$$m"`; then continue; else rm -f ${SAVEMODDIR}/`basename $$m`; fi; done;; esac' \
118
287
	  >> debian/qemu-block-extra.postrm.debhelper
292
	  >> debian/qemu-block-extra.postrm.debhelper
119
288
	echo 'case $$1 in (purge) if systemctl is-active -q run-qemu.mount; then systemctl stop run-qemu.mount || true; fi; rm -rf "/run/qemu";; esac' \
293
	echo 'case $$1 in (purge) if systemctl is-active -q run-qemu.mount; then systemctl stop run-qemu.mount || true; fi; rm -rf "/run/qemu";; esac' \
120
289
	  >> debian/qemu-block-extra.postrm.debhelper
294
	  >> debian/qemu-block-extra.postrm.debhelper
121
295
# do mostly the same for qemu-block-supplemental
122
296
ifneq (,$(filter qemu-block-supplemental,${BUILD_PACKAGES}))
123
297
	echo 'case $$1 in (upgrade|deconfigure) [ -d /run/qemu ] || exit 0; ! findmnt --noheadings --target /run/qemu/ | grep -q noexec || exit 0; mkdir -p ${SAVEMODDIR}; for m in ${BLOCK_SUPPLEMENTAL_MODULES}; do cp -p ${libdir}/qemu/$$m ${SAVEMODDIR}/; done;; esac' \
124
298
	  >> debian/qemu-block-supplemental.prerm.debhelper
125
299
	echo 'case $$1 in (remove) for m in ${BLOCK_SUPPLEMENTAL_MODULES}; do rm -f ${SAVEMODDIR}/$$m; done;; esac' \
126
300
	  >> debian/qemu-block-supplemental.postrm.debhelper
127
301
endif
128
290
302
129
291
endif # linux
303
endif # linux
130
292
304
131
@@ -494,6 +506,14 @@ pre-install-arch:
132
494
	dh_installdirs -a
506
	dh_installdirs -a
133
495
install-arch: pre-install-arch $(addprefix install-, ${qemu-builds})
507
install-arch: pre-install-arch $(addprefix install-, ${qemu-builds})
134
496
	dh_install -a
508
	dh_install -a
135
509
ifneq (,$(filter qemu-block-supplemental,${BUILD_PACKAGES}))
136
510
	# block-gluster.so should only be in qemu-block-supplemental, if it's built (it doesn't build on 32bit architectures)
137
511
	dh_installdirs -p qemu-block-supplemental usr/lib/${DEB_HOST_MULTIARCH}/qemu
138
512
	for m in ${BLOCK_SUPPLEMENTAL_MODULES}; do mv debian/qemu-block-extra/usr/lib/${DEB_HOST_MULTIARCH}/qemu/$$m debian/qemu-block-supplemental/usr/lib/${DEB_HOST_MULTIARCH}/qemu/; done
139
513
	# This also introduces a "Depends: qemu-block-extra" to qemu-block-supplemental, which
140
514
	# we want also because of the run-qemu.mount unit shipped there.
141
515
	dh_installdocs -p qemu-block-supplemental --link-doc=qemu-block-extra
142
516
endif
143
497
	dh_missing -a
517
	dh_missing -a
144
498
	dh_installdocs -a
518
	dh_installdocs -a
145
499
	dh_installchangelogs -a
519
	dh_installchangelogs -a
Reviewer	Date Requested	Status
git-ubuntu bot		Approve on 2024-02-07
Sergio Durigan Junior (community)	2024-02-02	Approve on 2024-02-06
Canonical Server Reporter	2024-02-02	Pending
Review via email: mp+459962@code.launchpad.net