Merge ~snappy-hwe-team/snappy-hwe-snaps/+git/mesa-runtime:first-runtime into ~snappy-hwe-team/snappy-hwe-snaps/+git/mesa-runtime:master

Proposed by Alberto Milone
Status: Merged
Approved by: Simon Fels
Approved revision: 34d99504309014b6fe49319bd448be757cd3236f
Merged at revision: 3e9e9759f7f916356e7a5de109560e5d74cc083d
Proposed branch: ~snappy-hwe-team/snappy-hwe-snaps/+git/mesa-runtime:first-runtime
Merge into: ~snappy-hwe-team/snappy-hwe-snaps/+git/mesa-runtime:master
Diff against target: 72 lines (+55/-0)
3 files modified
.ci_tests_disabled (+0/-0)
MAINTAINERS (+3/-0)
snap/snapcraft.yaml (+52/-0)
Reviewer Review Type Date Requested Status
Simon Fels Approve
Roberto Mier Escandon (community) Approve
System Enablement Bot continuous-integration Approve
Konrad Zapałowicz (community) code Approve
Review via email: mp+324944@code.launchpad.net

Description of the change

This is my initial attempt at providing a mesa runtime.

Note: this also includes some of the relevant X libraries.

To post a comment you must log in.
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Alberto Milone (albertomilone) wrote :

As for the 1st failure, why doesn't it look for snap/snapcraft.yaml?

+ [ -e snapcraft.yaml ]
+ [ -z ]
+ echo WARNING: Can't build snap as no snapcraft.yaml exists!

The 2nd failure seems to be correct, as I haven't provided a spread test yet. I need to learn about them first.

Revision history for this message
Simon Fels (morphis) wrote :

CI Fails as you need to have a top-level snapcraft.yaml

Also if you don't provide a run-tests.sh script CI will fail too because it will require you to have some tests around. If you don't have any tests yet you can add a .ci_tests_disabled file

review: Needs Fixing
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Alberto Milone (albertomilone) wrote :

I'm a bit confused as to what the actual error is now.

Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Konrad Zapałowicz (kzapalowicz) wrote :

one more thing, MAINTAINERS file shall be added.

review: Needs Fixing (code)
Revision history for this message
Konrad Zapałowicz (kzapalowicz) wrote :

ack

review: Approve (code)
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Simon Fels (morphis) :
review: Needs Fixing
Revision history for this message
Simon Fels (morphis) wrote :

One more thing: Ok, for this MP but for future MPs you should push the branch you want to merge to your own copy of the repository and not ~snappy-hwe-team/snappy-hwe-snaps/+git/mesa-runtime:first-runtime

Revision history for this message
Alberto Milone (albertomilone) wrote :

> One more thing: Ok, for this MP but for future MPs you should push the branch
> you want to merge to your own copy of the repository and not ~snappy-hwe-team
> /snappy-hwe-snaps/+git/mesa-runtime:first-runtime

Ok, I'll keep that in mind for the next MP. Thanks.

Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Roberto Mier Escandon (rmescandon) wrote :

since snapcraft.yaml can be moved to snap/snapcraft.yaml, as that is supposed to be the standard path for that file, let's change it.

Other thing: I guess this project intention is not to duplicate same mesa runtime stuff in different snaps using it, right?. Otherwise this could be distributed as a "part" instead of a snap, as happened with these https://wiki.ubuntu.com/snapcraft/parts.

review: Needs Fixing
Revision history for this message
Alberto Milone (albertomilone) wrote :

@Roberto: the funny thing is that snapcraft.yaml used to live in the snap directory, but CI wasn't happy with that (which is why I had to move it).

Also, correct, we want to avoid including the mesa libraries in every single snap that needs it (hence the content interface).

Revision history for this message
Simon Fels (morphis) :
Revision history for this message
Roberto Mier Escandon (rmescandon) wrote :

@Alberto I think having snapcraft.yaml in snap subfolder is working for CI since thursday or even friday (a very recent change). That was a change made by Simon and already merged. Maybe you tried it before?

Revision history for this message
Alberto Milone (albertomilone) wrote :

> @Alberto I think having snapcraft.yaml in snap subfolder is working for CI
> since thursday or even friday (a very recent change). That was a change made
> by Simon and already merged. Maybe you tried it before?

I last tried that on June 01, and I haven't touched that since.

Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Roberto Mier Escandon (rmescandon) wrote :

LGTM

review: Approve
Revision history for this message
Simon Fels (morphis) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/.ci_tests_disabled b/.ci_tests_disabled
2new file mode 100644
3index 0000000..e69de29
4--- /dev/null
5+++ b/.ci_tests_disabled
6diff --git a/MAINTAINERS b/MAINTAINERS
7new file mode 100644
8index 0000000..15f2e91
9--- /dev/null
10+++ b/MAINTAINERS
11@@ -0,0 +1,3 @@
12+Alberto Milone <alberto.milone@canonical.com>
13+Alfonso Sanchez-Beato <alfonso.sanchez-beato@canonical.com>
14+Roberto Escandon <roberto.escandon@canonical.com>
15diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
16new file mode 100644
17index 0000000..6e70310
18--- /dev/null
19+++ b/snap/snapcraft.yaml
20@@ -0,0 +1,52 @@
21+name: mesa-runtime
22+version: 12.0.6-1
23+summary: Mesa runtime for running applications that require acceleration
24+description: |
25+ Mesa is a 3-D graphics library with an API which is very similar to
26+ that of OpenGL. To the extent that Mesa utilizes the OpenGL command
27+ syntax or state machine, it is being used with authorization from
28+ Silicon Graphics, Inc. However, the authors make no claim that Mesa
29+ is in any way a compatible replacement for OpenGL or associated with
30+ Silicon Graphics, Inc.
31+
32+ This version of Mesa provides GLX and DRI capabilities: it is capable of
33+ both direct and indirect rendering.
34+
35+ Please find the source code for this snap at:
36+ https://code.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/mesa-runtime
37+
38+grade: stable
39+confinement: strict
40+
41+slots:
42+ runtime:
43+ content: mesa-runtime1
44+ interface: content
45+ read:
46+ - mesa-runtime
47+
48+parts:
49+ mesa-runtime:
50+ plugin: nil
51+ stage-packages:
52+ - libegl1-mesa
53+ - libgl1-mesa-glx
54+ - libgles2-mesa
55+ - libglu1-mesa
56+ - libwayland-egl1-mesa
57+ - libgbm1
58+ organize:
59+ etc: mesa-runtime/etc
60+ usr/lib: mesa-runtime/usr/lib
61+ usr/share/X11: mesa-runtime/usr/share/X11
62+ usr/share/doc: mesa-runtime/usr/share/doc
63+ filesets:
64+ libraries:
65+ - mesa-runtime/etc
66+ - mesa-runtime/usr/lib
67+ - mesa-runtime/usr/share/doc
68+ - -mesa-runtime/usr/lib/gcc
69+ - -mesa-runtime/usr/share/doc/gcc-6-base
70+ - -usr
71+ prime:
72+ - $libraries

Subscribers

People subscribed via source and target branches

to all changes: