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.

Sign up for GitHub

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

Jump to bottom

Nitrokey:up-pr-nitropads-nx + circleci config fix + Makefile fix #1449

Closed
wants to merge 12 commits into from
Closed

Nitrokey:up-pr-nitropads-nx + circleci config fix + Makefile fix #1449

wants to merge 12 commits into from

Conversation

tlaurion
Copy link
Collaborator

@tlaurion tlaurion commented Aug 3, 2023 •
edited
Loading

Needed fix so that #1417 builds on CircleCI.

Purism was alone using build/x86/coreboot-git to use their coreboot fork. Now Nitrokey is also using the same directory and needs to switch repo to a specific commit, having all submodules inititalized properly with what is in the repo, reflecting it on disk prior of building.

Putting as draft, but might be a replacement to #1417 since my account is linked to CircleCI and will show build status and permit people to test that no regression happens

TODO

  • Regression testing of HOTP bersion bump on other platforms.

CircleCI status for builds should show up soon, direct link at https://app.circleci.com/pipelines/github/tlaurion/heads/1861/workflows/08f5fbf5-3073-4b60-8793-b64ae6d33743

@tlaurion tlaurion marked this pull request as draft August 3, 2023 19:52
@tlaurion tlaurion changed the title Nitrokey up pr nitropads nx circleci fix makefile fix Nitrokey:up-pr-nitropads-nx + circleci config fix + Makefile fix Aug 3, 2023
@tlaurion tlaurion force-pushed the Nitrokey_up-pr-nitropads-nx_circleci-fix_Makefile-fix branch from 682aafc to 74dd183 Compare August 3, 2023 21:42
This was referenced Aug 4, 2023
Open
Merged
krystian-hebel added a commit to Dasharo/heads that referenced this pull request Aug 5, 2023
@krystian-hebel
test
25fedec 
Another approach at linuxboot#1449

Signed-off-by: Krystian Hebel <krystian.hebel@3mdeb.com>
@krystian-hebel krystian-hebel mentioned this pull request Aug 5, 2023
Closed
daringer and others added 12 commits August 5, 2023 10:05
@daringer @tlaurion
modules/iotools: add as binary
d42c3a1
@daringer @tlaurion
modules/nitrokey-blobs: add
4e4575a
@daringer @tlaurion
modules/coreboot: add 'nitrokey' version
ddd04a7 
* use CONFIG_COREBOOT_COMMIT_HASH to enable configuration of commit hash
  inside the board configuration
@daringer @tlaurion
add nitropad-shutdown.sh for EC based poweroff
af7961e
@daringer @tlaurion
modules/hotp-verification: update to v1.4
d03ba96 
* add Nitrokey 3 support
* corrected UI issues, when PIN is not set
* add serial number getter
* improve HID calls speed
* Full changelogs to be found here: https://github.com/Nitrokey/nitrokey-hotp-verification/releases
@daringer @tlaurion
boards: add nitropad-nv41 + nitropad-ns50
f22d904
@daringer @tlaurion
oem-factory-reset: allow to set gpg key algorithm
74c6425 
* CONFIG_GPG_DEFAULT_ALGO defaults to RSA 3072 if not set
* currently only p256 is supported as alternative
* added p256 for nitropad ns50/nv41 boards
@daringer @tlaurion
flash-gui.sh: add .npf handling; add create-npf.sh
f948eed
@daringer @tlaurion
reboot/poweroff: run nitropad-shutdown.sh for required boards
b9079c4
@daringer @tlaurion
ci: activate 'nitropad-nv41' + 'nitropad-ns50'
40c8344
@tlaurion
coreboot: nitrokey coreboot-git repo based on clevo/release + patch f…
42f7e4d 
…or IASL
@tlaurion
CircleCI & Makefile: fixes needed for coreboot-git/cache reuse
0c454d5 
CircleCI: depend on NV41 for save_cache
Makefile: consider that coreboot-git is now shared between forks on x86 (Nitrokey/Purism share build/x86/coreboot-git now)
modules/coreboot: have clevo/nv boards based on dasharo fork and apply clevo_patches

Addressesses requested change at linuxboot#1417 (review)

co-Signed-off-by: Krystian Hebel <krystian.hebel@3mdeb.com> and insurgo@riseup.net
@tlaurion tlaurion force-pushed the Nitrokey_up-pr-nitropads-nx_circleci-fix_Makefile-fix branch from 74dd183 to 0c454d5 Compare August 5, 2023 14:06
@tlaurion
Copy link
Collaborator Author

tlaurion commented Aug 5, 2023

@daringer changes in last two commits:

  • modules/coreboot changed to point to dasharo/coreboot, taking into consideration what is under patches/coreboot-clevo_release in the build process to ease quick mitigation between Dasharo release (and dodging Nitrokey'sfork which applied that patch on top of Dasharo/coreboot and nothing else) giving dasharo proper credit for coreboot development and permitting to keep track of missing upstream patches on their side just looking in the patch directory before next release.
  • Makefile modified to be able to deal properly with fork switching and submodules init (thanks @krystian-hebel, I had not the proper git fu to deal with this properly, took me 2 days of testing while still failing, you saved my sanity).

Todo:

daringer pushed a commit to Nitrokey/heads that referenced this pull request Aug 7, 2023
@krystian-hebel @daringer
Makefile: final fixes for parallel coreboot builds
5239ff2 
Another approach at linuxboot#1449

Signed-off-by: Krystian Hebel <krystian.hebel@3mdeb.com>
daringer pushed a commit to Nitrokey/heads that referenced this pull request Aug 7, 2023
@krystian-hebel @daringer
Makefile: final fixes for parallel coreboot builds
85bde57 
Another approach at linuxboot#1449

Signed-off-by: Krystian Hebel <krystian.hebel@3mdeb.com>
Signed-off-by: Markus Meissner <coder@safemailbox.de>
daringer pushed a commit to Nitrokey/heads that referenced this pull request Aug 7, 2023
@krystian-hebel @daringer
Makefile: fix for multiple coreboot CI builds
6d08031 
Another approach at linuxboot#1449

Signed-off-by: Krystian Hebel <krystian.hebel@3mdeb.com>
krystian-hebel added a commit to Dasharo/heads that referenced this pull request Aug 7, 2023
@krystian-hebel
test
ca8282f 
Another approach at linuxboot#1449

Signed-off-by: Krystian Hebel <krystian.hebel@3mdeb.com>
krystian-hebel added a commit to Dasharo/heads that referenced this pull request Aug 7, 2023
@krystian-hebel
test
cd0ea03 
Another approach at linuxboot#1449

Signed-off-by: Krystian Hebel <krystian.hebel@3mdeb.com>
krystian-hebel added a commit to Dasharo/heads that referenced this pull request Aug 7, 2023
@krystian-hebel
test
ac12738 
Another approach at linuxboot#1449

Signed-off-by: Krystian Hebel <krystian.hebel@3mdeb.com>
@tlaurion tlaurion mentioned this pull request Aug 7, 2023
Open
2 tasks
krystian-hebel added a commit to Dasharo/heads that referenced this pull request Aug 8, 2023
@krystian-hebel
test
2b03a11 
Another approach at linuxboot#1449

Signed-off-by: Krystian Hebel <krystian.hebel@3mdeb.com>
krystian-hebel added a commit to Dasharo/heads that referenced this pull request Aug 9, 2023
@krystian-hebel
test
b1fbd01 
Another approach at linuxboot#1449

Signed-off-by: Krystian Hebel <krystian.hebel@3mdeb.com>
@tlaurion
Copy link
Collaborator Author

#1462 approach wins over this one

@tlaurion tlaurion closed this Aug 11, 2023
tlaurion pushed a commit to tlaurion/heads that referenced this pull request Aug 15, 2023
@krystian-hebel @tlaurion
Makefile: fix for multiple coreboot CI builds
b73fc6c 
Another approach at linuxboot#1449

Signed-off-by: Krystian Hebel <krystian.hebel@3mdeb.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@tlaurion @daringer