From a6b3a7c70a62be6bbbf739ecd0b267d7a55e4b52 Mon Sep 17 00:00:00 2001 From: Manuel Dipolt Date: Thu, 28 Mar 2024 09:38:26 +0100 Subject: [PATCH 1/3] make real local readonly local vars, readonly local generates global readonly vars --- var_make_debian.sh | 17 ++++++++--------- variscite/weston_rootfs.sh | 13 ++++++------- variscite/x11_rootfs.sh | 17 ++++++++--------- 3 files changed, 22 insertions(+), 25 deletions(-) diff --git a/var_make_debian.sh b/var_make_debian.sh index 17872b3be84c..c0e0a4630c87 100755 --- a/var_make_debian.sh +++ b/var_make_debian.sh @@ -749,15 +749,14 @@ function make_uboot() # $3 -- output dir # $4 -- ubi file name function make_ubi() { - readonly local _rootfs=${1}; - readonly local _tmp=${2}; - readonly local _output=${3}; - readonly local _ubi_file_name=${4}; - - readonly local UBI_CFG="${_tmp}/ubi.cfg" - readonly local UBIFS_IMG="${_tmp}/rootfs.ubifs" - readonly local UBI_IMG="${_output}/${_ubi_file_name}" - readonly local UBIFS_ROOTFS_DIR="${DEF_BUILDENV}/rootfs_ubi_tmp" + declare -r _rootfs=${1}; + declare -r _tmp=${2}; + declare -r _output=${3}; + declare -r _ubi_file_name=${4}; + declare -r UBI_CFG="${_tmp}/ubi.cfg" + declare -r UBIFS_IMG="${_tmp}/rootfs.ubifs" + declare -r UBI_IMG="${_output}/${_ubi_file_name}" + declare -r UBIFS_ROOTFS_DIR="${DEF_BUILDENV}/rootfs_ubi_tmp" rm -rf ${UBIFS_ROOTFS_DIR} cp -a ${_rootfs} ${UBIFS_ROOTFS_DIR} diff --git a/variscite/weston_rootfs.sh b/variscite/weston_rootfs.sh index 3b9fe3ee152c..60973a5450b5 100644 --- a/variscite/weston_rootfs.sh +++ b/variscite/weston_rootfs.sh @@ -914,13 +914,12 @@ EOF # $2 -- output images dir function make_weston_sdcard() { - readonly local LPARAM_BLOCK_DEVICE=${1} - readonly local LPARAM_OUTPUT_DIR=${2} - readonly local P1_MOUNT_DIR="${G_TMP_DIR}/p1" - readonly local DEBIAN_IMAGES_TO_ROOTFS_POINT="opt/images/Debian" - - readonly local BOOTLOAD_RESERVE_SIZE=8 - readonly local SPARE_SIZE=4 + declare -r LPARAM_BLOCK_DEVICE=${1} + declare -r LPARAM_OUTPUT_DIR=${2} + declare -r P1_MOUNT_DIR="${G_TMP_DIR}/p1" + declare -r DEBIAN_IMAGES_TO_ROOTFS_POINT="opt/images/Debian" + declare -r BOOTLOAD_RESERVE_SIZE=8 + declare -r SPARE_SIZE=4 [ "${LPARAM_BLOCK_DEVICE}" = "na" ] && { pr_error "No valid block device: ${LPARAM_BLOCK_DEVICE}" diff --git a/variscite/x11_rootfs.sh b/variscite/x11_rootfs.sh index dcae4786618b..7926d79ee0b2 100644 --- a/variscite/x11_rootfs.sh +++ b/variscite/x11_rootfs.sh @@ -134,15 +134,14 @@ rm -f cleanup # $1 -- block device # $2 -- output images dir function make_x11_sdcard() { - readonly local LPARAM_BLOCK_DEVICE=${1} - readonly local LPARAM_OUTPUT_DIR=${2} - readonly local P1_MOUNT_DIR="${G_TMP_DIR}/p1" - readonly local P2_MOUNT_DIR="${G_TMP_DIR}/p2" - readonly local DEBIAN_IMAGES_TO_ROOTFS_POINT="opt/images/Debian" - - readonly local BOOTLOAD_RESERVE=4 - readonly local BOOT_ROM_SIZE=12 - readonly local SPARE_SIZE=0 + declare -r LPARAM_BLOCK_DEVICE=${1} + declare -r LPARAM_OUTPUT_DIR=${2} + declare -r P1_MOUNT_DIR="${G_TMP_DIR}/p1" + declare -r P2_MOUNT_DIR="${G_TMP_DIR}/p2" + declare -r DEBIAN_IMAGES_TO_ROOTFS_POINT="opt/images/Debian" + declare -r BOOTLOAD_RESERVE=4 + declare -r BOOT_ROM_SIZE=12 + declare -r SPARE_SIZE=0 [ "${LPARAM_BLOCK_DEVICE}" = "na" ] && { pr_warning "No valid block device: ${LPARAM_BLOCK_DEVICE}" From 7bbf256f1eaf54c50db5162baf98898679c27b3a Mon Sep 17 00:00:00 2001 From: Manuel Dipolt Date: Thu, 28 Mar 2024 09:41:48 +0100 Subject: [PATCH 2/3] newline --- var_make_debian.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/var_make_debian.sh b/var_make_debian.sh index c0e0a4630c87..d262eb4e1ebd 100755 --- a/var_make_debian.sh +++ b/var_make_debian.sh @@ -753,6 +753,7 @@ function make_ubi() { declare -r _tmp=${2}; declare -r _output=${3}; declare -r _ubi_file_name=${4}; + declare -r UBI_CFG="${_tmp}/ubi.cfg" declare -r UBIFS_IMG="${_tmp}/rootfs.ubifs" declare -r UBI_IMG="${_output}/${_ubi_file_name}" From 59ff91e984e374906b4d8927abdfdee4f60d7ff3 Mon Sep 17 00:00:00 2001 From: Manuel Dipolt Date: Thu, 28 Mar 2024 09:42:42 +0100 Subject: [PATCH 3/3] newline.. --- variscite/weston_rootfs.sh | 1 + variscite/x11_rootfs.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/variscite/weston_rootfs.sh b/variscite/weston_rootfs.sh index 60973a5450b5..539f9623e74d 100644 --- a/variscite/weston_rootfs.sh +++ b/variscite/weston_rootfs.sh @@ -918,6 +918,7 @@ function make_weston_sdcard() declare -r LPARAM_OUTPUT_DIR=${2} declare -r P1_MOUNT_DIR="${G_TMP_DIR}/p1" declare -r DEBIAN_IMAGES_TO_ROOTFS_POINT="opt/images/Debian" + declare -r BOOTLOAD_RESERVE_SIZE=8 declare -r SPARE_SIZE=4 diff --git a/variscite/x11_rootfs.sh b/variscite/x11_rootfs.sh index 7926d79ee0b2..10ee7f017282 100644 --- a/variscite/x11_rootfs.sh +++ b/variscite/x11_rootfs.sh @@ -139,6 +139,7 @@ function make_x11_sdcard() { declare -r P1_MOUNT_DIR="${G_TMP_DIR}/p1" declare -r P2_MOUNT_DIR="${G_TMP_DIR}/p2" declare -r DEBIAN_IMAGES_TO_ROOTFS_POINT="opt/images/Debian" + declare -r BOOTLOAD_RESERVE=4 declare -r BOOT_ROM_SIZE=12 declare -r SPARE_SIZE=0