Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
igorpecovnik merged 1 commit into from
Jan 6, 2026
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 20 additions & 18 deletions extensions/ufs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}