scripts/generate: Fix use of wrong Rust toolchain

This commit is contained in:
Jeremy Soller
2022-05-16 12:18:20 -06:00
parent 650b9843d3
commit ef56bc8925

View File

@@ -49,8 +49,10 @@ MODEL_DIR=$(realpath "models/${MODEL}")
echo "Generating data for coreboot..." echo "Generating data for coreboot..."
cargo build --release --manifest-path=tools/coreboot-collector/Cargo.toml pushd tools/coreboot-collector
sudo ./tools/coreboot-collector/target/release/coreboot-collector > "${MODEL_DIR}/coreboot-collector.txt" cargo build --release
sudo target/release/coreboot-collector > "${MODEL_DIR}/coreboot-collector.txt"
popd
${SCRIPT_DIR}/coreboot-gpio.sh "${MODEL_DIR}/coreboot-collector.txt" > "${MODEL_DIR}/gpio.h" ${SCRIPT_DIR}/coreboot-gpio.sh "${MODEL_DIR}/coreboot-collector.txt" > "${MODEL_DIR}/gpio.h"
${SCRIPT_DIR}/coreboot-hda.sh "${MODEL_DIR}/coreboot-collector.txt" > "${MODEL_DIR}/hda_verb.c" ${SCRIPT_DIR}/coreboot-hda.sh "${MODEL_DIR}/coreboot-collector.txt" > "${MODEL_DIR}/hda_verb.c"
@@ -96,11 +98,13 @@ then
cp "${EC_ROM}" "${MODEL_DIR}/ec.rom" cp "${EC_ROM}" "${MODEL_DIR}/ec.rom"
else else
echo "Generating output for System76 EC firmware" echo "Generating output for System76 EC firmware"
cargo build --release --manifest-path=ec/ecspy/Cargo.toml pushd ec/ecspy
cargo build --release
# TODO: Set backlights and fans to max and restore after # TODO: Set backlights and fans to max and restore after
sudo ./ec/ecspy/target/release/ecspy > "${MODEL_DIR}/ecspy.txt" sudo target/release/ecspy > "${MODEL_DIR}/ecspy.txt"
# Strip EC RAM entries from output # Strip EC RAM entries from output
sed -i '/^0x/d' "${MODEL_DIR}/ecspy.txt" sed -i '/^0x/d' "${MODEL_DIR}/ecspy.txt"
popd
fi fi
fi fi