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

batch of small fixes and enhancements - late december'2024 #255

Merged
merged 8 commits into from
Jan 6, 2025

Conversation

rpardini
Copy link
Contributor

@rpardini rpardini commented Dec 22, 2024

inventory: drop rk3588 flavor, as that has been merged with generic rockchip64 in upstream Armbian

Signed-off-by: Ricardo Pardini [email protected]

ci/inventory: de-hardcode list of flavors for which .iso's are built

  • use inventory and output into json matrix

Signed-off-by: Ricardo Pardini [email protected]

bash: make the lk yaml templating via envsubst a bit less tedious

  • introduce hook_template_vars dict (KEY=value)
    • with HOOK_VERSION, HOOK_KERNEL_IMAGE et al directly
  • remove the nameref from build_hook_linuxkit_container, instead set directly in the hook_template_vars dict (HOOK_CONTAINER_BOOTKIT_IMAGE et al)
  • derive the envsubst dollar-prefixed list and the actual vars from the dict
  • before: refer to the variable 3 times (settage, export, dollar)
  • after: add variable to dict (once)

Signed-off-by: Ricardo Pardini [email protected]

linuxkit: support builds using MacOS (amd64/arm64)

Signed-off-by: Ricardo Pardini [email protected]

linuxkit: bump 1.5.0 -> 1.5.2

Signed-off-by: Ricardo Pardini [email protected]

bash: squash some shellcheck warnings

  • dead code for kernel_id_to_use (we're using USE_KERNEL_ID directly)
  • quoting for the USE_LATEST_BUILT_KERNEL case

Signed-off-by: Ricardo Pardini [email protected]

ci/gha: run shellcheck before preparing the JSON matrix

  • ensures bash sanity and future maintainability

Signed-off-by: Ricardo Pardini [email protected]

bash: better support for building under Apple Silicon aarch64/arm64

  • turns out $(uname -m) can return arm64 as well as aarch64

Signed-off-by: Ricardo Pardini [email protected]

…ockchip64 in upstream Armbian

Signed-off-by: Ricardo Pardini <[email protected]>
- use inventory and output into json matrix

Signed-off-by: Ricardo Pardini <[email protected]>
- introduce `hook_template_vars` dict (KEY=value)
  - with `HOOK_VERSION`, `HOOK_KERNEL_IMAGE` et al directly
- remove the nameref from `build_hook_linuxkit_container`, instead set directly in the `hook_template_vars` dict (`HOOK_CONTAINER_BOOTKIT_IMAGE` et al)
- derive the envsubst dollar-prefixed list and the actual vars from the dict
- before: refer to the variable 3 times (settage, export, dollar)
- after: add variable to dict (once)

Signed-off-by: Ricardo Pardini <[email protected]>
Signed-off-by: Ricardo Pardini <[email protected]>
- dead code for `kernel_id_to_use` (we're using USE_KERNEL_ID directly)
- quoting for the `USE_LATEST_BUILT_KERNEL` case

Signed-off-by: Ricardo Pardini <[email protected]>
- ensures bash sanity and future maintainability

Signed-off-by: Ricardo Pardini <[email protected]>
- turns out `$(uname -m)` can return `arm64` as well as `aarch64`

Signed-off-by: Ricardo Pardini <[email protected]>
Copy link
Member

@jacobweinstock jacobweinstock left a comment

Choose a reason for hiding this comment

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

Thanks, @rpardini !

@jacobweinstock jacobweinstock added the ready-to-merge Signal to Mergify to merge the PR. label Jan 6, 2025
@mergify mergify bot merged commit 3aec0bb into tinkerbell:main Jan 6, 2025
29 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-to-merge Signal to Mergify to merge the PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants