Fix building stable-v2.0 topologies with latest ALSA#5641
Merged
Conversation
The demux routing matrix and config are removed for two reasons: 1. the config 'demux_priv_1' is hardcoded for pipeline 1 only. 2. other m4 file with demux compoenet like pipe-volume-demux-playback has the matrix and config defined in the topology file. The topology which implement this pipeline should define the routing matrx and config named as 'demux_priv_<pipeline id>' before including this m4 file. Signed-off-by: Brent Lu <brent.lu@intel.com> (cherry picked from commit 771c2bb)
The string parser in alsa-lib is sensitive to these now. So fix it. Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> (cherry picked from commit db04155)
The recent changes to the string parser in alsa-lib cause the topology builds to break for some topologies. Avoid adding a newline for the bytes data for the MUXDEMUX config by introducing a new macro for creating lists without new lines between items. Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> (cherry picked from commit 3e1c160)
Remove the extra space to make the topology build with upstream alsa-lib. Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> (cherry picked from commit fcfd5d6)
marc-hb
requested review from
dbaluta,
lbetlej,
lgirdwood,
mmaka1 and
plbossart
as code owners
lgirdwood
approved these changes
Apr 2, 2022
Member
|
@marc-hb @kv2019i @greg-intel looks like we need to update the container with latest Zephyr toolchain ? |
Collaborator
Author
We don't use our own container for building Zephyr with the Zephyr SDK in .github Actions, we simply use the Zephyr container. https://github.com/thesofproject/sof/runs/5796986968 failed because the Zephyr container is too new for this stable branch. As you can see from any recent and successfully built PR (e.g. https://github.com/thesofproject/sof/runs/5814116267), the current toolchain location is: However Zephyr commit fd089b361d8ae (October 2021) used in 5796986968 here seems to expect: The simplest fix should be to fetch an older, more appropriate Zephyr container in .github/workflows/zephyr.yml Do we care? |
marc-hb
added a commit
to marc-hb/sof
that referenced
this pull request
Apr 6, 2022
The container v0.22.0 changed the toolchain locations, for instance for APL it changed from /opt/toolchains/zephyr-sdk-0.NN.0/xtensa/intel_apl_adsp/... to /opt/toolchains/zephyr-sdk-0.MM.0/xtensa-intel_apl_adsp_zephyr-elf/ The new location is not found by the old Zephyr version fd089b361d8aebbc that is currently hardcoded for this branch by previous SOF commit b678a4d. This causes the failure shown below, see real build failure example in thesofproject#5641. The docker image v0.21.0 is the last one that has the old location. https://hub.docker.com/r/zephyrprojectrtos/zephyr-build/tags I suspect the name change happened in this commit: zephyrproject-rtos/sdk-ng@c701e23bcce86f27f3a7 -- Using toolchain: zephyr 0.14.0 (/opt/toolchains/zephyr-sdk-0.14.0) -- Found dtc: /opt/toolchains/zephyr-sdk-0.14.0/sysroots/x86_64-pokysdk-linux/usr/bin/dtc (found suitable version "1.6.0", minimum required is "1.4.6") ... ... CMake Error at /workdir/zephyrproject/zephyr/cmake/compiler/gcc/target.cmake:10 -- Configuring incomplete, errors occurred! C compiler /opt/toolchains/zephyr-sdk-0.14.0/xtensa/intel_apl_adsp/ \ xtensa-intel_apl_adsp_zephyr-elf/bin/xtensa-intel_apl_adsp_zephyr-elf-gcc not found - Please check your toolchain installation Call Stack (most recent call first): /workdir/zephyrproject/zephyr/cmake/target_toolchain.cmake:57 /workdir/zephyrproject/zephyr/cmake/app/boilerplate.cmake:599 /.../zephyrproject/zephyr/share/zephyr-package/cmake/ZephyrConfig.cmake:24 /.../zephyrproject/zephyr/share/zephyr-package/cmake/ZephyrConfig.cmake:35 Signed-off-by: Marc Herbert <marc.herbert@intel.com>
Collaborator
Author
Apparently I care. Zephyr build for this branch fixed in #5654 |
lgirdwood
pushed a commit
that referenced
this pull request
Apr 8, 2022
The container v0.22.0 changed the toolchain locations, for instance for APL it changed from /opt/toolchains/zephyr-sdk-0.NN.0/xtensa/intel_apl_adsp/... to /opt/toolchains/zephyr-sdk-0.MM.0/xtensa-intel_apl_adsp_zephyr-elf/ The new location is not found by the old Zephyr version fd089b361d8aebbc that is currently hardcoded for this branch by previous SOF commit b678a4d. This causes the failure shown below, see real build failure example in #5641. The docker image v0.21.0 is the last one that has the old location. https://hub.docker.com/r/zephyrprojectrtos/zephyr-build/tags I suspect the name change happened in this commit: zephyrproject-rtos/sdk-ng@c701e23bcce86f27f3a7 -- Using toolchain: zephyr 0.14.0 (/opt/toolchains/zephyr-sdk-0.14.0) -- Found dtc: /opt/toolchains/zephyr-sdk-0.14.0/sysroots/x86_64-pokysdk-linux/usr/bin/dtc (found suitable version "1.6.0", minimum required is "1.4.6") ... ... CMake Error at /workdir/zephyrproject/zephyr/cmake/compiler/gcc/target.cmake:10 -- Configuring incomplete, errors occurred! C compiler /opt/toolchains/zephyr-sdk-0.14.0/xtensa/intel_apl_adsp/ \ xtensa-intel_apl_adsp_zephyr-elf/bin/xtensa-intel_apl_adsp_zephyr-elf-gcc not found - Please check your toolchain installation Call Stack (most recent call first): /workdir/zephyrproject/zephyr/cmake/target_toolchain.cmake:57 /workdir/zephyrproject/zephyr/cmake/app/boilerplate.cmake:599 /.../zephyrproject/zephyr/share/zephyr-package/cmake/ZephyrConfig.cmake:24 /.../zephyrproject/zephyr/share/zephyr-package/cmake/ZephyrConfig.cmake:35 Signed-off-by: Marc Herbert <marc.herbert@intel.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Same as #5632 but for stable-v2.0
Cherry-picks with almost no conflict, just a minor conflict for 3e1c160 caused by the lack of f41010d