enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

extensions/ufs: don't check sfdisk version also when BUILDING_IMAGE!=yes

Browse Source 
- fixes download-artifact issue
  - matrix-prep was solved by CONFIG_DEFS_ONLY previously
This commit is contained in:
Ricardo Pardini 2026-01-02 05:08:31 +01:00 committed by Igor
parent 88de6d8758
commit ee2f374f7b
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
extensions/ufs.sh
View File

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