Skip to content

Commit

Permalink
tegra: tegra-state-scripts: remove obsolete scripts
Browse files Browse the repository at this point in the history
Now that we update the NVIDIA bootloader's state on every boot,
we no longer need the state scripts that were doing this after
upgrades/rollbacks, so remove the scripts that were doing that
and update others to remove the commands that were marking
the current boot slot successful.

Signed-off-by: Matt Madison <matt@madison.systems>
  • Loading branch information
madisongh committed Nov 11, 2020
1 parent 5c7a734 commit e61f9fa
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 52 deletions.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,3 @@ if [ "${devnam##/dev/mmcblk}" != "${devnam}" ]; then
exit 0
fi
fi

# Otherwise, just make sure the current slot is
# the one we're booting from
if ! nvbootctrl set-active-boot-slot $curslot; then
echo "ERR: could not set active boot slot to: $curslot" >&2
exit 1
fi
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
SRC_URI = " \
file://redundant-boot-commit-script \
file://redundant-boot-commit-check-script-uboot \
file://redundant-boot-install-script \
file://redundant-boot-install-script-uboot \
file://redundant-boot-rollback-script \
file://redundant-boot-rollback-script-uboot \
file://redundant-boot-rollback-reboot-script \
"

LICENSE = "Apache-2.0"
Expand All @@ -24,7 +21,6 @@ PERSIST_MACHINE_ID_mender-persist-systemd-machine-id = "yes"
# the machine-id.
copy_install_script() {
sed -e's,@COPY_MACHINE_ID@,${PERSIST_MACHINE_ID},' ${S}/redundant-boot-install-script > ${MENDER_STATE_SCRIPTS_DIR}/ArtifactInstall_Leave_80_bl-update
cp ${S}/redundant-boot-rollback-script ${MENDER_STATE_SCRIPTS_DIR}/ArtifactRollback_Leave_80_bl-rollback
}

copy_install_script_mender-uboot() {
Expand All @@ -33,11 +29,6 @@ copy_install_script_mender-uboot() {
cp ${S}/redundant-boot-commit-check-script-uboot ${MENDER_STATE_SCRIPTS_DIR}/ArtifactCommit_Enter_80_bl-check-update
}

copy_other_scripts() {
cp ${S}/redundant-boot-commit-script ${MENDER_STATE_SCRIPTS_DIR}/ArtifactCommit_Leave_90_bl-commit
cp ${S}/redundant-boot-rollback-reboot-script ${MENDER_STATE_SCRIPTS_DIR}/ArtifactRollbackReboot_Leave_90_bl-rolledback
}

# These scripts are only needed for tegra platforms with the
# A/B-redundant bootloader, which currently are just TX2
# (tegra186) and Xavier (tegra194).
Expand All @@ -47,12 +38,10 @@ do_compile() {

do_compile_tegra194() {
copy_install_script
copy_other_scripts
}

do_compile_tegra186() {
copy_install_script
copy_other_scripts
}

# Make sure scripts aren't left around from old builds
Expand Down

0 comments on commit e61f9fa

Please sign in to comment.