Merge ~rafaeldtinoco/ubuntu/+source/sg3-utils:lp1833618-disco into ubuntu/+source/sg3-utils:ubuntu/disco-devel
Status: | Merged |
---|---|
Approved by: | Christian Ehrhardt on 2019-10-23 |
Approved revision: | 78092a6a38994f2dd17bcd21b1bc1892302e33d2 |
Merged at revision: | 78092a6a38994f2dd17bcd21b1bc1892302e33d2 |
Proposed branch: | ~rafaeldtinoco/ubuntu/+source/sg3-utils:lp1833618-disco |
Merge into: | ubuntu/+source/sg3-utils:ubuntu/disco-devel |
Diff against target: |
156 lines (+130/-0) 4 files modified
debian/changelog (+8/-0) debian/patches/55-scsi-sg3_id.rules-ID_SERIAL-fix.patch (+85/-0) debian/patches/new-location-for-major-and-minor.patch (+35/-0) debian/patches/series (+2/-0) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Rafael David Tinoco (community) | Approve on 2019-10-22 | ||
Christian Ehrhardt | 2019-10-01 | Approve on 2019-10-15 | |
Ryan Harper | 2019-10-11 | Pending | |
Canonical Server Team | 2019-10-09 | Pending | |
Review via email:
|
Rafael David Tinoco (rafaeldtinoco) wrote : | # |
I'll wait for feedback in bug:
https:/
Before asking for this to be sponsored (fyio).
Christian Ehrhardt (paelzer) wrote : | # |
The patch looks correctly ported form upstream (the needed snippet applies as-is), I'll leave the effect it has on the system to Ryan's review who is deeper into the tech side of this case already.
Minor fixups needed, therefore "Need Fixing"
Christian Ehrhardt (paelzer) wrote : | # |
Minor comments on the FTBFS fixes as well
Christian Ehrhardt (paelzer) wrote : | # |
Other than the stated patches LGTM, as I said functionally we might wait for Ryan to comment.
You might cleanup the style issue until then to be ready to upload.
Rafael David Tinoco (rafaeldtinoco) wrote : | # |
Fixed, re-pushing.
Christian Ehrhardt (paelzer) wrote : | # |
LGTM now, thanks for the fixups.
One nit pick inline, just to bother you :-)
Rafael David Tinoco (rafaeldtinoco) wrote : | # |
Okay so based on the 2 approvals, including:
I'll go on with this fix.
Rafael David Tinoco (rafaeldtinoco) wrote : | # |
> I'll go on with this fix.
Christian, would you mind uploading this for me ? sg3-utils needs core-dev!
Thanks a lot!
PS: next one is the Bionic SRU (that will fix that original MAAS case).
Christian Ehrhardt (paelzer) wrote : | # |
I've checked the other MPs comments.
Marking as approved and sponsoring as requested.
Christian Ehrhardt (paelzer) wrote : | # |
Umm - only now I see a bad version number.
I either missed it on the initial review or it wasn't there back then.
Anyway - let me explain and fix it up on upload:
1.42-2ubuntu2~
First of all "double ~" seems wrong and ~ means "before what is in front"
This is disco, so 19.04, which means before the 19.04 - that seems odd.
Current versions:
sg3-utils | 1.42-2ubuntu1 | bionic | source, amd64, arm64, armhf, i386, ppc64el, s390x
sg3-utils | 1.42-2ubuntu1 | disco | source, amd64, arm64, armhf, i386, ppc64el, s390x
sg3-utils | 1.44-1ubuntu1 | eoan | source, amd64, arm64, armhf, i386, ppc64el, s390x
sg3-utils | 1.44-1ubuntu1 | focal | source, amd64, arm64, armhf, i386, ppc64el, s390x
E+F are fixe. So we need new versions vor B+D and since they are the same now we need the release in the version - so far so good.
But that would usually be:
B: 1.42-2ubuntu1.
D: 1.42-2ubuntu1.
See https:/
Christian Ehrhardt (paelzer) wrote : | # |
$ git push pkg upload/
Enumerating objects: 26, done.
Counting objects: 100% (26/26), done.
Delta compression using up to 4 threads
Compressing objects: 100% (21/21), done.
Writing objects: 100% (21/21), 5.25 KiB | 1.31 MiB/s, done.
Total 21 (delta 11), reused 0 (delta 0)
To ssh://git.
* [new tag] upload/
$ dput ubuntu ../sg3-
Checking signature on .changes
gpg: ../sg3-
Checking signature on .dsc
gpg: ../sg3-
Uploading to ubuntu (via ftp to upload.ubuntu.com):
Uploading sg3-utils_
Uploading sg3-utils_
Uploading sg3-utils_
Uploading sg3-utils_
Successfully uploaded packages.
Now in the SRU Teams queue
https:/ /bugs.launchpad .net/curtin/ +bug/1833618/ comments/ 45:
I have to re-submit Disco MR and a new PPA package, as the compiler in Disco is likely more recent and treating lots of "new warnings" as errors (-Wimplicit- fallthrough, etc...). I'll do it tomorrow!