add new "no-wrapper" property to apps #1420

mvo5 · Jul 26, 2017

A RFC branch to fix https://bugs.launchpad.net/snapcraft/+bug/1706575

This allows to specify that no shell wrapper for apps should be generated. This is useful for e.g. statically linked binaries that don't need this anyway.

LP: 1706575

zyga · Jul 26, 2017

zyga reviewed Jul 26, 2017

View changes

Small future-proof suggestion

Suggestion: make this "wrappers" enum that has possible values "legacy" and "none" as we may be able to provide some kind of useful wrappers later on.

Agreed, this should be an array of unique elements like build-attributes in parts.

sergiusens · Jul 26, 2017

sergiusens reviewed Jul 26, 2017

View changes

Thanks for the improvement; I agree with @zyga on this and we have long shied away from boolean entries to be future proof. it would be nice to see an integration test that creates a snap and verifies no wrapper is used in the end.

elopio · Jul 28, 2017

elopio reviewed Jul 28, 2017

View changes

This is missing:
wrapper: none

The name of the file should be: command-binary-no-wrapper.wrapper.

mvo5 · Aug 9, 2017

Thanks for the feedback and sorry for my slow reply. I addressed the review feedback now. Please let me know if I can help in any other way.

zyga · Aug 9, 2017

zyga approved these changes Aug 9, 2017

View changes

Small comment, looks good to me

Nice :-)

wrapper = apps[app].get("wrapper", legacy) is shorter

Not sure if snapcraft uses anything that can derive the default from the schema.

sergiusens · Aug 10, 2017

Hi, thanks for the changes, I was thinking of something more like:

apps:
    no-wrapper-app:
        command: app
        app-constraints: [no-wrapper]
    wrapped-app
        command: app

wdyt?

sergiusens · Aug 10, 2017

Now that I think of it, it no-wrapper might even be no-environment as we already have plans to get rid of wrappers and make use of env for apps a lot more.

mvo5 · Aug 17, 2017

I updated the PR now to follow the suggestion of Gustavo in https://forum.snapcraft.io/t/telling-snapcraft-to-skip-generating-wrapper-scripts/1635/3 - i.e. it is using: adapter: {"", "none"} now.

mvo5 · Aug 28, 2017

How are things looking? I updated the code based on the feedback that I got from @niemeyer. Please let me know if there is anything else I can do to help this PR along, I need it for snapcore/snapd#3625 so it woudl be great if it could make it to the next snapcraft release.

kyrofa · Sep 5, 2017

kyrofa reviewed Sep 5, 2017 • edited

View changes

This feels a little odd to have a valid enum value as "". It's an optional field, right? Why not just leave it off in such a case? I can't imagine people will actually use adapter: '' anywhere.

kyrofa · Sep 19, 2017

Ping on this one.

sergiusens · Sep 20, 2017

sergiusens dismissed their stale review Sep 20, 2017

review no longer valid

mvo5 · Sep 21, 2017

Thanks, updated and removed the "" from the enum.

kyrofa · Sep 28, 2017

kyrofa dismissed elopio’s stale review Sep 28, 2017

Fixes requested have been completed.

kyrofa · Sep 28, 2017

kyrofa approved these changes Sep 28, 2017

View changes

With the changes, this looks great, thanks @mvo5!

add new "no-wrapper" property to apps

d5dccd4

use wrapper key, add integration test

28bfe6e

mvo5 referenced this pull request in snapcore/snapd Jul 26, 2017
Merged
many: end-to-end support for the bare base snap #3625

address review feedback

8ffbcc6

mvo5 added some commits Aug 17, 2017

Update syntax to the suggestions from @niemeyer
See https://forum.snapcraft.io/t/telling-snapcraft-to-skip-generating-wrapper-scripts/1635/3

9c9f4c8

Merge remote-tracking branch 'upstream/master' into no-wrapper

34d46a0

mvo5 added a commit to mvo5/snappy that referenced this pull request Aug 31, 2017

only run test-snapd-busybox-static on amd64 systems for now (until sn…
…apcore/snapcraft#1420 is in)

ccb2687

sergiusens dismissed their stale review Sep 20, 2017

address review feedback

94240e8

kyrofa dismissed elopio’s stale review Sep 28, 2017

sergiusens added some commits Oct 1, 2017

Update meta.py
single quotes

7aee20f

Merge branch 'master' into no-wrapper

e592f3b

sergiusens merged commit 2a14e16 into snapcore:master Oct 2, 2017
1 check passed

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

sergiusens added the enhancement label Oct 2, 2017

sergiusens added this to the 2.35 milestone Oct 2, 2017

sergiusens added this to Integration in 17.10 Oct 7, 2017

@@ -190,6 +190,10 @@ properties:
                          - type: string
                            minLength: 1
                          - type: number
+        +          no-wrapper:

@@ -10,6 +10,8 @@ apps:
              command: binary1
            binary2:
              command: subdir/binary2
+        +  binary-no-wrapper:
+        +    command: subdir/binary3

@@ -73,6 +73,10 @@ def test_snap(self):
                      os.path.join(self.prime_dir, 'bin', 'not-wrapped.wrapper'),
                      Not(FileExists()))
+        +        self.assertThat(
+        +            os.path.join(self.prime_dir, 'bin', 'command-binary3.wrapper'),

@@ -190,6 +190,13 @@ properties:
                          - type: string
                            minLength: 1
                          - type: number
+        +          wrapper:

-        -            self._wrap_app(app, apps[app])
+        +            wrapper = "legacy"
+        +            if "wrapper" in apps[app]:
+        +                wrapper = apps[app]["wrapper"]

snapcore/snapcraft

add new "no-wrapper" property to apps #1420

mvo5 commented Jul 26, 2017

zyga reviewed Jul 26, 2017

View changes

sergiusens reviewed Jul 26, 2017

View changes

mvo5 referenced this pull request in snapcore/snapd Jul 26, 2017

many: end-to-end support for the bare base snap #3625

elopio reviewed Jul 28, 2017

View changes

mvo5 commented Aug 9, 2017

zyga approved these changes Aug 9, 2017

View changes

sergiusens commented Aug 10, 2017

sergiusens commented Aug 10, 2017

mvo5 added some commits Aug 17, 2017

mvo5 commented Aug 17, 2017

mvo5 commented Aug 28, 2017

mvo5 added a commit to mvo5/snappy that referenced this pull request Aug 31, 2017

kyrofa reviewed Sep 5, 2017 • edited

View changes

kyrofa commented Sep 19, 2017

sergiusens dismissed their stale review Sep 20, 2017

mvo5 commented Sep 21, 2017

kyrofa dismissed elopio’s stale review Sep 28, 2017

kyrofa approved these changes Sep 28, 2017

View changes

sergiusens added some commits Oct 1, 2017

sergiusens merged commit `2a14e16` into snapcore:master Oct 2, 2017
1 check passed

1 check passed

sergiusens added the enhancement label Oct 2, 2017

sergiusens added this to the 2.35 milestone Oct 2, 2017

sergiusens added this to Integration in 17.10 Oct 7, 2017

snapcore/snapcraft

Join GitHub today

add new "no-wrapper" property to apps #1420

Conversation

mvo5 commented Jul 26, 2017

zyga reviewed Jul 26, 2017 View changes

zyga Jul 26, 2017

sergiusens Jul 26, 2017

sergiusens reviewed Jul 26, 2017 View changes

mvo5 referenced this pull request in snapcore/snapd Jul 26, 2017

many: end-to-end support for the bare base snap #3625

elopio reviewed Jul 28, 2017 View changes

elopio Jul 28, 2017

elopio Jul 28, 2017

mvo5 commented Aug 9, 2017

zyga approved these changes Aug 9, 2017 View changes

zyga Aug 9, 2017

zyga Aug 9, 2017

sergiusens commented Aug 10, 2017

sergiusens commented Aug 10, 2017

mvo5 added some commits Aug 17, 2017

mvo5 commented Aug 17, 2017

mvo5 commented Aug 28, 2017

mvo5 added a commit to mvo5/snappy that referenced this pull request Aug 31, 2017

kyrofa reviewed Sep 5, 2017 • edited View changes

kyrofa commented Sep 19, 2017

sergiusens dismissed their stale review Sep 20, 2017

mvo5 commented Sep 21, 2017

kyrofa dismissed elopio’s stale review Sep 28, 2017

kyrofa approved these changes Sep 28, 2017 View changes

sergiusens added some commits Oct 1, 2017

Hide details View details sergiusens merged commit 2a14e16 into snapcore:master Oct 2, 2017 1 check passed

1 check passed

sergiusens added the enhancement label Oct 2, 2017

sergiusens added this to the 2.35 milestone Oct 2, 2017

sergiusens added this to Integration in 17.10 Oct 7, 2017

zyga reviewed Jul 26, 2017

View changes

sergiusens reviewed Jul 26, 2017

View changes

elopio reviewed Jul 28, 2017

View changes

zyga approved these changes Aug 9, 2017

View changes

kyrofa reviewed Sep 5, 2017 • edited

View changes

kyrofa approved these changes Sep 28, 2017

View changes

sergiusens merged commit `2a14e16` into snapcore:master Oct 2, 2017
1 check passed