Image creation changes for bullseye#3739
Merged
joolswills merged 10 commits intoRetroPie:masterfrom Aug 15, 2023
Merged
Conversation
aaebf29 to
f5cc634
Compare
The parameter ordering has changed - install_rp takes the parameters platform, dist, and chroot. If platform and dist are not included an error is shown. chroot location defaults to "$md_build/chroot". Move the default username/password setting for bullseye to the install_rp function.
This ensures the filesystem is created with supported features if images are created on a system with a newer mkfs.ext4. Remove metadata_csum disabling as it's no longer needed with above changes (and was added for compatibility with Jessie). Disable 64bit ext4 feature as with the Raspberry Pi OS images.
f5cc634 to
2aba94e
Compare
Set the "pi" password in the chroot install script rather than via userconfig.txt. Disable the Raspberry Pi OS userconfig service for now. This stops the code to rename user after partition resize. This would also disable autologin (with a var/lib/userconf-pi/autologin) file, but since our set-up doesn't currently work with renaming the user RetroPie was installed for due to some hardcoded paths on install, it's safer to bypass this functionality. Enable getty@tty1. Note: Have tested with RPI-Imager, which when using a local image, checks it and thinks it can be configured. This also resolves this case where it would allow a username change. In the future we may be able to change the few config paths that are hardcoded to allow configuration of the user via RPI-imager.
2aba94e to
1b0adad
Compare
2cf87db to
cbeb57b
Compare
For bullseye we have separate binaries for the rpi3. Adjust image naming accordingly.
New function _get_info_image reads values from the distribution ini configuration files stored in image/dists This simplifies the code and avoids having logic for different versions in multiple functions. The ini format is as follows - it may change and be extended in the future. The filename is the dist name that is passed into the building functions. The current images now have a prefix "rpios-" * name: name of distro - eg buster * version: rpios/debian version * url: url for image file * format: format of the image file - currently supported is zip and xz (used by raspberrypi.org) * platforms: list of the platforms supported (eg. rpi1 rpi2 rpi3 rpi4) * file_PLATFORM (name to be used in the image file for each platform) * title_PLATFORM (user friendly name of file for each platform - used for rpi imager json)
kpartx doesn't seem to reliably remove the loopback device mapper files it creates.
cbeb57b to
d82f9a1
Compare
Contributor
|
Looks good, but I have no testing bed at the moment. 2 things that come to mind after looking at the changes:
|
Member
Author
|
Thanks.
I can change this to the most recent naming - it doesn't actually matter though as it's referred to by partition id in fstab etc.
As it doesn't do any harm for other models, I decided it's easiest just to include it for all. |
|
I was testing the latest |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR includes some reworking of the image module for compatibility with bullseye and easier maintenance. Changes include (More information in the individual commits):