diff --git a/justfile b/justfile index 2da1fc7..97cb023 100644 --- a/justfile +++ b/justfile @@ -4,16 +4,24 @@ export BB_GENISO_SECURE_BOOT_URL := "https://gitlab.com/wunker-bunker/wunker-os/ export BB_GENISO_ENROLLMENT_PASSWORD := "wunker" export BB_GENISO_VARIANT := "kinoite" -generate-iso recipe tag="latest": +generate-iso recipe: #!/usr/bin/env nu - let name = open {{ recipe }} | get name + let recipe = open {{ recipe }} + | default [] alt-tags + | select name alt-tags + let tag = if ($recipe.alt-tags | is-empty) { + 'latest' + } else { + $recipe.alt-tags | first + } + let name = $recipe.name let image = $'( $env.BB_REGISTRY )/( $env.BB_REGISTRY_NAMESPACE )/( $name - ):{{ tag }}' + ):($tag)' (^bluebuild generate-iso --iso-name $'($name).iso' diff --git a/recipes/base/common.yml b/recipes/base/common.yml index a85af3c..017ff5f 100644 --- a/recipes/base/common.yml +++ b/recipes/base/common.yml @@ -99,7 +99,6 @@ modules: auto-remove: false packages: - fedora-flathub-remote - - fedora-third-party replace: # mitigate upstream packaging bug: https://bugzilla.redhat.com/show_bug.cgi?id=2332429 # swap the incorrectly installed OpenCL-ICD-Loader for ocl-icd, the expected package