Skip to content

make real local readonly local vars, readonly local generates global … #27

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

Open
xeniter wants to merge 3 commits into
base: debian_bullseye_var01
Choose a base branch
from
Open

make real local readonly local vars, readonly local generates global … #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a6b3a7c
make real local readonly local vars, readonly local generates global …
xeniter Mar 28, 2024
7bbf256
newline
xeniter Mar 28, 2024
59ff91e
newline..
xeniter Mar 28, 2024
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
18 changes: 9 additions & 9 deletions var_make_debian.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
12 changes: 6 additions & 6 deletions variscite/weston_rootfs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
18 changes: 9 additions & 9 deletions variscite/x11_rootfs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down