WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit 47b6618

Browse files
committed
UFS: Fix ci config generation
1 parent 347a93f commit 47b6618

File tree

1 file changed

+15
-12
lines changed

1 file changed

+15
-12
lines changed

extensions/ufs.sh

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
11
# Create UFS aligned image (requires >= Debian 13 (Trixie) Host)
22
declare -g DOCKER_ARMBIAN_BASE_IMAGE=debian:trixie
33
function extension_prepare_config__ufs {
4-
# Check sfdisk version is >= 2.41 for UFS support
5-
local sfdisk_version
6-
if ! command -v sfdisk >/dev/null 2>&1; then
7-
exit_with_error "sfdisk not found. Please install util-linux (provides sfdisk) >= 2.41."
8-
fi
9-
# Extract the util-linux version and strip any non-numeric characters for robustness
10-
sfdisk_version="$(sfdisk --version 2>/dev/null | awk '/util-linux/ {print $NF}' | tr -cd '0-9.')"
11-
if [[ -z "${sfdisk_version}" ]]; then
12-
exit_with_error "Unable to determine util-linux version from 'sfdisk --version'."
13-
fi
14-
if linux-version compare "${sfdisk_version}" lt "2.41"; then
15-
exit_with_error "UFS extension requires sfdisk >= 2.41 (from util-linux). Current version: ${sfdisk_version}"
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
1619
fi
1720
EXTRA_IMAGE_SUFFIXES+=("-ufs")
1821
declare -g SECTOR_SIZE=4096

0 commit comments

Comments
 (0)