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 Pending
Canonical Server packageset reviewers Pending
git-ubuntu developers 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
diff --git a/debian/changelog b/debian/changelog
index 3190cb0..20ecbca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
1qemu (1:5.1+dfsg-4ubuntu2) hirsute; urgency=medium
2
3 * Fix upgrade module handling (LP: #1905377)
4 This was accetped in a slightly different form in qemu_5.0-6 and therefore
5 allows to drop some former delta that is now conflicting.
6 Ubuntu still keeps enabling --enable-module-upgrades, but only for
7 qemu-xen which doesn't exist in Debian
8 - Drop d/qemu-block-extra.*.in, d/qemu-system-gui.*.in
9 - d/rules: Drop generating package version into maintainer scripts
10
11 -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Tue, 24 Nov 2020 11:16:01 +0100
12
1qemu (1:5.1+dfsg-4ubuntu1) hirsute; urgency=medium13qemu (1:5.1+dfsg-4ubuntu1) hirsute; urgency=medium
214
3 * Merge with Debian testing, remaining changes:15 * Merge with Debian testing, remaining changes:
diff --git a/debian/qemu-block-extra.postrm.in b/debian/qemu-block-extra.postrm.in
4deleted file mode 10064416deleted file mode 100644
index 5c3d73e..0000000
--- a/debian/qemu-block-extra.postrm.in
+++ /dev/null
@@ -1,43 +0,0 @@
1#!/bin/sh
2# postrm script for qemu-block-extra
3#
4# see: dh_installdeb(1)
5
6set -e
7
8# summary of how this script can be called:
9# * <postrm> `remove'
10# * <postrm> `purge'
11# * <old-postrm> `upgrade' <new-version>
12# * <new-postrm> `failed-upgrade' <old-version>
13# * <new-postrm> `abort-install'
14# * <new-postrm> `abort-install' <old-version>
15# * <new-postrm> `abort-upgrade' <old-version>
16# * <disappearer's-postrm> `disappear' <overwriter>
17# <overwriter-version>
18# for details, see https://www.debian.org/doc/debian-policy/ or
19# the debian-policy package
20
21
22case "$1" in
23 purge|remove)
24 # remove .so files for still running qemu instances in /var/run
25 # for details see bug LP: #1847361
26 rm -f /var/run/qemu/@PKGVERSION@/block-*.so
27 ;;
28
29 upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
30 ;;
31
32 *)
33 echo "postrm called with unknown argument \`$1'" >&2
34 exit 1
35 ;;
36esac
37
38# dh_installdeb will replace this with shell code automatically
39# generated by other debhelper scripts.
40
41#DEBHELPER#
42
43exit 0
diff --git a/debian/qemu-block-extra.prerm.in b/debian/qemu-block-extra.prerm.in
44deleted file mode 1006440deleted file mode 100644
index dee25a8..0000000
--- a/debian/qemu-block-extra.prerm.in
+++ /dev/null
@@ -1,45 +0,0 @@
1#!/bin/sh
2# prerm script for qemu-block-extra
3#
4# see: dh_installdeb(1)
5
6set -e
7
8# summary of how this script can be called:
9# * <prerm> `remove'
10# * <old-prerm> `upgrade' <new-version>
11# * <new-prerm> `failed-upgrade' <old-version>
12# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
13# * <deconfigured's-prerm> `deconfigure' `in-favour'
14# <package-being-installed> <version> `removing'
15# <conflicting-package> <version>
16# for details, see https://www.debian.org/doc/debian-policy/ or
17# the debian-policy package
18
19
20case "$1" in
21 remove)
22 ;;
23
24 upgrade|deconfigure)
25 # retain .so files for still running qemu instances in /var/run
26 # for details see bug LP: #1847361
27 mkdir -p /var/run/qemu/@PKGVERSION@
28 cp /usr/lib/@ARCH@/qemu/block-*.so /var/run/qemu/@PKGVERSION@/
29 ;;
30
31 failed-upgrade)
32 ;;
33
34 *)
35 echo "prerm called with unknown argument \`$1'" >&2
36 exit 1
37 ;;
38esac
39
40# dh_installdeb will replace this with shell code automatically
41# generated by other debhelper scripts.
42
43#DEBHELPER#
44
45exit 0
diff --git a/debian/qemu-system-gui.postrm.in b/debian/qemu-system-gui.postrm.in
46deleted file mode 1006440deleted file mode 100644
index f67d414..0000000
--- a/debian/qemu-system-gui.postrm.in
+++ /dev/null
@@ -1,44 +0,0 @@
1#!/bin/sh
2# postrm script for qemu-system-gui
3#
4# see: dh_installdeb(1)
5
6set -e
7
8# summary of how this script can be called:
9# * <postrm> `remove'
10# * <postrm> `purge'
11# * <old-postrm> `upgrade' <new-version>
12# * <new-postrm> `failed-upgrade' <old-version>
13# * <new-postrm> `abort-install'
14# * <new-postrm> `abort-install' <old-version>
15# * <new-postrm> `abort-upgrade' <old-version>
16# * <disappearer's-postrm> `disappear' <overwriter>
17# <overwriter-version>
18# for details, see https://www.debian.org/doc/debian-policy/ or
19# the debian-policy package
20
21
22case "$1" in
23 purge|remove)
24 # remove .so files for still running qemu instances in /var/run
25 # for details see bug LP: #1847361
26 rm -f /var/run/qemu/@PKGVERSION@/ui-gtk.so
27 rm -f /var/run/qemu/@PKGVERSION@/audio-*.so
28 ;;
29
30 upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
31 ;;
32
33 *)
34 echo "postrm called with unknown argument \`$1'" >&2
35 exit 1
36 ;;
37esac
38
39# dh_installdeb will replace this with shell code automatically
40# generated by other debhelper scripts.
41
42#DEBHELPER#
43
44exit 0
diff --git a/debian/qemu-system-gui.prerm.in b/debian/qemu-system-gui.prerm.in
45deleted file mode 1006440deleted file mode 100644
index 3624362..0000000
--- a/debian/qemu-system-gui.prerm.in
+++ /dev/null
@@ -1,46 +0,0 @@
1#!/bin/sh
2# prerm script for qemu-system-gui
3#
4# see: dh_installdeb(1)
5
6set -e
7
8# summary of how this script can be called:
9# * <prerm> `remove'
10# * <old-prerm> `upgrade' <new-version>
11# * <new-prerm> `failed-upgrade' <old-version>
12# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
13# * <deconfigured's-prerm> `deconfigure' `in-favour'
14# <package-being-installed> <version> `removing'
15# <conflicting-package> <version>
16# for details, see https://www.debian.org/doc/debian-policy/ or
17# the debian-policy package
18
19
20case "$1" in
21 remove)
22 ;;
23
24 upgrade|deconfigure)
25 # retain .so files for still running qemu instances in /var/run
26 # for details see bug LP: #1847361
27 mkdir -p /var/run/qemu/@PKGVERSION@
28 cp /usr/lib/@ARCH@/qemu/ui-gtk.so /var/run/qemu/@PKGVERSION@/
29 cp /usr/lib/@ARCH@/qemu/audio-*.so /var/run/qemu/@PKGVERSION@/
30 ;;
31
32 failed-upgrade)
33 ;;
34
35 *)
36 echo "prerm called with unknown argument \`$1'" >&2
37 exit 1
38 ;;
39esac
40
41# dh_installdeb will replace this with shell code automatically
42# generated by other debhelper scripts.
43
44#DEBHELPER#
45
46exit 0
diff --git a/debian/rules b/debian/rules
index f5a6f65..aeee336 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,9 +22,6 @@ else
22VENDOR := DEBIAN22VENDOR := DEBIAN
23endif23endif
2424
25AUTOGENERATED:= qemu-block-extra.prerm qemu-block-extra.postrm qemu-system-gui.prerm qemu-system-gui.postrm
26PKGVERSION := $(shell printf "Debian ${DEB_VERSION}" | tr --complement '[:alnum:]+-.~' '_')
27
28# support parallel build using DEB_BUILD_OPTIONS=parallel=N25# support parallel build using DEB_BUILD_OPTIONS=parallel=N
29ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))26ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
30 MAKEFLAGS += -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))27 MAKEFLAGS += -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
@@ -130,12 +127,6 @@ endif
130b/configure-stamp: configure127b/configure-stamp: configure
131 dh_testdir128 dh_testdir
132129
133 for f in ${AUTOGENERATED} ; do \
134 sed -e 's%@ARCH@%${DEB_HOST_MULTIARCH}%g' \
135 -e 's%@PKGVERSION@%${PKGVERSION}%g' \
136 < debian/$$f.in > debian/$$f ; \
137 done
138
139 # system build130 # system build
140 rm -rf b/qemu; mkdir -p b/qemu131 rm -rf b/qemu; mkdir -p b/qemu
141 cd b/qemu && \132 cd b/qemu && \
@@ -620,7 +611,6 @@ clean: debian/control
620 rm -rf b611 rm -rf b
621 find scripts/ -name '*.pyc' -delete || :612 find scripts/ -name '*.pyc' -delete || :
622 rm -f debian/qemu-user.1613 rm -f debian/qemu-user.1
623 rm -f $(patsubst %, debian/%, ${AUTOGENERATED})
624 dh_clean614 dh_clean
625615
626.PHONY: build clean binary-arch binary-indep binary build-arch build-indep build616.PHONY: build clean binary-arch binary-indep binary build-arch build-indep build

Subscribers

People subscribed via source and target branches