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

Update gokr-update-firmware to also pull *.dtbo from overlays #309

Merged
merged 1 commit into from
Dec 13, 2023
Merged

Update gokr-update-firmware to also pull *.dtbo from overlays #309

merged 1 commit into from
Dec 13, 2023

Conversation

Doridian
Copy link
Contributor

@Doridian Doridian commented Dec 13, 2023

Logic has been mostly kept the same, but some changes were necessary to avoid duplicating the whole "check and do update" part of the for loop

Paired with gokrazy/tools#67

@@ -54,7 +54,7 @@ jobs:
BOOTERY_URL: ${{ secrets.BOOTERY_URL }}
if: ${{ env.GH_USER != 0 }}
run: |
if ! gokr-has-label please-merge && ! gokr-has-label please-boot; then go install ./cmd/gokr-update-firmware && gokr-update-firmware && GOPROXY=direct go install github.com/gokrazy/autoupdate/cmd/gokr-amend@latest && gokr-amend -set_label=please-boot *.bin *.elf *.dat; fi
if ! gokr-has-label please-merge && ! gokr-has-label please-boot; then go install ./cmd/gokr-update-firmware && gokr-update-firmware && GOPROXY=direct go install github.com/gokrazy/autoupdate/cmd/gokr-amend@latest && gokr-amend -set_label=please-boot *.bin *.elf *.dat overlays; fi
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since rsync -av is used in gokr-amend, this will work perfectly (as -a enables recursion)

@stapelberg stapelberg merged commit c96d7de into gokrazy:main Dec 13, 2023
1 check passed
stapelberg added a commit that referenced this pull request Jun 23, 2024
This reverts commit c96d7de.

The overlays files are now shipped with the gokrazy/kernel.rpi repository.

related to gokrazy/gokrazy#264
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