Merge ~bladernr/plainbox-provider-certification-server/+git/packaging:1968097-packaging-22.04-updates into ~checkbox-dev/plainbox-provider-certification-server/+git/packaging:master

Proposed by Jeff Lane 
Status: Merged
Approved by: Jeff Lane 
Approved revision: c9ce43bc3e8b93c106eca9e89e1b04c927e4e32a
Merged at revision: bf8795c4ca8874862d9848271f529fbfeb904e96
Proposed branch: ~bladernr/plainbox-provider-certification-server/+git/packaging:1968097-packaging-22.04-updates
Merge into: ~checkbox-dev/plainbox-provider-certification-server/+git/packaging:master
Diff against target: 25 lines (+1/-19)
1 file modified
debian/canonical-certification-server.install (+1/-19)
Reviewer Review Type Date Requested Status
Rod Smith Approve
Review via email: mp+418763@code.launchpad.net

Commit message

Update packaging for 22.04

Description of the change

Update packaging for 22.04. I'm not sure if this will actually work though, so if not, reject and I'll do it the long way.

To post a comment you must log in.
Revision history for this message
Jeff Lane  (bladernr) wrote :

So interestingly, I had to explicitly tell it to install debian/tmp/usr/bin as well, but that seems to now work:

bladernr@galactica:~/development$ dpkg-deb --contents canonical-certification-server_0.56.0-1_all.deb
drwxr-xr-x root/root 0 2021-11-22 05:18 ./
drwxr-xr-x root/root 0 2021-11-22 05:18 ./usr/
drwxr-xr-x root/root 0 2021-11-22 05:18 ./usr/bin/
-rwxr-xr-x root/root 379 2020-04-24 16:01 ./usr/bin/certify-18.04
-rwxr-xr-x root/root 379 2020-04-24 16:01 ./usr/bin/certify-20.04
-rwxr-xr-x root/root 379 2021-11-22 05:18 ./usr/bin/certify-22.04
-rwxr-xr-x root/root 383 2018-03-28 13:49 ./usr/bin/certify-soc-18.04
-rwxr-xr-x root/root 383 2020-04-20 16:10 ./usr/bin/certify-soc-20.04
-rwxr-xr-x root/root 383 2021-11-22 05:18 ./usr/bin/certify-soc-22.04
-rwxr-xr-x root/root 388 2018-03-28 13:49 ./usr/bin/certify-vm-18.04
-rwxr-xr-x root/root 388 2020-04-29 17:24 ./usr/bin/certify-vm-20.04
-rwxr-xr-x root/root 388 2021-11-22 05:18 ./usr/bin/certify-vm-22.04
-rwxr-xr-x root/root 370 2020-04-20 16:10 ./usr/bin/test-cpu
-rwxr-xr-x root/root 376 2018-03-28 13:49 ./usr/bin/test-firmware
-rwxr-xr-x root/root 385 2020-04-24 16:04 ./usr/bin/test-functional-18.04
-rwxr-xr-x root/root 385 2020-04-24 16:04 ./usr/bin/test-functional-20.04
-rwxr-xr-x root/root 385 2021-11-22 05:18 ./usr/bin/test-functional-22.04
-rwxr-xr-x root/root 373 2019-01-21 10:24 ./usr/bin/test-memory
-rwxr-xr-x root/root 343 2020-06-24 16:56 ./usr/bin/test-network
-rwxr-xr-x root/root 385 2020-04-24 16:04 ./usr/bin/test-network-underspeed
-rwxr-xr-x root/root 373 2020-07-31 09:53 ./usr/bin/test-nvdimm
-rwxr-xr-x root/root 595 2020-04-24 16:04 ./usr/bin/test-regression
-rwxr-xr-x root/root 343 2020-06-24 16:56 ./usr/bin/test-storage
-rwxr-xr-x root/root 373 2019-01-21 10:24 ./usr/bin/test-stress
-rwxr-xr-x root/root 370 2018-03-28 13:49 ./usr/bin/test-usb
-rwxr-xr-x root/root 381 2020-04-24 16:05 ./usr/bin/test-virtualization
drwxr-xr-x root/root 0 2021-11-22 05:18 ./usr/share/
drwxr-xr-x root/root 0 2021-11-22 05:18 ./usr/share/doc/
drwxr-xr-x root/root 0 2021-11-22 05:18 ./usr/share/doc/canonical-certification-server/
-rw-r--r-- root/root 614 2021-11-22 05:18 ./usr/share/doc/canonical-certification-server/changelog.Debian.gz
-rw-r--r-- root/root 934 2016-07-18 18:26 ./usr/share/doc/canonical-certification-server/copyright
drwxr-xr-x root/root 0 2021-11-22 05:18 ./usr/share/lintian/
drwxr-xr-x root/root 0 2021-11-22 05:18 ./usr/share/lintian/overrides/
-rw-r--r-- root/root 1698 2020-05-21 11:42 ./usr/share/lintian/overrides/canonical-certification-server

Revision history for this message
Jeff Lane  (bladernr) wrote :

I like that, no more packaging updates when we add/remove launchers.

Revision history for this message
Rod Smith (rodsmith) wrote :

LGTM; however, I know little enough about Checkbox packaging that you might want to wait for a second opinion before merging.

review: Approve
Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

I'd just use this selection in canonical-certification-server.install:

/usr/bin

From http://manpages.ubuntu.com/manpages/focal/man1/dh_install.1.html:

           Note that if you list exactly one filename or wildcard-pattern on a line by itself,
           with no explicit destination, then dh_install will automatically guess the destination
           to use, the same as if the --autodest option were used.

Revision history for this message
Jeff Lane  (bladernr) wrote :

Huh... ok... I misread how dh_install worked when I was doing this earlier. Just changed it to simply /usr/bin, built and tested the package and it does do everything it should. Magic.

I'll approve this and the other one now and that should take care of CCS for a bit.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/canonical-certification-server.install b/debian/canonical-certification-server.install
2index 1d14f38..bc7b689 100644
3--- a/debian/canonical-certification-server.install
4+++ b/debian/canonical-certification-server.install
5@@ -1,19 +1 @@
6-usr/bin/certify-18.04
7-usr/bin/certify-20.04
8-usr/bin/certify-soc-18.04
9-usr/bin/certify-soc-20.04
10-usr/bin/certify-vm-18.04
11-usr/bin/certify-vm-20.04
12-usr/bin/test-cpu
13-usr/bin/test-firmware
14-usr/bin/test-functional-18.04
15-usr/bin/test-functional-20.04
16-usr/bin/test-memory
17-usr/bin/test-network
18-usr/bin/test-network-underspeed
19-usr/bin/test-nvdimm
20-usr/bin/test-regression
21-usr/bin/test-storage
22-usr/bin/test-stress
23-usr/bin/test-usb
24-usr/bin/test-virtualization
25+/usr/bin/

Subscribers

People subscribed via source and target branches