Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

snapstate: add "kernel-assets" to featureSet #9999

Merged
merged 2 commits into from Apr 9, 2021

Conversation

mvo5
Copy link
Contributor

@mvo5 mvo5 commented Mar 4, 2021

This adds the "kernel-assets" string to the feature set of snapd.

With that snaps can use: assumes: [kernel-assets] and snapd will
ensure that the snaps that need this feature (like the new gadget
and kernel) will only be installed when there is an updated version
of snapd.

Build on top of PR #9981 - marked as blocked as we should only merge
it once we are confident in the new feature.

This adds the "kernel-assets" string to the feature set of snapd.

With that snaps can use: `assumes: [kernel-assets]` and snapd will
ensure that the snaps that need this feature (like the new gadget
and kernel) will only be installed when there is an updated version
of snapd.
@zyga zyga self-requested a review March 5, 2021 08:40
mvo5 added a commit to mvo5/pi-gadget.xxx that referenced this pull request Mar 9, 2021
Snapd is in the process of supporting DTBs coming from the kernel
snap. This requires an update of the gadget.yaml to point to the
kernel snap for boot assets of the form `$kernel:ref`.

The coresponding kernel snap change requires adding a file
meta/kernel.yaml with the content:
```
assets:
  pidtbs:
    update: true
    content:
    - dtbs/broadcom/
    - dtbs/overlays/
```

This can only land for real once snapd is fully ready, the last
PR that needs to land is snapcore/snapd#9999

Note that this PR also tweaks the "classic" target as well but I did
not test this, because I don't know how it's called. For classic
the new syntax cannot be used because ubuntu-image needs help from
`snap prepare-image` to do the resolving of the content. But the
new `no-kernel-refs-gadget` in the makefile should ensure things
work like before for classic images.
mvo5 added a commit to mvo5/pi-gadget.xxx that referenced this pull request Mar 9, 2021
Snapd is in the process of supporting DTBs coming from the kernel
snap. This requires an update of the gadget.yaml to point to the
kernel snap for boot assets of the form `$kernel:ref`.

The coresponding kernel snap change requires adding a file
meta/kernel.yaml with the content:
```
assets:
  pidtbs:
    update: true
    content:
    - dtbs/broadcom/
    - dtbs/overlays/
```

This can only land for real once snapd is fully ready, the last
PR that needs to land is snapcore/snapd#9999

Note that this PR also tweaks the "classic" target as well but I did
not test this, because I don't know how it's called. For classic
the new syntax cannot be used because ubuntu-image needs help from
`snap prepare-image` to do the resolving of the content. But the
new `no-kernel-refs-gadget` in the makefile should ensure things
work like before for classic images.
mvo5 added a commit to mvo5/pi-gadget that referenced this pull request Mar 9, 2021
Snapd is in the process of supporting DTBs coming from the kernel
snap. This requires an update of the gadget.yaml to point to the
kernel snap for boot assets of the form `$kernel:ref`.

The coresponding kernel snap change requires adding a file
meta/kernel.yaml with the content:
```
assets:
  pidtbs:
    update: true
    content:
    - dtbs/broadcom/
    - dtbs/overlays/
```

This can only land for real once snapd is fully ready, the last
PR that needs to land is snapcore/snapd#9999

Note that this PR also tweaks the "classic" target as well but I did
not test this, because I don't know how it's called. For classic
the new syntax cannot be used because ubuntu-image needs help from
`snap prepare-image` to do the resolving of the content. But the
new `no-kernel-refs-gadget` in the makefile should ensure things
work like before for classic images.
@mvo5 mvo5 added this to the 2.50 milestone Apr 6, 2021
@mvo5 mvo5 added the Skip spread Indicate that spread job should not run label Apr 6, 2021
@mvo5
Copy link
Contributor Author

mvo5 commented Apr 6, 2021

This needs a final round of end-to-end testing with the real pi-kernel (channel 20/beta/kernel-assets) and real pi gadget (20/beta/kernel-asset, not the different spelling) and then it can be merged.

@anonymouse64 anonymouse64 self-requested a review April 6, 2021 13:59
@mvo5 mvo5 removed the ⛔ Blocked label Apr 9, 2021
Copy link
Collaborator

@pedronis pedronis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1

Copy link
Member

@anonymouse64 anonymouse64 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@mvo5 mvo5 merged commit 3325f4e into snapcore:master Apr 9, 2021
sil2100 pushed a commit to snapcore/pi-gadget that referenced this pull request Apr 21, 2021
Snapd is in the process of supporting DTBs coming from the kernel
snap. This requires an update of the gadget.yaml to point to the
kernel snap for boot assets of the form `$kernel:ref`.

The coresponding kernel snap change requires adding a file
meta/kernel.yaml with the content:
```
assets:
  pidtbs:
    update: true
    content:
    - dtbs/broadcom/
    - dtbs/overlays/
```

This can only land for real once snapd is fully ready, the last
PR that needs to land is snapcore/snapd#9999

Note that this PR also tweaks the "classic" target as well but I did
not test this, because I don't know how it's called. For classic
the new syntax cannot be used because ubuntu-image needs help from
`snap prepare-image` to do the resolving of the content. But the
new `no-kernel-refs-gadget` in the makefile should ensure things
work like before for classic images.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Skip spread Indicate that spread job should not run
Projects
None yet
3 participants