Merge ~paelzer/ubuntu/+source/qemu:fix-module-handling-lp-1905377-hirsute into ubuntu/+source/qemu:ubuntu/hirsute-devel

Proposed by Christian Ehrhardt 
Status: Merged
Approved by: Christian Ehrhardt 
Approved revision: 20cf66a984b07c9ed4faf264ccc8ead5b9494a26
Merge reported by: Christian Ehrhardt 
Merged at revision: 20cf66a984b07c9ed4faf264ccc8ead5b9494a26
Proposed branch: ~paelzer/ubuntu/+source/qemu:fix-module-handling-lp-1905377-hirsute
Merge into: ubuntu/+source/qemu:ubuntu/hirsute-devel
Diff against target: 257 lines (+12/-56)
3 files modified
debian/changelog (+12/-0)
debian/rules (+0/-10)
dev/null (+0/-46)
Reviewer Review Type Date Requested Status
Paride Legovini (community) Approve
Canonical Server Team Pending
Canonical Server packageset reviewers Pending
Ubuntu Server Dev import team Pending
Review via email: mp+394453@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Paride Legovini (paride) wrote :

LGTM and verified that the package from the PPA fixes the issue.
Nice to see delta go away due to upstreaming effort!

review: Approve
Revision history for this message
Paride Legovini (paride) wrote :

Re-approval after renewing ~canonical-server-packageset-reviewers membership.

review: Approve
Revision history for this message
Paride Legovini (paride) :
review: Approve
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

Ah and to document it, UI can't be late loaded. Therefore the maintscript action now only is done on qemu-block-*:

To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/qemu
 * [new tag] upload/1%5.1+dfsg-4ubuntu2 -> upload/1%5.1+dfsg-4ubuntu2

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading qemu_5.1+dfsg-4ubuntu2.dsc: done.
  Uploading qemu_5.1+dfsg-4ubuntu2.debian.tar.xz: done.
  Uploading qemu_5.1+dfsg-4ubuntu2_source.buildinfo: done.
  Uploading qemu_5.1+dfsg-4ubuntu2_source.changes: done.
Successfully uploaded packages.

Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 3190cb0..20ecbca 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,15 @@
6+qemu (1:5.1+dfsg-4ubuntu2) hirsute; urgency=medium
7+
8+ * Fix upgrade module handling (LP: #1905377)
9+ This was accetped in a slightly different form in qemu_5.0-6 and therefore
10+ allows to drop some former delta that is now conflicting.
11+ Ubuntu still keeps enabling --enable-module-upgrades, but only for
12+ qemu-xen which doesn't exist in Debian
13+ - Drop d/qemu-block-extra.*.in, d/qemu-system-gui.*.in
14+ - d/rules: Drop generating package version into maintainer scripts
15+
16+ -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Tue, 24 Nov 2020 11:16:01 +0100
17+
18 qemu (1:5.1+dfsg-4ubuntu1) hirsute; urgency=medium
19
20 * Merge with Debian testing, remaining changes:
21diff --git a/debian/qemu-block-extra.postrm.in b/debian/qemu-block-extra.postrm.in
22deleted file mode 100644
23index 5c3d73e..0000000
24--- a/debian/qemu-block-extra.postrm.in
25+++ /dev/null
26@@ -1,43 +0,0 @@
27-#!/bin/sh
28-# postrm script for qemu-block-extra
29-#
30-# see: dh_installdeb(1)
31-
32-set -e
33-
34-# summary of how this script can be called:
35-# * <postrm> `remove'
36-# * <postrm> `purge'
37-# * <old-postrm> `upgrade' <new-version>
38-# * <new-postrm> `failed-upgrade' <old-version>
39-# * <new-postrm> `abort-install'
40-# * <new-postrm> `abort-install' <old-version>
41-# * <new-postrm> `abort-upgrade' <old-version>
42-# * <disappearer's-postrm> `disappear' <overwriter>
43-# <overwriter-version>
44-# for details, see https://www.debian.org/doc/debian-policy/ or
45-# the debian-policy package
46-
47-
48-case "$1" in
49- purge|remove)
50- # remove .so files for still running qemu instances in /var/run
51- # for details see bug LP: #1847361
52- rm -f /var/run/qemu/@PKGVERSION@/block-*.so
53- ;;
54-
55- upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
56- ;;
57-
58- *)
59- echo "postrm called with unknown argument \`$1'" >&2
60- exit 1
61- ;;
62-esac
63-
64-# dh_installdeb will replace this with shell code automatically
65-# generated by other debhelper scripts.
66-
67-#DEBHELPER#
68-
69-exit 0
70diff --git a/debian/qemu-block-extra.prerm.in b/debian/qemu-block-extra.prerm.in
71deleted file mode 100644
72index dee25a8..0000000
73--- a/debian/qemu-block-extra.prerm.in
74+++ /dev/null
75@@ -1,45 +0,0 @@
76-#!/bin/sh
77-# prerm script for qemu-block-extra
78-#
79-# see: dh_installdeb(1)
80-
81-set -e
82-
83-# summary of how this script can be called:
84-# * <prerm> `remove'
85-# * <old-prerm> `upgrade' <new-version>
86-# * <new-prerm> `failed-upgrade' <old-version>
87-# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
88-# * <deconfigured's-prerm> `deconfigure' `in-favour'
89-# <package-being-installed> <version> `removing'
90-# <conflicting-package> <version>
91-# for details, see https://www.debian.org/doc/debian-policy/ or
92-# the debian-policy package
93-
94-
95-case "$1" in
96- remove)
97- ;;
98-
99- upgrade|deconfigure)
100- # retain .so files for still running qemu instances in /var/run
101- # for details see bug LP: #1847361
102- mkdir -p /var/run/qemu/@PKGVERSION@
103- cp /usr/lib/@ARCH@/qemu/block-*.so /var/run/qemu/@PKGVERSION@/
104- ;;
105-
106- failed-upgrade)
107- ;;
108-
109- *)
110- echo "prerm called with unknown argument \`$1'" >&2
111- exit 1
112- ;;
113-esac
114-
115-# dh_installdeb will replace this with shell code automatically
116-# generated by other debhelper scripts.
117-
118-#DEBHELPER#
119-
120-exit 0
121diff --git a/debian/qemu-system-gui.postrm.in b/debian/qemu-system-gui.postrm.in
122deleted file mode 100644
123index f67d414..0000000
124--- a/debian/qemu-system-gui.postrm.in
125+++ /dev/null
126@@ -1,44 +0,0 @@
127-#!/bin/sh
128-# postrm script for qemu-system-gui
129-#
130-# see: dh_installdeb(1)
131-
132-set -e
133-
134-# summary of how this script can be called:
135-# * <postrm> `remove'
136-# * <postrm> `purge'
137-# * <old-postrm> `upgrade' <new-version>
138-# * <new-postrm> `failed-upgrade' <old-version>
139-# * <new-postrm> `abort-install'
140-# * <new-postrm> `abort-install' <old-version>
141-# * <new-postrm> `abort-upgrade' <old-version>
142-# * <disappearer's-postrm> `disappear' <overwriter>
143-# <overwriter-version>
144-# for details, see https://www.debian.org/doc/debian-policy/ or
145-# the debian-policy package
146-
147-
148-case "$1" in
149- purge|remove)
150- # remove .so files for still running qemu instances in /var/run
151- # for details see bug LP: #1847361
152- rm -f /var/run/qemu/@PKGVERSION@/ui-gtk.so
153- rm -f /var/run/qemu/@PKGVERSION@/audio-*.so
154- ;;
155-
156- upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
157- ;;
158-
159- *)
160- echo "postrm called with unknown argument \`$1'" >&2
161- exit 1
162- ;;
163-esac
164-
165-# dh_installdeb will replace this with shell code automatically
166-# generated by other debhelper scripts.
167-
168-#DEBHELPER#
169-
170-exit 0
171diff --git a/debian/qemu-system-gui.prerm.in b/debian/qemu-system-gui.prerm.in
172deleted file mode 100644
173index 3624362..0000000
174--- a/debian/qemu-system-gui.prerm.in
175+++ /dev/null
176@@ -1,46 +0,0 @@
177-#!/bin/sh
178-# prerm script for qemu-system-gui
179-#
180-# see: dh_installdeb(1)
181-
182-set -e
183-
184-# summary of how this script can be called:
185-# * <prerm> `remove'
186-# * <old-prerm> `upgrade' <new-version>
187-# * <new-prerm> `failed-upgrade' <old-version>
188-# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
189-# * <deconfigured's-prerm> `deconfigure' `in-favour'
190-# <package-being-installed> <version> `removing'
191-# <conflicting-package> <version>
192-# for details, see https://www.debian.org/doc/debian-policy/ or
193-# the debian-policy package
194-
195-
196-case "$1" in
197- remove)
198- ;;
199-
200- upgrade|deconfigure)
201- # retain .so files for still running qemu instances in /var/run
202- # for details see bug LP: #1847361
203- mkdir -p /var/run/qemu/@PKGVERSION@
204- cp /usr/lib/@ARCH@/qemu/ui-gtk.so /var/run/qemu/@PKGVERSION@/
205- cp /usr/lib/@ARCH@/qemu/audio-*.so /var/run/qemu/@PKGVERSION@/
206- ;;
207-
208- failed-upgrade)
209- ;;
210-
211- *)
212- echo "prerm called with unknown argument \`$1'" >&2
213- exit 1
214- ;;
215-esac
216-
217-# dh_installdeb will replace this with shell code automatically
218-# generated by other debhelper scripts.
219-
220-#DEBHELPER#
221-
222-exit 0
223diff --git a/debian/rules b/debian/rules
224index f5a6f65..aeee336 100755
225--- a/debian/rules
226+++ b/debian/rules
227@@ -22,9 +22,6 @@ else
228 VENDOR := DEBIAN
229 endif
230
231-AUTOGENERATED:= qemu-block-extra.prerm qemu-block-extra.postrm qemu-system-gui.prerm qemu-system-gui.postrm
232-PKGVERSION := $(shell printf "Debian ${DEB_VERSION}" | tr --complement '[:alnum:]+-.~' '_')
233-
234 # support parallel build using DEB_BUILD_OPTIONS=parallel=N
235 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
236 MAKEFLAGS += -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
237@@ -130,12 +127,6 @@ endif
238 b/configure-stamp: configure
239 dh_testdir
240
241- for f in ${AUTOGENERATED} ; do \
242- sed -e 's%@ARCH@%${DEB_HOST_MULTIARCH}%g' \
243- -e 's%@PKGVERSION@%${PKGVERSION}%g' \
244- < debian/$$f.in > debian/$$f ; \
245- done
246-
247 # system build
248 rm -rf b/qemu; mkdir -p b/qemu
249 cd b/qemu && \
250@@ -620,7 +611,6 @@ clean: debian/control
251 rm -rf b
252 find scripts/ -name '*.pyc' -delete || :
253 rm -f debian/qemu-user.1
254- rm -f $(patsubst %, debian/%, ${AUTOGENERATED})
255 dh_clean
256
257 .PHONY: build clean binary-arch binary-indep binary build-arch build-indep build

Subscribers

People subscribed via source and target branches