canonical / pi-gadget

Universal pi (pi2,pi3,pi4,cm3,cm4 and future) gadget snap for Ubuntu Core and classic systems.
37 stars 62 forks source link

Switch gadget to use new `$kernel:ref` dtb handling #66

Closed mvo5 closed 3 years ago

mvo5 commented 3 years ago

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 https://github.com/snapcore/snapd/pull/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.

A similar change for armhf will also be needed.

Having a build of this in a branch of the pi gadget would be great, e.g. 20/edge/dtb

sil2100 commented 3 years ago

Ok, I think we can get this merged and at least included in edge/beta.