Merge ~paelzer/ubuntu/+source/qemu:merge-5.1-4-HIRSUTE into ubuntu/+source/qemu:debian/sid

Proposed by Christian Ehrhardt 
Status: Merged
Approved by: Christian Ehrhardt 
Approved revision: cbfb1102b8803c608139c2b175079e03a0020dfc
Merge reported by: Christian Ehrhardt 
Merged at revision: 7c8901a7dcec6cd6bd58bc05e4a057eea9d357d6
Proposed branch: ~paelzer/ubuntu/+source/qemu:merge-5.1-4-HIRSUTE
Merge into: ubuntu/+source/qemu:debian/sid
Diff against target: 6297 lines (+5622/-29)
18 files modified
debian/changelog (+4098/-3)
debian/control (+90/-17)
debian/control-in (+59/-8)
debian/patches/series (+5/-0)
debian/patches/ubuntu/define-ubuntu-machine-types.patch (+784/-0)
debian/patches/ubuntu/enable-svm-by-default.patch (+34/-0)
debian/patches/ubuntu/pre-bionic-256k-ipxe-efi-roms.patch (+62/-0)
debian/qemu-block-extra.postrm.in (+43/-0)
debian/qemu-block-extra.prerm.in (+45/-0)
debian/qemu-kvm-init (+89/-0)
debian/qemu-system-common.install (+1/-0)
debian/qemu-system-common.qemu-kvm.default (+8/-0)
debian/qemu-system-common.qemu-kvm.service (+16/-0)
debian/qemu-system-gui.postrm.in (+44/-0)
debian/qemu-system-gui.prerm.in (+46/-0)
debian/qemu-system-x86.NEWS (+80/-0)
debian/qemu-system-x86.README.Debian (+47/-0)
debian/rules (+71/-1)
Reviewer Review Type Date Requested Status
Lucas Kanashiro (community) Approve
Canonical Server Pending
Canonical Server packageset reviewers Pending
Review via email: mp+393044@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

PPA: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/4321/+packages

So far this is "drop a lot + carry the rest + usual updates", not much more.
But then testing has only started ... we will see how much happens until we consider this ready.

Never the less I'd appreciate a review on the current state so that we can handle any later changes (which in comparison are small then) much faster.

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

Almost forgot, I also have pushed tag:5.0-5ubuntu9-logical to help to compare the merge.

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

Summary:
I started with 85 patches after split, 71 without changelog and finally
64 after squashing
I also marked changes that are expected to drop (in commit message)
and expect 47 to be dropped.

Things work fine so far, I'll now merge libvirt alongside it to test them together.
As mentioned reviewing this already would be awesome.

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

FYI - the armhf build issue is discussed in bug 1890435 and shall not bother this for now.

Revision history for this message
Lucas Kanashiro (lucaskanashiro) wrote :

I am grabbing this MP for review.

Revision history for this message
Lucas Kanashiro (lucaskanashiro) wrote :

* Changelog:
  - [x] old content and logical tag match as expected
  - [√] changelog entry correct version and targeted codename
  - [√] changelog entries correct
  - [√] update-maintainer has been run

* Actual changes:
  - [√] no upstream changes to consider
  - [√] no further upstream version to consider
  - [√] debian changes look safe

* Old Delta:
  - [√] dropped changes are ok to be dropped
  - [√] nothing else to drop
  - [√] changes forwarded upstream/debian (if appropriate)

* New Delta:
  - [√] no new patches added
  - [-] patches match what was proposed upstream
  - [-] patches correctly included in debian/patches/series
  - [-] patches have correct DEP3 metadata

* Build/Test:
  - [√] build is ok
  - [√] verified PPA package installs/uninstalls
  - [-] autopkgtest against the PPA package passes
  - [√] sanity checks test fine

In short, LGTM, +1.

This is the first time I am reviewing a qemu MP (quite interesting, learned some packaging tricks along the way) so forgive me if I am missing anything.

A good portion of the delta was dropped either because they were applied upstream or Debian, that's great! I have just a single question about one piece of the current delta: the "improved dependencies" changes, were they proposed to Debian at some point? They do not seem strictly related to Ubuntu. If it was (maybe via a bug report? or salsa MP?) a link to it would be good IMHO.

I also think you forgot to push the git-ubuntu tags (those tags in the git repo under your namespace are outdated), however, I was able to follow the changes.

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

Thanks for your review Lucas.

There are two kinds of dependency deltas.
One set is for packages in universe and that doesn't bother Debian.
The other set - and that is probably the one you asked for - is related to the default installed block backends. That was discussed with Debian but they have a much less Openstack centric use case in mind and therefore didn't want that (maybe 3 years ago).
Unfortunately I haven't found a good bug/link to share. But I'll add a comment to the commit to help reviewers next time.

Tags, well better late than never.
5.0-5ubuntu9-logical (was there)
5.0-5ubuntu9-new-v1
5.0-5ubuntu9-orig
5.0-5ubuntu9-split

Unfortunately due to git-ubutu errors the imports and due to tat to some extend the usual workflow didn't work (and won't until we can handle .git dirs). But I should maybe have used a more common name scheme - my bad.

Thanks for the review.
The tests are still blocked by bug 1902540, but other than that we seem to be ready.

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

Pushed updates to the merge related to minor uploads that happened while this was in flight (no need to re-review).

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

After debugging with Doko for weeks, we need to makr armhf to compile with gcc-9 for now due to bug 1890435.

That was done and all tests now passed.

One remaining issue in bug 1904584 that will be tracked separately.

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

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

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

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches