diff options
| author | Jeff Hatch <jhatch@multitech.com> | 2022-01-14 08:44:44 -0600 |
|---|---|---|
| committer | Jeff Hatch <jhatch@multitech.com> | 2022-01-14 08:44:44 -0600 |
| commit | 977cb7a392ad53f9ced4015aaae0bfc5020c0dd1 (patch) | |
| tree | 20a989bc1e7f09691c76f79d1b67906c326b153a | |
| parent | 74cd6f60661574c0d09ada7419860950114bec00 (diff) | |
| parent | 2f418b2b6e7d0c28cd95b4e4b50dab0402e0370a (diff) | |
| download | meta-mlinux-atmel-977cb7a392ad53f9ced4015aaae0bfc5020c0dd1.tar.gz meta-mlinux-atmel-977cb7a392ad53f9ced4015aaae0bfc5020c0dd1.tar.bz2 meta-mlinux-atmel-977cb7a392ad53f9ced4015aaae0bfc5020c0dd1.zip | |
Merge branch 'vs/mtx-4338' into '6'
Vs/mtx 4338
See merge request !16
| -rw-r--r-- | recipes-core/images/mlinux-minimal-image.bb | 2 | ||||
| -rwxr-xr-x | recipes-core/mlinux-scripts/mlinux-scripts/mlinux-firmware-upgrade | 17 |
2 files changed, 13 insertions, 6 deletions
diff --git a/recipes-core/images/mlinux-minimal-image.bb b/recipes-core/images/mlinux-minimal-image.bb index 3337b89..0cf4c92 100644 --- a/recipes-core/images/mlinux-minimal-image.bb +++ b/recipes-core/images/mlinux-minimal-image.bb @@ -35,7 +35,7 @@ CORE_FEATURES_append_mtcap = " mt-dt-overlay " CORE_FEATURES_append_mtrv1 = " mt-dt-overlay " CORE_FEATURES_append_mtcdt = " mt-dt-overlay " -NETWORKING_FEATURES = "ppp ppp-waitforresetfunc curl iproute2 \ +NETWORKING_FEATURES = "ppp curl iproute2 \ iptables iputils \ " diff --git a/recipes-core/mlinux-scripts/mlinux-scripts/mlinux-firmware-upgrade b/recipes-core/mlinux-scripts/mlinux-scripts/mlinux-firmware-upgrade index a6e6d68..360b553 100755 --- a/recipes-core/mlinux-scripts/mlinux-scripts/mlinux-firmware-upgrade +++ b/recipes-core/mlinux-scripts/mlinux-scripts/mlinux-firmware-upgrade @@ -68,9 +68,11 @@ for (( i = 0; i < ${#files[@]}; i++ )); do logger -s -t firmware_upgrade "MD5 is not found for the $file, upgrade aborted" exit 1 fi - if ! tar -xO -f $upgrade $file | md5sum -c $file.md5; then - logger -s -t firmware_upgrade "MD5 check failed, upgrade aborted" - exit 1 + if ((dofactoryreset == 0)) ; then + if ! tar -xO -f $upgrade $file | md5sum -c $file.md5; then + logger -s -t firmware_upgrade "MD5 check failed, upgrade aborted" + exit 1 + fi fi tobeflashed=1 fi @@ -95,8 +97,13 @@ if (( $tobeflashed )); then done fi mkdir -p /var/volatile/flash-upgrade - mv -f $upgrade /var/volatile/flash-upgrade/upgrade.bin - touch "${dofile}" + newbinfile=/var/volatile/flash-upgrade/upgrade.bin + mv -f $upgrade $newbinfile + if ((dofactoryreset == 1)) ; then + tar -xO -f "${newbinfile}" do_flash_upgrade >"$dofile" + else + touch "$dofile" + fi chown "root:root" "${dofile}" || true uid=$(stat -c %u "${dofile}") || true result=$? |