diff --git a/var_make_debian.sh b/var_make_debian.sh index 17872b3be84c..d262eb4e1ebd 100755 --- a/var_make_debian.sh +++ b/var_make_debian.sh @@ -749,15 +749,15 @@ 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..539f9623e74d 100644 --- a/variscite/weston_rootfs.sh +++ b/variscite/weston_rootfs.sh @@ -914,13 +914,13 @@ 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" + 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" - readonly local BOOTLOAD_RESERVE_SIZE=8 - readonly local SPARE_SIZE=4 + 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..10ee7f017282 100644 --- a/variscite/x11_rootfs.sh +++ b/variscite/x11_rootfs.sh @@ -134,15 +134,15 @@ 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}"