Merge upstream 2024-07 #26
Merged
Conversation
This file contains 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
Although the loop block device is created before attaching the image to it, the devices for the partition that the image contains are still not created. This patch creates those devices as well, when they are not already available. Fixes #482 Signed-off-by: Vasilis Tsiligiannis <[email protected]>
Remove references to 'Raspbian', and instead refer to 'Raspberry Pi OS'. Additionally, a first pass of editing for conciseness. Replace bookworm instructions with bullseye
Desktop is now started with systemd-inhibit
keyboard-configuration scripts ignores debconf settings if it doesn't detect an attached keyboard. Instead, it sets XKBOPTIONS to lv3:ralt_switch, which is not a desired option. It also considers an empty XKBOPTIONS string to be unset. This workaround sets it to a placeholder value which is removed later. dpkg-reconfigure is run so that debconf-get-selections prints the correct values.
This also adds the 'ARCH' environment variable, which will help reduce the delta between master and arm64 branches.
… fail early if binfmt_misc isn't working as expected
* Compare mount output using base of dirname If you're building from a bind-mounted directory, the build will fail as it will find two entries to unmount, but a single unmount will remove them both causing an error. Adding a space means that the mountpoint will only match with a single mount entry ; the expected path, rather than the pre bind-mount. * Switch to awk instead of mount, grep, cut pipes Retry unmount 5 times and give up, letting the user know that they need to resolve the issue manually --------- Co-authored-by: David Peverley <[email protected]> Co-authored-by: Serge Schneider <[email protected]>
* build.sh: Unmount intermediates on trap Iterate through image files which might be in use and detach them Avoid silent failures - let the user know whether the build failed * common: update unmount_image Use udevadm settle instead of sleep if possible Use losetup's -j option to find the loop device associated with a give image file * build.sh: update clean-up trap term --------- Co-authored-by: Serge Schneider <[email protected]>
f-wright
added a commit
that referenced
this pull request
Jul 23, 2024
commit 9a309aa Merge: 68bad9f 655fbe6 Author: Francine Wright <[email protected]> Date: Tue Jul 23 11:04:59 2024 -0700 Merge pull request #26 from groundlight/merge-pi-gen-2024-07 Merge upstream 2024-07 commit 655fbe6 Merge: 68bad9f 48efb5f Author: Francine Wright <[email protected]> Date: Tue Jul 23 09:33:18 2024 -0700 merge upstream commit 68bad9f Merge: c78dafd a267860 Author: Francine Wright <[email protected]> Date: Tue Jul 23 09:19:46 2024 -0700 Merge pull request #25 from groundlight/add-python3-dev Add python3-dev to enable new version of framegrab commit a267860 Author: Francine Wright <[email protected]> Date: Mon Jul 22 17:53:45 2024 -0700 Update comment for python3-dev inclusion Co-authored-by: robotrapta <[email protected]> commit 42c12e8 Author: Francine Wright <[email protected]> Date: Mon Jul 22 13:52:41 2024 -0700 add python3-dev commit c78dafd Author: robotrapta <[email protected]> Date: Mon Feb 5 12:48:29 2024 -0800 Making CLEAN=1 work on dobuild. (#20) commit e555804 Author: robotrapta <[email protected]> Date: Mon Feb 5 09:34:25 2024 -0800 Fixes #16 - makes the .venv environment globally writable (#17) * Making the .venv environment globally writable after it's built. * Fixing readme. * Reverting some inadvertent deprovements to the readme commit c439a2a Author: robotrapta <[email protected]> Date: Mon Feb 5 09:29:14 2024 -0800 Merge from upstream 2024-02 (#19) * Ensure loop device partition nodes are created (#741) Although the loop block device is created before attaching the image to it, the devices for the partition that the image contains are still not created. This patch creates those devices as well, when they are not already available. Fixes #482 Signed-off-by: Vasilis Tsiligiannis <[email protected]> * Update release notes * stage0: Only disable initramfs updates if update-initramfs.conf exists * stage0: Check whether foreign architecture is needed * stage0: prevent kernel packages from creating useless symlinks * stage3: add vulkan support * Remove cmdline.txt and config.txt symlinks * stage2: rc.local drop-in no longer required, since Debian ships its own version * export-image: make sure initramfs is created Fixes #749 * README on how to merge from upstream. --------- Signed-off-by: Vasilis Tsiligiannis <[email protected]> Co-authored-by: Vasilis Tsiligiannis <[email protected]> Co-authored-by: Serge Schneider <[email protected]> commit 66a9d56 Merge: b1cb158 9268aab Author: blaise-muhirwa <[email protected]> Date: Fri Dec 22 11:01:30 2023 -0800 Merge pull request #11 from groundlight/get-qemu-working Emulating the Pi with QEMU commit 9268aab Author: blaise-muhirwa <[email protected]> Date: Fri Dec 22 17:45:12 2023 +0000 check on bad image mounting commit 4afd826 Author: blaise-muhirwa <[email protected]> Date: Fri Dec 22 17:42:16 2023 +0000 clean up the rpistart script commit 7ec13d7 Merge: 794ea6e b1cb158 Author: blaise-muhirwa <[email protected]> Date: Fri Dec 22 16:56:04 2023 +0000 Merge branch 'main' of https://github.com/groundlight/groundlight-pi-gen into get-qemu-working commit b1cb158 Merge: 3754fc5 9576784 Author: blaise-muhirwa <[email protected]> Date: Thu Dec 21 13:13:37 2023 -0800 Merge pull request #14 from groundlight/configure-gh-actions-bigger-runner configure github actions to run on a larger runner commit 9576784 Author: blaise-muhirwa <[email protected]> Date: Thu Dec 21 20:00:12 2023 +0000 explicitly specify runner label commit 09923ea Author: blaise-muhirwa <[email protected]> Date: Thu Dec 21 18:49:48 2023 +0000 configure github actions to run on a larger runner commit 794ea6e Author: blaise-muhirwa <[email protected]> Date: Tue Dec 19 23:19:41 2023 +0000 better documentation commit 3754fc5 Merge: 3eb601e fd08359 Author: blaise-muhirwa <[email protected]> Date: Tue Dec 19 14:21:18 2023 -0800 Merge pull request #12 from groundlight/desktop-version Adding support for Full Desktop Version commit fd08359 Author: blaise-muhirwa <[email protected]> Date: Tue Dec 19 21:18:34 2023 +0000 full desktop version commit b691d7f Author: blaise-muhirwa <[email protected]> Date: Tue Dec 19 19:21:07 2023 +0000 add a one-time qemu setup script commit b52439f Author: blaise-muhirwa <[email protected]> Date: Mon Dec 18 20:53:10 2023 +0000 get the qemu virtualization to work commit 39360cf Author: blaise-muhirwa <[email protected]> Date: Sat Dec 16 01:04:56 2023 +0000 more progress on the bash script for starting the qemu emulator commit 5df35bf Author: blaise-muhirwa <[email protected]> Date: Sat Dec 16 00:07:07 2023 +0000 making progress commit 3eb601e Merge: b384791 8fc2b2a Author: blaise-muhirwa <[email protected]> Date: Wed Dec 13 17:17:15 2023 -0800 Merge pull request #10 from groundlight/fix-release-names Fix small release name bug commit 8fc2b2a Author: Ubuntu <[email protected]> Date: Thu Dec 14 00:44:34 2023 +0000 fix small release name bug commit b384791 Author: robotrapta <[email protected]> Date: Tue Dec 12 17:27:24 2023 -0800 Fixing "externally-managed-environment" problem with pip (#9) * Using a python venv by default for groundlight python SDK stuff. * Fixing cv2 issue, and readme install. * Fixup file location. commit 92449ab Author: robotrapta <[email protected]> Date: Mon Dec 11 14:55:02 2023 -0800 Release assets include tag name instead of datestamp (#7) * Renames release artifacts to include tag name instead of datestamp. * dobuild exits on error. * Fixing yaml indentation. commit d87ad2a Author: robotrapta <[email protected]> Date: Mon Dec 11 13:04:22 2023 -0800 Installs MNS as systemd service (#2) * Basic minimal configuration for NMS * Adding a custom GL1 stage that just installs pip * It appears to install the SDK - does it work? * Renaming the stage to make it easier to read. * Installing missing python library that framegrab needs. * Comment on pip strangeness. * documenting compression level measurements. * Setting to compression 0 * Adding stage-gl2 which installs the code for NMS but doesn't run it yet. * Building again * Pointer to MNS repo * Making fork maintenance easier. Trying 3.10 * Removing redundant readme that was a merge mistake. * Undoing attempts to make the SDK better. For now. It'll be its own PR. * Readme and usability tweaks. * Forking off a "prod" config. * little tweaks * Close to getting systemd service to run I think. * Copies in MNS systemd files using canonical "install" command. * Taking out stage3 commit e92a760 Author: robotrapta <[email protected]> Date: Sat Dec 9 08:00:41 2023 -0800 Builds images for releases (#6) * Updating readme with forward-looking build instructions. * Renaming "glmns" to "gl" and "groundlight" * First crack at GHA to build images and make releases. * Only store artifacts for releases. * Fixing problems found in PR commit bf7420a Author: robotrapta <[email protected]> Date: Thu Dec 7 17:02:28 2023 -0800 General cleanup of build system (#4) * Basic minimal configuration for NMS * Adding a custom GL1 stage that just installs pip * It appears to install the SDK - does it work? * Renaming the stage to make it easier to read. * Installing missing python library that framegrab needs. * Comment on pip strangeness. * documenting compression level measurements. * Setting to compression 0 * Adding stage-gl2 which installs the code for NMS but doesn't run it yet. * Building again * Pointer to MNS repo * Making fork maintenance easier. Trying 3.10 * Removing redundant readme that was a merge mistake. * Undoing attempts to make the SDK better. For now. It'll be its own PR. * Readme and usability tweaks. * Forking off a "prod" config. * little tweaks * Close to getting systemd service to run I think. * Copies in MNS systemd files using canonical "install" command. * Undoing the substantive changes for MNS * Removing reference to stage-gl2 commit 063e8cc Author: robotrapta <[email protected]> Date: Thu Dec 7 14:23:54 2023 -0800 Creates a "lite" OS image that has a working Groundlight SDK (#1) * Headless groundlight SDK with mixed apt/pip * Moving README's around so we can have our own, but not mess with the original file. * Adding symlink into .github/readme. * Cleanup.
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.
Description
This PR merges in the upstream pi-gen repo. Note that the main branch of groundlight-pi-gen tracks the arm64 branch of the upstream pi-gen repo to produce 64 bit images, and that branch is merged here.
Testing
dobuild.shscript