Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

installers: escape quotes in assignment of variable 

Assignment of variable 'force_erase' was done without escaping quotes
which led to wrong assignment and the script not forcing the erasure of
NAND partitions.

While on it, remove it from ccmp1 scripts where its use makes no sense
as the 'ubivolscript' script takes care of erasing the partitions.


Signed-off-by: Francisco Gil <francisco.gilmartinez@digi.com>
This commit is contained in:
Francisco Gil 2025-03-05 16:41:29 +01:00
parent 549b28eb44
commit 96e1e8351d
4 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_sd.txt
View File

@ -171,7 +171,7 @@ setenv bootcmd "
if test \"\$\{singlemtdsys\}\" = yes; then if test \"\$\{singlemtdsys\}\" = yes; then
run ubivolscript; run ubivolscript;
else else
force_erase="-e"; force_erase=\"-e\";
fi; fi;
if test \"\$\{dualboot\}\" = yes; then if test \"\$\{dualboot\}\" = yes; then
echo \"\"; echo \"\";
@ -179,7 +179,7 @@ setenv bootcmd "
echo \">> Installing file ${INSTALL_LINUX_FILENAME} on linux_a\"; echo \">> Installing file ${INSTALL_LINUX_FILENAME} on linux_a\";
echo \"\"; echo \"\";
echo \"\"; echo \"\";
update linux_a mmc ${INSTALL_MMCDEV} ${INSTALL_LINUX_FILENAME} ${force_erase}; update linux_a mmc ${INSTALL_MMCDEV} ${INSTALL_LINUX_FILENAME} \$\{force_erase\};
if test \$? -eq 1; then if test \$? -eq 1; then
echo \"[ERROR] Failed to update linux_a!\"; echo \"[ERROR] Failed to update linux_a!\";
echo \"\"; echo \"\";
@ -192,7 +192,7 @@ setenv bootcmd "
echo \">> Installing file ${INSTALL_LINUX_FILENAME} on linux_b\"; echo \">> Installing file ${INSTALL_LINUX_FILENAME} on linux_b\";
echo \"\"; echo \"\";
echo \"\"; echo \"\";
update linux_b mmc ${INSTALL_MMCDEV} ${INSTALL_LINUX_FILENAME} ${force_erase}; update linux_b mmc ${INSTALL_MMCDEV} ${INSTALL_LINUX_FILENAME} \$\{force_erase\};
if test \$? -eq 1; then if test \$? -eq 1; then
echo \"[ERROR] Failed to update linux_b!\"; echo \"[ERROR] Failed to update linux_b!\";
echo \"\"; echo \"\";
@ -205,7 +205,7 @@ setenv bootcmd "
echo \">> Installing file ${INSTALL_ROOTFS_FILENAME} on rootfs_a\"; echo \">> Installing file ${INSTALL_ROOTFS_FILENAME} on rootfs_a\";
echo \"\"; echo \"\";
echo \"\"; echo \"\";
update rootfs_a mmc ${INSTALL_MMCDEV} ${INSTALL_ROOTFS_FILENAME} ${force_erase}; update rootfs_a mmc ${INSTALL_MMCDEV} ${INSTALL_ROOTFS_FILENAME} \$\{force_erase\};
if test \$? -eq 1; then if test \$? -eq 1; then
echo \"[ERROR] Failed to update rootfs_a partition!\"; echo \"[ERROR] Failed to update rootfs_a partition!\";
echo \"\"; echo \"\";
@ -218,7 +218,7 @@ setenv bootcmd "
echo \">> Installing file ${INSTALL_ROOTFS_FILENAME} on rootfs_b\"; echo \">> Installing file ${INSTALL_ROOTFS_FILENAME} on rootfs_b\";
echo \"\"; echo \"\";
echo \"\"; echo \"\";
update rootfs_b mmc ${INSTALL_MMCDEV} ${INSTALL_ROOTFS_FILENAME} ${force_erase}; update rootfs_b mmc ${INSTALL_MMCDEV} ${INSTALL_ROOTFS_FILENAME} \$\{force_erase\};
if test \$? -eq 1; then if test \$? -eq 1; then
echo \"[ERROR] Failed to update rootfs_b partition!\"; echo \"[ERROR] Failed to update rootfs_b partition!\";
echo \"\"; echo \"\";
@ -233,7 +233,7 @@ setenv bootcmd "
echo \">> Installing file ${INSTALL_LINUX_FILENAME} on linux\"; echo \">> Installing file ${INSTALL_LINUX_FILENAME} on linux\";
echo \"\"; echo \"\";
echo \"\"; echo \"\";
update linux mmc ${INSTALL_MMCDEV} ${INSTALL_LINUX_FILENAME} ${force_erase}; update linux mmc ${INSTALL_MMCDEV} ${INSTALL_LINUX_FILENAME} \$\{force_erase\};
if test \$? -eq 1; then if test \$? -eq 1; then
echo \"[ERROR] Failed to update linux!\"; echo \"[ERROR] Failed to update linux!\";
echo \"\"; echo \"\";
@ -245,7 +245,7 @@ setenv bootcmd "
echo \">> Installing file ${INSTALL_RECOVERY_FILENAME} on recovery\"; echo \">> Installing file ${INSTALL_RECOVERY_FILENAME} on recovery\";
echo \"\"; echo \"\";
echo \"\"; echo \"\";
update recovery mmc ${INSTALL_MMCDEV} ${INSTALL_RECOVERY_FILENAME} ${force_erase}; update recovery mmc ${INSTALL_MMCDEV} ${INSTALL_RECOVERY_FILENAME} \$\{force_erase\};
if test \$? -eq 1; then if test \$? -eq 1; then
echo \"[ERROR] Failed to update recovery partition!\"; echo \"[ERROR] Failed to update recovery partition!\";
echo \"\"; echo \"\";
@ -257,7 +257,7 @@ setenv bootcmd "
echo \">> Installing file ${INSTALL_ROOTFS_FILENAME} on rootfs\"; echo \">> Installing file ${INSTALL_ROOTFS_FILENAME} on rootfs\";
echo \"\"; echo \"\";
echo \"\"; echo \"\";
update rootfs mmc ${INSTALL_MMCDEV} ${INSTALL_ROOTFS_FILENAME} ${force_erase}; update rootfs mmc ${INSTALL_MMCDEV} ${INSTALL_ROOTFS_FILENAME} \$\{force_erase\};
if test \$? -eq 1; then if test \$? -eq 1; then
echo \"[ERROR] Failed to update rootfs partition!\"; echo \"[ERROR] Failed to update rootfs partition!\";
echo \"\"; echo \"\";

16
meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_usb.txt
View File

@ -173,7 +173,7 @@ setenv bootcmd "
if test \"\$\{singlemtdsys\}\" = yes; then if test \"\$\{singlemtdsys\}\" = yes; then
run ubivolscript; run ubivolscript;
else else
force_erase="-e"; force_erase=\"-e\";
fi; fi;
usb start; usb start;
if test \"\$\{dualboot\}\" = yes; then if test \"\$\{dualboot\}\" = yes; then
@ -182,7 +182,7 @@ setenv bootcmd "
echo \">> Installing file ${INSTALL_LINUX_FILENAME} on linux_a\"; echo \">> Installing file ${INSTALL_LINUX_FILENAME} on linux_a\";
echo \"\"; echo \"\";
echo \"\"; echo \"\";
update linux_a usb ${INSTALL_USBDEV} ${INSTALL_LINUX_FILENAME} ${force_erase}; update linux_a usb ${INSTALL_USBDEV} ${INSTALL_LINUX_FILENAME} \$\{force_erase\};
if test \$? -eq 1; then if test \$? -eq 1; then
echo \"[ERROR] Failed to update linux_a!\"; echo \"[ERROR] Failed to update linux_a!\";
echo \"\"; echo \"\";
@ -195,7 +195,7 @@ setenv bootcmd "
echo \">> Installing file ${INSTALL_LINUX_FILENAME} on linux_b\"; echo \">> Installing file ${INSTALL_LINUX_FILENAME} on linux_b\";
echo \"\"; echo \"\";
echo \"\"; echo \"\";
update linux_b usb ${INSTALL_USBDEV} ${INSTALL_LINUX_FILENAME} ${force_erase}; update linux_b usb ${INSTALL_USBDEV} ${INSTALL_LINUX_FILENAME} \$\{force_erase\};
if test \$? -eq 1; then if test \$? -eq 1; then
echo \"[ERROR] Failed to update linux_b!\"; echo \"[ERROR] Failed to update linux_b!\";
echo \"\"; echo \"\";
@ -208,7 +208,7 @@ setenv bootcmd "
echo \">> Installing file ${INSTALL_ROOTFS_FILENAME} on rootfs_a\"; echo \">> Installing file ${INSTALL_ROOTFS_FILENAME} on rootfs_a\";
echo \"\"; echo \"\";
echo \"\"; echo \"\";
update rootfs_a usb ${INSTALL_USBDEV} ${INSTALL_ROOTFS_FILENAME} ${force_erase}; update rootfs_a usb ${INSTALL_USBDEV} ${INSTALL_ROOTFS_FILENAME} \$\{force_erase\};
if test \$? -eq 1; then if test \$? -eq 1; then
echo \"[ERROR] Failed to update rootfs_a partition!\"; echo \"[ERROR] Failed to update rootfs_a partition!\";
echo \"\"; echo \"\";
@ -221,7 +221,7 @@ setenv bootcmd "
echo \">> Installing file ${INSTALL_ROOTFS_FILENAME} on rootfs_b\"; echo \">> Installing file ${INSTALL_ROOTFS_FILENAME} on rootfs_b\";
echo \"\"; echo \"\";
echo \"\"; echo \"\";
update rootfs_b usb ${INSTALL_USBDEV} ${INSTALL_ROOTFS_FILENAME} ${force_erase}; update rootfs_b usb ${INSTALL_USBDEV} ${INSTALL_ROOTFS_FILENAME} \$\{force_erase\};
if test \$? -eq 1; then if test \$? -eq 1; then
echo \"[ERROR] Failed to update rootfs_b partition!\"; echo \"[ERROR] Failed to update rootfs_b partition!\";
echo \"\"; echo \"\";
@ -236,7 +236,7 @@ setenv bootcmd "
echo \">> Installing file ${INSTALL_LINUX_FILENAME} on linux\"; echo \">> Installing file ${INSTALL_LINUX_FILENAME} on linux\";
echo \"\"; echo \"\";
echo \"\"; echo \"\";
update linux usb ${INSTALL_USBDEV} ${INSTALL_LINUX_FILENAME} ${force_erase}; update linux usb ${INSTALL_USBDEV} ${INSTALL_LINUX_FILENAME} \$\{force_erase\};
if test \$? -eq 1; then if test \$? -eq 1; then
echo \"[ERROR] Failed to update linux!\"; echo \"[ERROR] Failed to update linux!\";
echo \"\"; echo \"\";
@ -248,7 +248,7 @@ setenv bootcmd "
echo \">> Installing file ${INSTALL_RECOVERY_FILENAME} on recovery\"; echo \">> Installing file ${INSTALL_RECOVERY_FILENAME} on recovery\";
echo \"\"; echo \"\";
echo \"\"; echo \"\";
update recovery usb ${INSTALL_USBDEV} ${INSTALL_RECOVERY_FILENAME} ${force_erase}; update recovery usb ${INSTALL_USBDEV} ${INSTALL_RECOVERY_FILENAME} \$\{force_erase\};
if test \$? -eq 1; then if test \$? -eq 1; then
echo \"[ERROR] Failed to update recovery partition!\"; echo \"[ERROR] Failed to update recovery partition!\";
echo \"\"; echo \"\";
@ -260,7 +260,7 @@ setenv bootcmd "
echo \">> Installing file ${INSTALL_ROOTFS_FILENAME} on rootfs\"; echo \">> Installing file ${INSTALL_ROOTFS_FILENAME} on rootfs\";
echo \"\"; echo \"\";
echo \"\"; echo \"\";
update rootfs usb ${INSTALL_USBDEV} ${INSTALL_ROOTFS_FILENAME} ${force_erase}; update rootfs usb ${INSTALL_USBDEV} ${INSTALL_ROOTFS_FILENAME} \$\{force_erase\};
if test \$? -eq 1; then if test \$? -eq 1; then
echo \"[ERROR] Failed to update rootfs partition!\"; echo \"[ERROR] Failed to update rootfs partition!\";
echo \"\"; echo \"\";

14
meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_sd.txt
View File

@ -173,7 +173,7 @@ setenv bootcmd "
echo \">> Installing file ${INSTALL_LINUX_FILENAME} on linux_a\"; echo \">> Installing file ${INSTALL_LINUX_FILENAME} on linux_a\";
echo \"\"; echo \"\";
echo \"\"; echo \"\";
update linux_a mmc ${INSTALL_MMCDEV} ${INSTALL_LINUX_FILENAME} ${force_erase}; update linux_a mmc ${INSTALL_MMCDEV} ${INSTALL_LINUX_FILENAME};
if test \$? -eq 1; then if test \$? -eq 1; then
echo \"[ERROR] Failed to update linux_a!\"; echo \"[ERROR] Failed to update linux_a!\";
echo \"\"; echo \"\";
@ -186,7 +186,7 @@ setenv bootcmd "
echo \">> Installing file ${INSTALL_LINUX_FILENAME} on linux_b\"; echo \">> Installing file ${INSTALL_LINUX_FILENAME} on linux_b\";
echo \"\"; echo \"\";
echo \"\"; echo \"\";
update linux_b mmc ${INSTALL_MMCDEV} ${INSTALL_LINUX_FILENAME} ${force_erase}; update linux_b mmc ${INSTALL_MMCDEV} ${INSTALL_LINUX_FILENAME};
if test \$? -eq 1; then if test \$? -eq 1; then
echo \"[ERROR] Failed to update linux_b!\"; echo \"[ERROR] Failed to update linux_b!\";
echo \"\"; echo \"\";
@ -199,7 +199,7 @@ setenv bootcmd "
echo \">> Installing file ${INSTALL_ROOTFS_FILENAME} on rootfs_a\"; echo \">> Installing file ${INSTALL_ROOTFS_FILENAME} on rootfs_a\";
echo \"\"; echo \"\";
echo \"\"; echo \"\";
update rootfs_a mmc ${INSTALL_MMCDEV} ${INSTALL_ROOTFS_FILENAME} ${force_erase}; update rootfs_a mmc ${INSTALL_MMCDEV} ${INSTALL_ROOTFS_FILENAME};
if test \$? -eq 1; then if test \$? -eq 1; then
echo \"[ERROR] Failed to update rootfs_a partition!\"; echo \"[ERROR] Failed to update rootfs_a partition!\";
echo \"\"; echo \"\";
@ -212,7 +212,7 @@ setenv bootcmd "
echo \">> Installing file ${INSTALL_ROOTFS_FILENAME} on rootfs_b\"; echo \">> Installing file ${INSTALL_ROOTFS_FILENAME} on rootfs_b\";
echo \"\"; echo \"\";
echo \"\"; echo \"\";
update rootfs_b mmc ${INSTALL_MMCDEV} ${INSTALL_ROOTFS_FILENAME} ${force_erase}; update rootfs_b mmc ${INSTALL_MMCDEV} ${INSTALL_ROOTFS_FILENAME};
if test \$? -eq 1; then if test \$? -eq 1; then
echo \"[ERROR] Failed to update rootfs_b partition!\"; echo \"[ERROR] Failed to update rootfs_b partition!\";
echo \"\"; echo \"\";
@ -227,7 +227,7 @@ setenv bootcmd "
echo \">> Installing file ${INSTALL_LINUX_FILENAME} on linux\"; echo \">> Installing file ${INSTALL_LINUX_FILENAME} on linux\";
echo \"\"; echo \"\";
echo \"\"; echo \"\";
update linux mmc ${INSTALL_MMCDEV} ${INSTALL_LINUX_FILENAME} ${force_erase}; update linux mmc ${INSTALL_MMCDEV} ${INSTALL_LINUX_FILENAME};
if test \$? -eq 1; then if test \$? -eq 1; then
echo \"[ERROR] Failed to update linux!\"; echo \"[ERROR] Failed to update linux!\";
echo \"\"; echo \"\";
@ -239,7 +239,7 @@ setenv bootcmd "
echo \">> Installing file ${INSTALL_RECOVERY_FILENAME} on recovery\"; echo \">> Installing file ${INSTALL_RECOVERY_FILENAME} on recovery\";
echo \"\"; echo \"\";
echo \"\"; echo \"\";
update recovery mmc ${INSTALL_MMCDEV} ${INSTALL_RECOVERY_FILENAME} ${force_erase}; update recovery mmc ${INSTALL_MMCDEV} ${INSTALL_RECOVERY_FILENAME};
if test \$? -eq 1; then if test \$? -eq 1; then
echo \"[ERROR] Failed to update recovery partition!\"; echo \"[ERROR] Failed to update recovery partition!\";
echo \"\"; echo \"\";
@ -251,7 +251,7 @@ setenv bootcmd "
echo \">> Installing file ${INSTALL_ROOTFS_FILENAME} on rootfs\"; echo \">> Installing file ${INSTALL_ROOTFS_FILENAME} on rootfs\";
echo \"\"; echo \"\";
echo \"\"; echo \"\";
update rootfs mmc ${INSTALL_MMCDEV} ${INSTALL_ROOTFS_FILENAME} ${force_erase}; update rootfs mmc ${INSTALL_MMCDEV} ${INSTALL_ROOTFS_FILENAME};
if test \$? -eq 1; then if test \$? -eq 1; then
echo \"[ERROR] Failed to update rootfs partition!\"; echo \"[ERROR] Failed to update rootfs partition!\";
echo \"\"; echo \"\";

14
meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_usb.txt
View File

@ -176,7 +176,7 @@ setenv bootcmd "
echo \">> Installing file ${INSTALL_LINUX_FILENAME} on linux_a\"; echo \">> Installing file ${INSTALL_LINUX_FILENAME} on linux_a\";
echo \"\"; echo \"\";
echo \"\"; echo \"\";
update linux_a usb ${INSTALL_USBDEV} ${INSTALL_LINUX_FILENAME} ${force_erase}; update linux_a usb ${INSTALL_USBDEV} ${INSTALL_LINUX_FILENAME};
if test \$? -eq 1; then if test \$? -eq 1; then
echo \"[ERROR] Failed to update linux_a!\"; echo \"[ERROR] Failed to update linux_a!\";
echo \"\"; echo \"\";
@ -189,7 +189,7 @@ setenv bootcmd "
echo \">> Installing file ${INSTALL_LINUX_FILENAME} on linux_b\"; echo \">> Installing file ${INSTALL_LINUX_FILENAME} on linux_b\";
echo \"\"; echo \"\";
echo \"\"; echo \"\";
update linux_b usb ${INSTALL_USBDEV} ${INSTALL_LINUX_FILENAME} ${force_erase}; update linux_b usb ${INSTALL_USBDEV} ${INSTALL_LINUX_FILENAME};
if test \$? -eq 1; then if test \$? -eq 1; then
echo \"[ERROR] Failed to update linux_b!\"; echo \"[ERROR] Failed to update linux_b!\";
echo \"\"; echo \"\";
@ -202,7 +202,7 @@ setenv bootcmd "
echo \">> Installing file ${INSTALL_ROOTFS_FILENAME} on rootfs_a\"; echo \">> Installing file ${INSTALL_ROOTFS_FILENAME} on rootfs_a\";
echo \"\"; echo \"\";
echo \"\"; echo \"\";
update rootfs_a usb ${INSTALL_USBDEV} ${INSTALL_ROOTFS_FILENAME} ${force_erase}; update rootfs_a usb ${INSTALL_USBDEV} ${INSTALL_ROOTFS_FILENAME};
if test \$? -eq 1; then if test \$? -eq 1; then
echo \"[ERROR] Failed to update rootfs_a partition!\"; echo \"[ERROR] Failed to update rootfs_a partition!\";
echo \"\"; echo \"\";
@ -215,7 +215,7 @@ setenv bootcmd "
echo \">> Installing file ${INSTALL_ROOTFS_FILENAME} on rootfs_b\"; echo \">> Installing file ${INSTALL_ROOTFS_FILENAME} on rootfs_b\";
echo \"\"; echo \"\";
echo \"\"; echo \"\";
update rootfs_b usb ${INSTALL_USBDEV} ${INSTALL_ROOTFS_FILENAME} ${force_erase}; update rootfs_b usb ${INSTALL_USBDEV} ${INSTALL_ROOTFS_FILENAME};
if test \$? -eq 1; then if test \$? -eq 1; then
echo \"[ERROR] Failed to update rootfs_b partition!\"; echo \"[ERROR] Failed to update rootfs_b partition!\";
echo \"\"; echo \"\";
@ -230,7 +230,7 @@ setenv bootcmd "
echo \">> Installing file ${INSTALL_LINUX_FILENAME} on linux\"; echo \">> Installing file ${INSTALL_LINUX_FILENAME} on linux\";
echo \"\"; echo \"\";
echo \"\"; echo \"\";
update linux usb ${INSTALL_USBDEV} ${INSTALL_LINUX_FILENAME} ${force_erase}; update linux usb ${INSTALL_USBDEV} ${INSTALL_LINUX_FILENAME};
if test \$? -eq 1; then if test \$? -eq 1; then
echo \"[ERROR] Failed to update linux!\"; echo \"[ERROR] Failed to update linux!\";
echo \"\"; echo \"\";
@ -242,7 +242,7 @@ setenv bootcmd "
echo \">> Installing file ${INSTALL_RECOVERY_FILENAME} on recovery\"; echo \">> Installing file ${INSTALL_RECOVERY_FILENAME} on recovery\";
echo \"\"; echo \"\";
echo \"\"; echo \"\";
update recovery usb ${INSTALL_USBDEV} ${INSTALL_RECOVERY_FILENAME} ${force_erase}; update recovery usb ${INSTALL_USBDEV} ${INSTALL_RECOVERY_FILENAME};
if test \$? -eq 1; then if test \$? -eq 1; then
echo \"[ERROR] Failed to update recovery partition!\"; echo \"[ERROR] Failed to update recovery partition!\";
echo \"\"; echo \"\";
@ -254,7 +254,7 @@ setenv bootcmd "
echo \">> Installing file ${INSTALL_ROOTFS_FILENAME} on rootfs\"; echo \">> Installing file ${INSTALL_ROOTFS_FILENAME} on rootfs\";
echo \"\"; echo \"\";
echo \"\"; echo \"\";
update rootfs usb ${INSTALL_USBDEV} ${INSTALL_ROOTFS_FILENAME} ${force_erase}; update rootfs usb ${INSTALL_USBDEV} ${INSTALL_ROOTFS_FILENAME};
if test \$? -eq 1; then if test \$? -eq 1; then
echo \"[ERROR] Failed to update rootfs partition!\"; echo \"[ERROR] Failed to update rootfs partition!\";
echo \"\"; echo \"\";