Skip to content

Commit dab9c70

Browse files
committed
build: armbian kernels: use inventory_id (sans "armbian-" prefix) in kernel tag name
- previous approach only took the 2nd dash-field, which is not enough to uniquely identify kernels - avoid `uefi-x86-edge` and `uefi-arm64-edge` both competing for `uefi` Signed-off-by: Ricardo Pardini <[email protected]>
1 parent caa9518 commit dab9c70

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

bash/kernel/kernel_armbian.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ function calculate_kernel_version_armbian() {
103103
input_hash="$(cat "${ARMBIAN_KERNEL_DOCKERFILE}" | sha256sum - | cut -d ' ' -f 1)"
104104
short_input_hash="${input_hash:0:8}"
105105
kernel_oci_version="${ARMBIAN_KERNEL_MAJOR_MINOR_POINT}-${short_input_hash}"
106-
armbian_type="$( echo "${inventory_id}" | cut -d "-" -f 2 )"
107-
kernel_oci_image="${HOOK_KERNEL_OCI_BASE}-armbian:${kernel_oci_version}"-"${armbian_type}"
106+
armbian_type="${inventory_id#"armbian-"}" # remove the 'armbian-' prefix from inventory_id, but keep the rest. "uefi" has "current/edge" and "arm64/x86" variants.
107+
kernel_oci_image="${HOOK_KERNEL_OCI_BASE}-armbian:${kernel_oci_version}-${armbian_type}"
108108
log info "kernel_oci_version: ${kernel_oci_version}"
109109
log info "kernel_oci_image: ${kernel_oci_image}"
110110
}

0 commit comments

Comments
 (0)