From bc6f3fb574040210a787ba10da3fefb2ed36ea2b Mon Sep 17 00:00:00 2001 From: Hangfan Li Date: Wed, 11 Nov 2026 18:15:07 +0800 Subject: [PATCH] tools: enforce script inclusion and guards --- tools/build_rootfs.sh | 3 +-- tools/fs_helper/ext4.sh | 7 +++++++ tools/fs_helper/vfat.sh | 7 +++++++ tools/image_creation_helper.sh | 11 +++++++++++ tools/image_helper/partitioned_disk.sh | 9 +++++++++ tools/image_layout_helper.sh | 9 +++++++++ tools/logging.sh | 5 +++++ tools/partition_table_helper/guid.sh | 12 ++++++++++++ tools/receipe_helper.sh | 7 +++++++ 9 files changed, 68 insertions(+), 2 deletions(-) diff --git a/tools/build_rootfs.sh b/tools/build_rootfs.sh index 352eab0..e04b47b 100755 --- a/tools/build_rootfs.sh +++ b/tools/build_rootfs.sh @@ -6,6 +6,7 @@ set -o errexit set -o nounset . ./logging.sh +. ./receipe_helper.sh export PSEUDO_PREFIX="${PSEUDO_PREFIX:-/usr}" export PSEUDO_LOCALSTATEDIR="${PSEUDO_LOCALSTATEDIR:-/var/pseudo}" @@ -16,8 +17,6 @@ OUTPUT_ARCHIVE="" PACKAGE_MANAGER="" COMPRESSION="" -. ./receipe_helper.sh - generate_rootfs() { SCRIPT_ENV_SETUP_CMD=" export ROOTFS_DIR=${ROOTFS_DIR} && diff --git a/tools/fs_helper/ext4.sh b/tools/fs_helper/ext4.sh index 75aeb0b..0016b8d 100644 --- a/tools/fs_helper/ext4.sh +++ b/tools/fs_helper/ext4.sh @@ -1,5 +1,12 @@ #!/usr/bin/env false +if [ -n "${__SOURCE_GUARD_FS_HELPER_EXT4:-}" ]; then + return 0 +fi +__SOURCE_GUARD_FS_HELPER_EXT4=1 + +. ./logging.sh + readonly FILESYSTEM_EXT4_SECTOR_SIZE_DEFAULT=4096 filesystem_generate_uuid_ext4() { diff --git a/tools/fs_helper/vfat.sh b/tools/fs_helper/vfat.sh index 7c083f0..dbcf0dd 100644 --- a/tools/fs_helper/vfat.sh +++ b/tools/fs_helper/vfat.sh @@ -1,5 +1,12 @@ #!/usr/bin/env false +if [ -n "${__SOURCE_GUARD_FS_HELPER_VFAT:-}" ]; then + return 0 +fi +__SOURCE_GUARD_FS_HELPER_VFAT=1 + +. ./logging.sh + readonly FILESYSTEM_VFAT_SECTOR_SIZE_DEFAULT=512 filesystem_generate_uuid_vfat() { diff --git a/tools/image_creation_helper.sh b/tools/image_creation_helper.sh index c4a5680..69ce192 100644 --- a/tools/image_creation_helper.sh +++ b/tools/image_creation_helper.sh @@ -1,3 +1,14 @@ +#!/usr/bin/env false + +if [ -n "${__SOURCE_GUARD_IMAGE_CREATION_HELPER:-}" ]; then + return 0 +fi +__SOURCE_GUARD_IMAGE_CREATION_HELPER=1 + +. ./logging.sh +. ./receipe_helper.sh +. ./fs_helper/vfat.sh +. ./fs_helper/ext4.sh . ./image_helper/partitioned_disk.sh filesystem_creation_order() { diff --git a/tools/image_helper/partitioned_disk.sh b/tools/image_helper/partitioned_disk.sh index ec82488..9c30f90 100644 --- a/tools/image_helper/partitioned_disk.sh +++ b/tools/image_helper/partitioned_disk.sh @@ -1,5 +1,14 @@ #!/usr/bin/env false +if [ -n "${__SOURCE_GUARD_IMAGE_HELPER_PARTITIONED_DISK:-}" ]; then + return 0 +fi +__SOURCE_GUARD_IMAGE_HELPER_PARTITIONED_DISK=1 + +. ./logging.sh +. ./receipe_helper.sh +. ./partition_table_helper/guid.sh + # A partitioned disk configuration must describe: # - PARTITION_TABLE_TYPE # - PARTITION_x_USAGE diff --git a/tools/image_layout_helper.sh b/tools/image_layout_helper.sh index b3dc0b4..370fdc2 100644 --- a/tools/image_layout_helper.sh +++ b/tools/image_layout_helper.sh @@ -1,5 +1,14 @@ #!/usr/bin/env false +if [ -n "${__SOURCE_GUARD_IMAGE_LAYOUT_HELPER:-}" ]; then + return 0 +fi +__SOURCE_GUARD_IMAGE_LAYOUT_HELPER=1 + +. ./logging.sh +. ./receipe_helper.sh +. ./partition_table_helper/guid.sh + parse_image_layout_impl_output_format_partitioned_disk() { logi "Parsing partitioned_disk image" if [ -z ${PARTITION_TABLE_TYPE+x} ]; then diff --git a/tools/logging.sh b/tools/logging.sh index 2c8ccc8..9ca1fdd 100644 --- a/tools/logging.sh +++ b/tools/logging.sh @@ -1,5 +1,10 @@ #!/usr/bin/env false +if [ -n "${__SOURCE_GUARD_LOGGING:-}" ]; then + return 0 +fi +__SOURCE_GUARD_LOGGING=1 + readonly LOGLEVEL_VERBOSE=0 readonly LOGLEVEL_DEBUG=1 readonly LOGLEVEL_INFO=2 diff --git a/tools/partition_table_helper/guid.sh b/tools/partition_table_helper/guid.sh index b4146f7..a4c9bd8 100644 --- a/tools/partition_table_helper/guid.sh +++ b/tools/partition_table_helper/guid.sh @@ -1,3 +1,15 @@ +#!/usr/bin/env false + +if [ -n "${__SOURCE_GUARD_PARTITION_TABLE_HELPER_GUID:-}" ]; then + return 0 +fi +__SOURCE_GUARD_PARTITION_TABLE_HELPER_GUID=1 + +. ./logging.sh +. ./receipe_helper.sh +. ./fs_helper/vfat.sh +. ./fs_helper/ext4.sh + # Defaults to 1MB partition alignment for better fs support readonly GUID_PARTITION_DEFAULT_ALIGNMENT="$(( 1024 * 1024 ))" diff --git a/tools/receipe_helper.sh b/tools/receipe_helper.sh index 099a41b..a2dd591 100644 --- a/tools/receipe_helper.sh +++ b/tools/receipe_helper.sh @@ -1,5 +1,12 @@ #!/usr/bin/env false +if [ -n "${__SOURCE_GUARD_RECEIPE_HELPER:-}" ]; then + return 0 +fi +__SOURCE_GUARD_RECEIPE_HELPER=1 + +. ./logging.sh + is_function() { type "$1" 2>/dev/null | head -n 1 | grep 'function' > /dev/null }