Skip to content

Conversation

@rpardini
Copy link
Member

@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 ricardo@pardini.net

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 ricardo@pardini.net

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 ricardo@pardini.net

linuxkit: support builds using MacOS (amd64/arm64)

Signed-off-by: Ricardo Pardini ricardo@pardini.net

linuxkit: bump 1.5.0 -> 1.5.2

Signed-off-by: Ricardo Pardini ricardo@pardini.net

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 ricardo@pardini.net

ci/gha: run shellcheck before preparing the JSON matrix

  • ensures bash sanity and future maintainability

Signed-off-by: Ricardo Pardini ricardo@pardini.net

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 ricardo@pardini.net

…ockchip64 in upstream Armbian

Signed-off-by: Ricardo Pardini <ricardo@pardini.net>
- use inventory and output into json matrix

Signed-off-by: Ricardo Pardini <ricardo@pardini.net>
- 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 <ricardo@pardini.net>
Signed-off-by: Ricardo Pardini <ricardo@pardini.net>
Signed-off-by: Ricardo Pardini <ricardo@pardini.net>
- 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 <ricardo@pardini.net>
- ensures bash sanity and future maintainability

Signed-off-by: Ricardo Pardini <ricardo@pardini.net>
- turns out `$(uname -m)` can return `arm64` as well as `aarch64`

Signed-off-by: Ricardo Pardini <ricardo@pardini.net>
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
@rpardini rpardini deleted the fixes-batch-late-december-2024 branch March 5, 2025 10:05
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