diff options
| author | Kevin Brodsky <kevin.brodsky@arm.com> | 2020-01-27 11:28:32 +0000 |
|---|---|---|
| committer | Arvind Chauhan <arvind.chauhan@arm.com> | 2020-02-03 10:52:45 +0530 |
| commit | 89df04a501ae7f01346bb68baa2fccd56cab87d8 (patch) | |
| tree | af927029ce4c7fd5646ac53544e32b2adb1d0ae6 | |
| parent | 51aff8f9376e8236afc99606fcdecc99c418cfe9 (diff) | |
build-target-bins: Fix invalid indirect expansionarmlt-20200212-00120.01
uefi_out is not set if UEFI_BUILD_ENABLED == 0. In that case, using
${!uefi_out} doesn't make sense, since that would require expanding
a variable with no name. ${uefi_out} is what should be tested
instead. The same applies to uboot_out and UBOOT_BUILD_ENABLED.
Indirect expansion of an unset variable is an error since Bash 5
(and was already an error when run interactively before that).
Signed-off-by: Kevin Brodsky <kevin.brodsky@arm.com>
| -rwxr-xr-x | build-target-bins.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/build-target-bins.sh b/build-target-bins.sh index 7f92e7e..b3fa40c 100755 --- a/build-target-bins.sh +++ b/build-target-bins.sh @@ -316,7 +316,7 @@ do_package() fi - if [ "${!uboot_out}" != "" ]; then + if [ "${uboot_out}" != "" ]; then # remove existing fip rm -f ${PLATDIR}/${!target_name}/fip-uboot.bin mkdir -p ${PLATDIR}/${!target_name} @@ -360,7 +360,7 @@ do_package() ${PLATDIR}/${!target_name}/fip-uefi.bin fi - if [ "${!uefi_out}" != "" ]; then + if [ "${uefi_out}" != "" ]; then # remove existing fip rm -f ${PLATDIR}/${!target_name}/fip-uefi.bin mkdir -p ${PLATDIR}/${!target_name} @@ -386,10 +386,10 @@ do_package() if [ "${!scp_out}" != "" ]; then create_tgt_symlinks ${!scp_out} ${!target_name} "*cp_*" fi - if [ "${!uboot_out}" != "" ]; then + if [ "${uboot_out}" != "" ]; then create_tgt_symlinks ${!uboot_out} ${!target_name} "uboot*" fi - if [ "${!uefi_out}" != "" ]; then + if [ "${uefi_out}" != "" ]; then create_tgt_symlinks ${!uefi_out} ${!target_name} "uefi*" fi for tgt in ${!fdt_pattern}; do |