Simplify the gadget logic on this branch dedicated to UC24/arm64#136
Conversation
A lot of tests in the Makefile are useless as we maintain a dedicated branch per UC version and architecture. The commit simplifies the gadget logic, and get rid of the Makefile by migrating everything into the snapcraft.yaml file. The bootloader configuration file and the kernel command line have been merged in a single file. Helpers for cross-compilation are not needed, thus removed.
|
The patch was tested using the following procedure:
Also, the content of the gadget has been compared before/after the patch by unsquashing the gadget, and it matches exactly. Finally, I loaded an ubuntu classic image on a Raspberry Zero 2W, and successfully ran snapcraft in a copy of the local branch on the target itself, still comparing the generated snap file content by using the "unsquashfs". |
Meulengracht
left a comment
There was a problem hiding this comment.
Nice, I built this from source and tested on my Rpi4B - it reaches login.
alfonsosanchezbeato
left a comment
There was a problem hiding this comment.
LGTM, thanks, this is a very nice clean-up
| for file in fixup start bootcode; do \ | ||
| install -m 644 ${CRAFT_PART_BUILD}/usr/lib/${RPI_FW}/${file}* ${CRAFT_PART_INSTALL}/boot-assets/; \ |
There was a problem hiding this comment.
you do not need the \ or ; at the end in these lines
There was a problem hiding this comment.
Thanks for the review Alfonso, just added a new commit to remove these
A lot of tests in the Makefile are useless as we maintain a dedicated branch per UC version and architecture. The commit simplifies the gadget logic, and get rid of the Makefile by migrating everything into the snapcraft.yaml file.
The bootloader configuration file and the kernel command line have been merged in a single file.
Helpers for cross-compilation are not needed, thus removed.