Skip to content

Commit

Permalink
ci.yml: Temporarily don't build libscmi-server
Browse files Browse the repository at this point in the history
PR812 in SCP-firmware [1] has added some source files into
mod_scmi_perf directory, but it currently fails when building for the
optee-os case.
This is due to the fact that the current build system in optee, for
building the scmi-server fetched from SCP-firmware codebase, works well
under the assumption that only one source file is required.

To unlock the circular dependency between build systems and source
codes, temporarily remove the build for the scmi-server.

This will allow the following two patches to be safely merged into the
optee_os repo:
core: scmi-server: Add support for conditional options for SCMI-Perf
optee-fvp: Enable CFG_SCPFW_SCMI_PERF_PROTOCOL_OPS

Subsequently, PR812 in SCP-firmware can be merged, and immediately
a revert patch for this present one will follow to reintroduce the
libscmi-server build.

Link: ARM-software/SCP-firmware#812 [1]
Acked-by: Jerome Forissier <jerome.forissier@linaro.org>
Signed-off-by: Nicola Mazzucato <nicola.mazzucato@arm.com>
  • Loading branch information
nicola-mazzucato-arm committed Aug 10, 2023
1 parent 7ebfbe9 commit a6708aa
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,9 @@ jobs:
function _make() { make -j$(nproc) -s O=out $*; }
function download_plug_and_trust() { mkdir -p $HOME/se050 && git clone --single-branch -b v0.4.2 https://github.com/foundriesio/plug-and-trust $HOME/se050/plug-and-trust || (rm -rf $HOME/se050 ; echo Nervermind); }
function download_scp_firmware() { git clone --single-branch https://github.com/ARM-software/SCP-firmware.git $HOME/scp-firmware || echo Nervermind; }
#Temporarily disabled
function download_scp_firmware() {}
ccache -s -v
download_plug_and_trust
Expand Down

0 comments on commit a6708aa

Please sign in to comment.