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

Single Image Generation #11

Open
wants to merge 24 commits into
base: arm64
Choose a base branch
from
Open

Single Image Generation #11

wants to merge 24 commits into from

Conversation

gerth2
Copy link

@gerth2 gerth2 commented Dec 27, 2022

Attempt to support both Compute module and normal pi in the same image

mcm001 and others added 24 commits November 17, 2022 10:50
commit 4fc0810
Merge: e555c4b fc20b50
Author: Matt <[email protected]>
Date:   Fri Oct 14 13:16:28 2022 -0400

    Merge pull request #8 from ddaymn/bullseye

    Rebase of rpi-distro and photonvision changes, fixes Pi 4 image

commit fc20b50
Author: David Day <[email protected]>
Date:   Thu Oct 13 18:33:07 2022 -0500

    fix path of artifact upload

    uses the img.xz extension since that is registered with the raspberry pi imager

commit 1dd3155
Author: David Day <[email protected]>
Date:   Tue Oct 11 18:47:56 2022 -0500

    update CI to use ubuntu 20 and ensure binfmts exists

commit 93dd749
Author: David Day <[email protected]>
Date:   Mon Oct 10 23:03:34 2022 -0500

    fix missing space in README.md

commit aedcf5a
Merge: 2869e2a e555c4b
Author: David Day <[email protected]>
Date:   Mon Oct 10 22:44:56 2022 -0500

    Merge remote-tracking branch 'remotes/photon/master' into bullseye

commit 2869e2a
Author: David Day <[email protected]>
Date:   Sat Oct 8 09:23:41 2022 -0500

    Update to build latest images (rebased from main pi builds)

    - Supports bullseye for new raspberry pi boards
    - legacy camera enabled
    - added config-dev that enables cache for building
    - added userconf.txt so PI has initial user on boot
    - fixed files that had utf8 w/ bom which was preventing build

commit 43df4a6
Author: Banks T <[email protected]>
Date:   Mon Jan 17 20:56:50 2022 -0500

    New readme for archival (#7)

commit 97a69b4
Author: Chris Gerth <[email protected]>
Date:   Tue Nov 30 22:55:58 2021 -0600

    Update README.md

commit cbf0b6c
Author: Prateek Machiraju <[email protected]>
Date:   Sun Dec 13 17:53:44 2020 -0500

    Create release with artifact (#5)

commit 7acbf81
Author: Banks T <[email protected]>
Date:   Sat Dec 12 18:32:48 2020 -0500

    Add libtbb2 package

commit 359a051
Author: Banks T <[email protected]>
Date:   Sat Dec 12 18:28:26 2020 -0500

    Increase GPU mem split

commit 08b7d17
Author: Banks T <[email protected]>
Date:   Fri Oct 30 07:37:42 2020 -0400

    Add pigpiod, systemd service, auto-download JAR (#3)

    * Add pigpiod package

    * remove NOOBS

    * start pigpiod on boot, install photonvision and run on boot

    * Add service unit file

    * Add whitespace, remove ExecStop in Service file

commit 45fc8b9
Author: Banks T <[email protected]>
Date:   Sun Aug 30 12:06:32 2020 -0400

    Fix artifact upload (#2)

    * Update build-docker.yml

    * Update build-docker.yml

    * Update build-docker.yml

    * Update build-docker.yml

    * Update build-docker.yml

    * Update build-docker.yml

    * Update build-docker.yml

    * Update build-docker.yml

    * Update build-docker.yml

    * Update build-docker.yml

commit 3aca68b
Author: Banks Troutman <[email protected]>
Date:   Thu Jul 23 15:29:41 2020 +0000

    Remove stage5, fix stage4

commit df3c1f2
Author: Banks T <[email protected]>
Date:   Thu Jul 23 12:30:22 2020 -0400

    Build image with actions (#1)

    * Create build-docker.yml

    * Upload artifacts

commit 029b04e
Author: Banks Troutman <[email protected]>
Date:   Thu Jul 23 15:29:41 2020 +0000

    Remove stage5, fix stage4

commit 73a41fa
Author: Banks Troutman <[email protected]>
Date:   Tue Jul 14 02:38:58 2020 -0400

    stage4 cleanup

commit 1edeb18
Author: Banks Troutman <[email protected]>
Date:   Tue Jul 14 02:21:15 2020 -0400

    Fix config hostname

commit e7e9681
Author: Banks Troutman <[email protected]>
Date:   Tue Jul 14 02:21:06 2020 -0400

    Cleanup stage3 packages, add openjdk11 packages

commit 9b591fe
Author: Banks Troutman <[email protected]>
Date:   Tue Jul 14 02:20:00 2020 -0400

    Add stage2 packages, cleanup stage2

commit bd8da08
Author: Banks Troutman <[email protected]>
Date:   Tue Jul 14 02:17:41 2020 -0400

    Disable Wifi and BT

commit 11a29b2
Author: Banks Troutman <[email protected]>
Date:   Tue Jul 14 02:17:09 2020 -0400

    Enable PiCam

commit 685e837
Author: Banks Troutman <[email protected]>
Date:   Tue Jul 14 01:32:02 2020 -0400

    Add config

commit e555c4b
Author: Banks T <[email protected]>
Date:   Mon Jan 17 20:56:50 2022 -0500

    New readme for archival (#7)

commit ca00d98
Merge: 518ac9c 6e1695e
Author: Matt <[email protected]>
Date:   Fri Dec 3 22:10:03 2021 -0500

    Update README

    Update README.md

commit 6e1695e
Author: Chris Gerth <[email protected]>
Date:   Tue Nov 30 22:55:58 2021 -0600

    Update README.md

commit 518ac9c
Author: Prateek Machiraju <[email protected]>
Date:   Sun Dec 13 17:53:44 2020 -0500

    Create release with artifact (#5)

commit 1c88914
Merge: 8a134a6 ea830dc
Author: Matt <[email protected]>
Date:   Sun Dec 13 14:49:45 2020 -0800

    Merge pull request #4 from PhotonVision/gpu-tweaks

    GPU tweaks

commit ea830dc
Author: Banks T <[email protected]>
Date:   Sat Dec 12 18:32:48 2020 -0500

    Add libtbb2 package

commit 9812f78
Author: Banks T <[email protected]>
Date:   Sat Dec 12 18:28:26 2020 -0500

    Increase GPU mem split

commit 8a134a6
Author: Banks T <[email protected]>
Date:   Fri Oct 30 07:37:42 2020 -0400

    Add pigpiod, systemd service, auto-download JAR (#3)

    * Add pigpiod package

    * remove NOOBS

    * start pigpiod on boot, install photonvision and run on boot

    * Add service unit file

    * Add whitespace, remove ExecStop in Service file

commit 2d48fda
Author: Banks T <[email protected]>
Date:   Sun Aug 30 12:06:32 2020 -0400

    Fix artifact upload (#2)

    * Update build-docker.yml

    * Update build-docker.yml

    * Update build-docker.yml

    * Update build-docker.yml

    * Update build-docker.yml

    * Update build-docker.yml

    * Update build-docker.yml

    * Update build-docker.yml

    * Update build-docker.yml

    * Update build-docker.yml

commit e234843
Author: Banks Troutman <[email protected]>
Date:   Thu Jul 23 15:29:41 2020 +0000

    Remove stage5, fix stage4

commit f9a3883
Author: Banks T <[email protected]>
Date:   Thu Jul 23 12:30:22 2020 -0400

    Build image with actions (#1)

    * Create build-docker.yml

    * Upload artifacts

commit dbddf72
Author: Banks Troutman <[email protected]>
Date:   Thu Jul 23 15:29:41 2020 +0000

    Remove stage5, fix stage4

commit 3a86f45
Author: Banks Troutman <[email protected]>
Date:   Tue Jul 14 02:38:58 2020 -0400

    stage4 cleanup

commit 6220e12
Author: Banks Troutman <[email protected]>
Date:   Tue Jul 14 02:21:15 2020 -0400

    Fix config hostname

commit 95ef9af
Author: Banks Troutman <[email protected]>
Date:   Tue Jul 14 02:21:06 2020 -0400

    Cleanup stage3 packages, add openjdk11 packages

commit a66abf9
Author: Banks Troutman <[email protected]>
Date:   Tue Jul 14 02:20:00 2020 -0400

    Add stage2 packages, cleanup stage2

commit f41585f
Author: Banks Troutman <[email protected]>
Date:   Tue Jul 14 02:17:41 2020 -0400

    Disable Wifi and BT

commit 7345582
Author: Banks Troutman <[email protected]>
Date:   Tue Jul 14 02:17:09 2020 -0400

    Enable PiCam

commit 78c197f
Author: Banks Troutman <[email protected]>
Date:   Tue Jul 14 01:32:02 2020 -0400

    Add config
commit 9b70c00
Author: Franklin Harding <[email protected]>
Date:   Sun Mar 21 16:25:46 2021 -0700

    Update photonvision url

commit d3981d7
Merge: 023434d bf8c9f5
Author: Franklin Harding <[email protected]>
Date:   Sun Mar 21 16:21:53 2021 -0700

    Merge branch 'master' of https://github.com/RPi-Distro/pi-gen

commit 023434d
Merge: 9945483 225f698
Author: Franklin Harding <[email protected]>
Date:   Fri Jan 8 16:48:34 2021 -0800

    Merge branch 'master' of https://github.com/RPi-Distro/pi-gen

commit 9945483
Merge: ffe6261 a245720
Author: Franklin Harding <[email protected]>
Date:   Sat Dec 12 16:42:20 2020 -0800

    Merge pull request #1 from Bankst/patch-1

    PhotonVision GPU tweaks

commit a245720
Author: Banks T <[email protected]>
Date:   Sat Dec 12 18:35:30 2020 -0500

    Add libtbb2 package

commit 436053f
Author: Banks T <[email protected]>
Date:   Sat Dec 12 18:34:25 2020 -0500

    Increase GPU mem split

commit ffe6261
Merge: eda0d46 c1a7dae
Author: Franklin Harding <[email protected]>
Date:   Sat Sep 12 19:39:40 2020 -0700

    Merge branch 'master' of https://github.com/RPi-Distro/pi-gen into master

commit eda0d46
Author: Franklin Harding <[email protected]>
Date:   Sat Sep 12 18:10:07 2020 -0700

    Add -m flag to pigpio

commit e02436b
Author: Franklin Harding <[email protected]>
Date:   Mon Sep 7 12:07:17 2020 -0700

    Add shouldManage to photonvision config

commit 6d81d5f
Author: Franklin Harding <[email protected]>
Date:   Sun Sep 6 18:22:46 2020 -0700

    Add photonvision config

commit 5f1bb51
Author: Franklin Harding <[email protected]>
Date:   Sun Aug 2 01:32:55 2020 -0700

    Initial gloworm/photonvision work
Replaces cam 0 pins with cam 1 pins, deletes camera 1, maps camera0 to unicam port 0, and changes # cameras total to 1.
…e_img_merge

# Conflicts:
#	.github/workflows/build-docker.yml
#	config
#	stage1/00-boot-files/00-run.sh
#	stage1/00-boot-files/files/config.txt
#	stage2/01-sys-tweaks/00-packages
#	stage2/01-sys-tweaks/00-patches/08-pigpiod.diff
#	stage2/01-sys-tweaks/00-patches/series
#	stage2/01-sys-tweaks/files/photonvision.service
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants