chore(tc): add QCBOR dependency unconditionally
The following configs rely on QCBOR:
- DICE_PROTECTION_ENVIRONMENT=1
- PLATFORM_TEST=tfm-testsuite
Add it unconditionally to simplify the build.
Change-Id: I7b6a17809d00a4961e3aea4974550451c1732eb4
Signed-off-by: Tamas Ban <tamas.ban@arm.com>
diff --git a/run_config/fvp-linux.tc b/run_config/fvp-linux.tc
index 11b116e..f703379 100644
--- a/run_config/fvp-linux.tc
+++ b/run_config/fvp-linux.tc
@@ -48,22 +48,20 @@
local qcbor_release_archive="qcbor-v1_2.tar.gz"
local qcbor_folder="qcbor"
- if [ "$(get_tf_opt DICE_PROTECTION_ENVIRONMENT)" = 1 ]; then
- pushd "$workspace"
+ pushd "$workspace"
- if [ ! -d "qcbor" ]; then
- saveas="${qcbor_release_archive}" \
- url="https://github.com/laurencelundblade/QCBOR/archive/refs/tags/v1.2.tar.gz" \
- fetch_file
- mkdir $qcbor_folder
- tar -xzf "${qcbor_release_archive}" --directory=$qcbor_folder --strip-component=1
- fi
-
- echo "Set QCBOR_DIR to $workspace/qcbor"
- set_hook_var "QCBOR_DIR" "$workspace/qcbor"
-
- popd "$workspace"
+ if [ ! -d "qcbor" ]; then
+ saveas="${qcbor_release_archive}" \
+ url="https://github.com/laurencelundblade/QCBOR/archive/refs/tags/v1.2.tar.gz" \
+ fetch_file
+ mkdir $qcbor_folder
+ tar -xzf "${qcbor_release_archive}" --directory=$qcbor_folder --strip-component=1
fi
+
+ echo "Set QCBOR_DIR to $workspace/qcbor"
+ set_hook_var "QCBOR_DIR" "$workspace/qcbor"
+
+ popd "$workspace"
}
generate_lava_job_template() {