Checkbox Provider - Phoronix

Merge ~pwlars/checkbox-provider-phoronix/+git/packaging:vulkan-utils-tools-transition into checkbox-provider-phoronix:master

  1. Git
  2. lp:~pwlars/checkbox-provider-phoronix/+git/packaging
  3. vulkan-utils-tools-transition
  4. Merge into master
Proposed by Paul Larson
Status: Superseded
Proposed branch: ~pwlars/checkbox-provider-phoronix/+git/packaging:vulkan-utils-tools-transition
Merge into: checkbox-provider-phoronix:master
Diff against target: 332 lines (+266/-0) (has conflicts)
10 files modified
debian/.git-dpm (+8/-0)
debian/changelog (+45/-0)
debian/compat (+1/-0)
debian/control (+43/-0)
debian/copyright (+20/-0)
debian/rules (+23/-0)
debian/source/format (+1/-0)
debian/source/lintian-overrides (+2/-0)
debian/upstream/signing-key.asc (+119/-0)
manage.py (+4/-0)
Conflict in manage.py
Reviewer Review Type Date Requested Status
Checkbox Developers Pending
Review via email: mp+401137@code.launchpad.net

This proposal has been superseded by a proposal from 2021-04-22.

Description of the change

Not sure if this is the right way to proceed - it looks like in focal, vulkan-utils is a transitional package, which installs vulkan-tools. After that, it's just vulkan-tools (at least in hirsute) and vulkan-utils is no longer available.

So if we ever need to rebuild on anything before focal, this might break things. In which case I guess we'll need to maintain series-specific branches of this.

To post a comment you must log in.

Unmerged commits

ddc9565... by Paul Larson

Use vulkan-tools as the dep instead of vulkan-utils for future builds

3d8ef83... by PMR <pmr@pmr-lander>

change version to 0.7.0-1
"new upstream version"

00b66ea... by PMR <pmr@pmr-lander>

record new upstream branch created by importing checkbox-provider-phoronix_0.7.0.orig.tar.gz and merge it

87c6e54... by PMR <pmr@pmr-lander>

Import checkbox-provider-phoronix_0.7.0.orig.tar.gz

1be12c2... by PMR <pmr@pmr-lander>

change version to 0.7.0~rc2-1
"new upstream version"

7a0d610... by PMR <pmr@pmr-lander>

record new upstream branch created by importing checkbox-provider-phoronix_0.7.0~rc2.orig.tar.gz and merge it

b0c31f2... by PMR <pmr@pmr-lander>

Import checkbox-provider-phoronix_0.7.0~rc2.orig.tar.gz

91744fc... by PMR <pmr@pmr-lander>

change version to 0.7.0~rc1-1
"new upstream version"

8c66248... by PMR <pmr@pmr-lander>

Import checkbox-provider-phoronix_0.7.0~rc1.orig.tar.gz

91be9c4... by PMR <pmr@pmr-lander>

record new upstream branch created by importing checkbox-provider-phoronix_0.7.0~rc1.orig.tar.gz and merge it

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/debian/.git-dpm b/debian/.git-dpm
0new file mode 1006440new file mode 100644
index 0000000..62bf048
--- /dev/null
+++ b/debian/.git-dpm
@@ -0,0 +1,8 @@
1# see git-dpm(1) from git-dpm package
287c6e54078df963b05905f10a5fd3e67457aad5c
387c6e54078df963b05905f10a5fd3e67457aad5c
487c6e54078df963b05905f10a5fd3e67457aad5c
587c6e54078df963b05905f10a5fd3e67457aad5c
6checkbox-provider-phoronix_0.7.0.orig.tar.gz
756b7cc308bf31044bb8cfbde8849d59617ace41b
8932131
diff --git a/debian/changelog b/debian/changelog
0new file mode 1006449new file mode 100644
index 0000000..ea6a8fb
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,45 @@
1checkbox-provider-phoronix (0.7.0-1) UNRELEASED; urgency=medium
2
3 [ Sylvain Pineau ]
4 * "new upstream version"
5
6 [ Jenkins ]
7 * "new upstream version"
8 * "new upstream version"
9 * "new upstream version"
10 * "new upstream version"
11 * "new upstream version"
12 * "new upstream version"
13 * "new upstream version"
14 * "new upstream version"
15 * "new upstream version"
16 * "new upstream version"
17 * "new upstream version"
18 * "new upstream version"
19 * "new upstream version"
20
21 -- Jenkins <jenkins@open-joey-201506-18558.maas> Tue, 09 Jun 2020 13:52:37 +0000
22
23checkbox-provider-phoronix (0.1.3) bionic; urgency=medium
24
25 * removed opencl tests
26
27 -- kissiel <kissiel@jupo> Sat, 24 Aug 2019 18:50:41 +0200
28
29checkbox-provider-phoronix (0.1.2) bionic; urgency=medium
30
31 * Added missing dependencies (based on SRU provider)
32
33 -- root <root@bionic.lxd> Tue, 20 Aug 2019 16:58:04 +0000
34
35checkbox-provider-phoronix (0.1.1) bionic; urgency=medium
36
37 * Added missing python3-checkbox-ng dependency
38
39 -- root <root@bionic.lxd> Tue, 20 Aug 2019 15:59:00 +0000
40
41checkbox-provider-phoronix (0.1) bionic; urgency=medium
42
43 * Initial release. (Closes: #XXXXXX)
44
45 -- Maciej Kisielewski <maciej.kisielewski@canonical.com> Mon, 19 Aug 2019 10:44:05 +0200
diff --git a/debian/compat b/debian/compat
0new file mode 10064446new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
19
diff --git a/debian/control b/debian/control
0new file mode 1006442new file mode 100644
index 0000000..eec0959
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,43 @@
1Source: checkbox-provider-phoronix
2Section: utils
3Priority: optional
4Maintainer: Checkbox Developers <checkbox-devel@lists.ubuntu.com>
5Uploaders: Maciej Kisielewski <maciej.kisielewski@canonical.com>
6Build-Depends: autoconf,
7 automake,
8 debhelper (>= 9),
9 intltool,
10 libnl-3-dev,
11 libnl-genl-3-dev,
12 pkg-config,
13 plainbox-provider-checkbox (>= 0.31),
14 python3,
15 python3-checkbox-ng,
16 python3-debian
17Standards-Version: 3.9.6
18Homepage: https://launchpad.net/checkbox-provider-phoronix
19
20Package: checkbox-provider-phoronix
21Architecture: amd64
22Depends: apt-file,
23 autoconf,
24 build-essential,
25 cmake,
26 cmake-data,
27 curl,
28 git-core,
29 libcurl4-openssl-dev,
30 libgmp3-dev,
31 libssl-dev,
32 libvulkan-dev,
33 mesa-utils,
34 ocl-icd-libopencl1,
35 opencl-headers,
36 python3,
37 unzip,
38 vulkan-tools,
39 xorg-dev
40 ${misc:Depends},
41 ${plainbox:Depends}
42X-Plainbox-Provider: yes
43Description: Checkbox provider with tests from Phoronix Test Suite
diff --git a/debian/copyright b/debian/copyright
0new file mode 10064444new file mode 100644
index 0000000..0824bcf
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,20 @@
1Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
2Upstream-Name: checkbox-provider-phoronix
3Source: https://launchpad.net/checkbox-provider-phoronix
4
5License: GPL-3
6 This program is free software: you can redistribute it and/or modify
7 it under the terms of the GNU General Public License version 3,
8 as published by the Free Software Foundation.
9 .
10 This program is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 GNU General Public License for more details.
14 .
15 You should have received a copy of the GNU General Public License
16 along with this program. If not, see <http://www.gnu.org/licenses/>.
17 .
18 On Debian-based systems the full text of the GPL, version 3, can be found at
19 /usr/share/common-licenses/GPL-3.
20
diff --git a/debian/rules b/debian/rules
0new file mode 10075521new file mode 100755
index 0000000..cfe4208
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,23 @@
1#!/usr/bin/make -f
2
3%:
4 dh $@
5
6override_dh_auto_clean:
7 python3 manage.py clean
8
9override_dh_auto_build:
10 python3 manage.py build
11 python3 manage.py i18n --dont-update-pot --dont-merge-po
12
13override_dh_auto_test:
14 python3 manage.py validate --loose --legacy
15
16override_dh_auto_install:
17 python3 manage.py install \
18 --prefix=/usr --layout=unix \
19 --root=$(CURDIR)/debian/checkbox-provider-phoronix/
20
21override_dh_gencontrol:
22 python3 manage.py packaging
23 dh_gencontrol
diff --git a/debian/source/format b/debian/source/format
0new file mode 10064424new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
13.0 (quilt)
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
0new file mode 1006442new file mode 100644
index 0000000..f031478
--- /dev/null
+++ b/debian/source/lintian-overrides
@@ -0,0 +1,2 @@
1# https://bugs.launchpad.net/plainbox-provider-checkbox/+bug/1303919
2plainbox-provider-checkbox source: source-is-missing
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
0new file mode 1006443new file mode 100644
index 0000000..90eb450
--- /dev/null
+++ b/debian/upstream/signing-key.asc
@@ -0,0 +1,119 @@
1-----BEGIN PGP PUBLIC KEY BLOCK-----
2Version: GnuPG v1
3
4mQENBFKwFVIBCADKU9N0j1zVG1bzMb8ex6E0rtnt2iVE4Of+ev07xq7T/kKp/Dsm
5XUdV+teImQ6RCsHHlN6+a7fqTC468iHtK0fgYArILZx0Dc+VV7XNhFgvlruZoUHO
6HqTpCmI7U5yYup4xT3ZzhrqJnn5yRa3SK5+SgvtuWsbJdodkb+C7cmYwm6gZ1q/1
7raO5hKyg4erSlbyEXc2Ka708950s7l4MpyzHA9kLq5Eo9rAP9IUs/gvh/tcVXf2K
8/0cr7u7BjTNgIXAhvWiv0nT475rnZzUDnFhZDhwqIgY0UUBWGsT0HWBeG/CooRns
9cQm6Ey3Ajk7HEBJm+JOnWuZqo5j1TucFddQ3ABEBAAG0Jlp5Z211bnQgS3J5bmlj
10a2kgPHprcnluaWNraUBnbWFpbC5jb20+iQE+BBMBAgAoBQJSsBVSAhsDBQkB4TOA
11BgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRDSG1MMGLIyH/o2B/4952TbXO25
12A6RWESjOuUhFC/ZAApNcB9MTFj9H+eggEzIPrGFsptV83ceoi+JOuXQM0Eaxw+1N
13WfF+Z00vYo0BdgYdK656zveCETrmLarBe9+DCl/rZSmOASbXPYulNeUA2nyx6U3D
14VapnjzebQ8F0GRZqaSGJq78orbW08tXIQ6E2yNcNmJUjyRmOYsVMGW7ee3hmIEKx
15+3EN+odIPKuXerDrSwUZcrHBbmu+XAL1TG/F3Q1w7gBLY/PiF9CDhgQ7mYiWUAKy
16WYVXTC9RkyoqshjqbEcqRQ51zIVUBcUc8fczAMdR5PqS5Y4d00nelPS/qHodfQF8
1747pojdnJGx0miQIcBBABAgAGBQJSy9W4AAoJECbKqQEReiUehF8P/0J77SbjEQJN
18puNRBCY3YHcmQBZS4bqnvJXzTJsLmOEx8JydyE7E8h/o0DztJ+rZB6xiMeUXjG8i
19yu2j7ra19W1crxH/NRaNsxEgj6jnR7+oJIhMq4k1K8VuTMiQoikJt2hd6CIpEz0o
20w8mpAu6sQlCNyYpuIzXFykVTvJ+2YlZZ/LOV9eaZDaNX53H+9DM5Qlv9vYE4htZ8
21QVB7uNDWz8A760VhxEPQZgrE/KCTigzhLmxfyNtuPep7nwrWqUy5BRwluzGhOchn
22Pr2NKQhL5OgfrQ+PfYNQkhtzkm4LtAdlyiRncpsuSQyACh9luatJSsHwp4yCRA9h
23iCQcgpKsFNCtunT71EOhRzmr4jLLAcDTDq0652TvcWeA0Yd3ikLRd0Y3U60En14f
24cJC9GCVIi7yVNE3LJQeWMPFuLpv64EdLV1G6PDj7OqEdLksHb1hqJ+WKBPC0YnRZ
25yd62bVhrZiUcuxQnNtqyp5Am1mlnficAyjhCjUHHkXlUFrmCt4ebGH1LAbfLiuEj
26ZB1n3m7bPbWv1bEIsx+Mi0pt2Fi6jQ7jEH1qPDSNgv2RQ53N4lNJCTu240OSzcVW
27ZnEIWnEV1PN7UqnTZmNU72sFnGHTzv/eiP0jhDc8Xpww5HRybP3kzZgaHeY+fM/g
28c5C9fW43hvrPxg4UDj8buKz+n7k0sV/WuQENBFKwFVIBCADJTpL7w0hWI8MSpPaq
29RCvFc+IHHhXXdEJ4miEglTVWrX14qvSo0dk90Kgpi9kuGK1I1nm9NVK8ml/fSqIC
30SL2xAVQzFzK5X3/PB4DyHGW0MWVvPjIsJBy3VDPcdEWiqJyjIHCAyblx9aHwW+TP
31GxY49jqoEGi3AVZzMlxBnGDl/gxGhSFwxQMNgmGLk6KNAK5x2a2/yXrEUzk0gNqv
32PUS6Gcnamz0H3W4EsEv/6gSq9pLVPfLEykqoMXFwBneQn3CbGYa7yOokK0PQVrWH
334DE5f/DZGJcSw3epc+FGK96NogNDODVbFpYFpBuyf2JqcnmhiWRLeTwPB7zzxZAe
34dJTxABEBAAGJASUEGAECAA8FAlKwFVICGwwFCQHhM4AACgkQ0htTDBiyMh/OXwgA
35vdPfzO6YfsAPpDLcTtvepzaYnooK6H2TLETmTbcoQG2KQKLeSTCVf6842v+2uIyT
367n4mPk3Bq4HZPR0kQmwbkGBGSKkKdEI2pbuKbS6j3xTwgKltn3NPhGAAHjZC28JS
37LnQwHbb4Fq/aPnGRE/MhrJWocKTsenyqsv0hXjpKgGT6CJmzK0xqHQ0J8boVdvuv
380lpOH4huJrY1v4CgTb9Lel8+nVQdV/YW37q6ie8tKcuV/E0Bg2SDlrp1sB5fw6ug
39Gmw1KgG5PEGCw3aw8nTSxcs+SvlbcoQHQ4wxaC8JMk9FFd6jXMWJL9dWP+ZA61od
40xxGS57/Nmfbij8UuxgkLtw==
41=4Jty
42-----END PGP PUBLIC KEY BLOCK-----
43-----BEGIN PGP PUBLIC KEY BLOCK-----
44Version: GnuPG v1
45
46mQENBEvipr4BCADJdK7pAu7fEFyNCLdMULze97sVWWJ1bWkA/lMot14911EbyFr7
47pvi5uril4QT55d1AKfMXJ6HNtHtIHe/CF1ehEc5c7oA2c0IdeSR4F6JEbFSneORT
48OZtYAK3VdG53ywpyCqP2tzB/YrRhVO9qsc5fYEr0EpeqRkvB5ower2MUFvvM5PBZ
49a+0owzW9OnlSOqbrVPj9Wp1bn857j/WpJCrMbcJlPPWGyo4ambAQI4Rky+apeQM0
50L4QTjPMXIoHDQao/2XsSL75OBx5Bi81j1KoU56PvM9b4oWMOqDDolPHwZGJtCewl
51LJqfy1Oa68vN4MxDXFmGp7bFTCt8ZOup1AjlABEBAAG0LVN5bHZhaW4gUGluZWF1
52IDxzeWx2YWluLnBpbmVhdUBjYW5vbmljYWwuY29tPokBOAQTAQIAIgUCS+KmvgIb
53AwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQdNV1zH7XLNGSgAgApgU9VUlp
54Rblw7WH7q8BueI4G5CRiIDt6PA866IhbtuKPHMhv8LUQCVavAtKWVlwx/wGS/+2y
55CKqTCRXFu52MomE+kSfEFnELMW8vwz3KG6NgUVIv8dFesf1Finc8Y9YQkUX/xWYV
56MYREz3rgDgGMgpWlMVq5/olqYMg1jc4yIKrbQGoFDvlgijzGwibh/V5NVPcuYrMK
57DvhnWGIEX4whP/hW/o7vPKC5qYznrGqRroLqsq1viGgeS7nK37vcgX+vYv5pzIDM
5873CqpAnISAyBpU5n/YHG4AmundrVHwdscY7u8l9Fn5XFEGhu6FxWQL2mAY/gvGPS
59fgxeZUWpB21WNrkBDQRL4qa+AQgAtAiq2zDF0hl2KnB/a16O5SyjDR5XJUcWJ9F/
60tFw0i3EXEYeYdCFHaTdFfDmdX+SyBPh4lJIJZCpFZZ7Akeb3qLDS/4oAAo4EcoeS
61pp47Mr1/eCahI9Pkwg073jqHSUAKQp6oPP/bvBzAqhl4ZkUyZQpjdy0/d5FO4OEa
62R91SCxNqBQOA+Z2rKL6gBwJYpMGMKC1bhfOCvD8eH7dN3PDMNnHoYSjJSy5di/Zu
63snrVR4MO63FpmSZ4r5eGjIaiBFxYXsitn2ilPOt2e0/Vo8QOJsOl+6bOkdn5jiNL
64n1fCvzadUXuEDTjj9+6UkCCLYRODeTrMM9XpNeAZZBSGVzuCgQARAQABiQEfBBgB
65AgAJBQJL4qa+AhsMAAoJEHTVdcx+1yzRcpEH/iZMQPFnnCj3LthOvCAVM/raO17h
66KshdrOMS53uI5NzeBnr+/0zGMehnYcpzLmrvHXM86lsUVSzfr/px/Ve3+8SR6qxy
67p5+PFsxbqh+DSkxnTfbIqHVBY4f7/nOQavI1rhj4JQzKiYLCvIhDMVQm/2ZKnsNB
68043MaDPi0SBLJmqZqFyH3CUE3B8JNi4i+nv7Vj37V4sL1yHwN+rmyDhZUUelO5Iw
69vrysE7eNqmhTtuV+tl5Oq2EEzYau+7u+/Kuo1JpFsamJ8xVIR2j9i/3m3LqOaVPo
70ExFTDCQAPTaRyLAvTFylsIUffsdIAsM8wJQnuO5EzlxbkId3aVOrJ/cb5to=
71=cQg/
72-----END PGP PUBLIC KEY BLOCK-----
73-----BEGIN PGP PUBLIC KEY BLOCK-----
74Version: SKS 1.1.5
75
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
117FHU=
118=UsyP
119-----END PGP PUBLIC KEY BLOCK-----
diff --git a/manage.py b/manage.py
index 6875342..fc60f8b 100755
--- a/manage.py
+++ b/manage.py
@@ -16,7 +16,11 @@ from plainbox.provider_manager import setup, N_
16setup(16setup(
17 name='checkbox-provider-phoronix',17 name='checkbox-provider-phoronix',
18 namespace='com.canonical.certification',18 namespace='com.canonical.certification',
19<<<<<<< manage.py
19 version="0.8.0.dev0",20 version="0.8.0.dev0",
21=======
22 version="0.7.0",
23>>>>>>> manage.py
20 description=N_("Checkbox provider with Phoronix Test Suite"),24 description=N_("Checkbox provider with Phoronix Test Suite"),
21 gettext_domain="checkbox-provider-phoronix",25 gettext_domain="checkbox-provider-phoronix",
22)26)

Subscribers

People subscribed via source and target branches