Skip to content

Commit 31b65e7

Browse files
committed
extensions/ufs: don't check sfdisk version also when BUILDING_IMAGE!=yes
- fixes download-artifact issue - matrix-prep was solved by CONFIG_DEFS_ONLY previously
1 parent 4648add commit 31b65e7

1 file changed

Lines changed: 20 additions & 18 deletions

File tree

extensions/ufs.sh

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
11
# Create UFS aligned image (requires >= Debian 13 (Trixie) Host)
22
# declare -g DOCKER_ARMBIAN_BASE_IMAGE=debian:trixie # Use this env variable manually
33
function extension_prepare_config__ufs {
4-
# Skip version check if only generating config definitions
5-
if [[ "${CONFIG_DEFS_ONLY}" != "yes" ]]; then
6-
# Check sfdisk version is >= 2.41 for UFS support
7-
local sfdisk_version
8-
if ! command -v sfdisk >/dev/null 2>&1; then
9-
exit_with_error "sfdisk not found. Please install util-linux (provides sfdisk) >= 2.41."
10-
fi
11-
# Extract the util-linux version and strip any non-numeric characters for robustness
12-
sfdisk_version="$(sfdisk --version 2>/dev/null | awk '/util-linux/ {print $NF}' | tr -cd '0-9.')"
13-
if [[ -z "${sfdisk_version}" ]]; then
14-
exit_with_error "Unable to determine util-linux version from 'sfdisk --version'."
15-
fi
16-
if linux-version compare "${sfdisk_version}" lt "2.41"; then
17-
exit_with_error "UFS extension requires sfdisk >= 2.41 (from util-linux). Current version: ${sfdisk_version}"
18-
fi
19-
fi
20-
EXTRA_IMAGE_SUFFIXES+=("-ufs")
21-
declare -g SECTOR_SIZE=4096
4+
display_alert "UFS extension" "checks: CONFIG_DEFS_ONLY:${CONFIG_DEFS_ONLY}, BUILDING_IMAGE:${BUILDING_IMAGE}, ARMBIAN_COMMAND:${ARMBIAN_COMMAND}" "debug"
5+
6+
# Skip version check if only generating config definitions, or if not building an image.
7+
if [[ "${CONFIG_DEFS_ONLY}" != "yes" && "${BUILDING_IMAGE}" == "yes" ]]; then
8+
# Check sfdisk version is >= 2.41 for UFS support
9+
local sfdisk_version
10+
if ! command -v sfdisk > /dev/null 2>&1; then
11+
exit_with_error "sfdisk not found. Please install util-linux (provides sfdisk) >= 2.41."
12+
fi
13+
# Extract the util-linux version and strip any non-numeric characters for robustness
14+
sfdisk_version="$(sfdisk --version 2> /dev/null | awk '/util-linux/ {print $NF}' | tr -cd '0-9.')"
15+
if [[ -z "${sfdisk_version}" ]]; then
16+
exit_with_error "Unable to determine util-linux version from 'sfdisk --version'."
17+
fi
18+
if linux-version compare "${sfdisk_version}" lt "2.41"; then
19+
exit_with_error "UFS extension requires sfdisk >= 2.41 (from util-linux). Current version: ${sfdisk_version}"
20+
fi
21+
fi
22+
EXTRA_IMAGE_SUFFIXES+=("-ufs")
23+
declare -g SECTOR_SIZE=4096
2224
}

0 commit comments

Comments
 (0)