Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SKIP SOFCI-TEST] topology: build using a local ALSA install #9870

Open
wants to merge 5 commits into
base: main
Choose a base branch
from

Conversation

lgirdwood
Copy link
Member

Build topologies using a locally installed ALSA lib and ALSA utils without having to use Docker or upgrade the system ALSA installation.

@lgirdwood
Copy link
Member Author

This wont pass CI yet, pending a alsa-utils fix to upstream 1st before merge.

@lgirdwood lgirdwood added the DNM Do Not Merge tag label Mar 3, 2025
Copy link
Collaborator

@kv2019i kv2019i left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, Windows CI jobs looking green, so seems topology builds are attempted at limited places. We do need to update the CI flows were topologies are built before merge.

# Array of ALSA Git repository URLs. Add or remove repositories as needed.
declare -a REPOS=(
"https://github.com/alsa-project/alsa-lib.git"
"https://github.com/alsa-project/alsa-utils.git"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Btw, the docker script for alsa-utils has built ALSA from thesofproject repos of alsa-lib and alsa-utils. I don't see an issue using upstream repos though, just as long we capture the commit-id to build in SOF side to ensure only versions we have validated are used.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

@@ -1,18 +1,19 @@
set(SOF_TOPOLOGY_BINARY_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")

set(SOF_ALSA_TOOLS_DIR "${SOF_ROOT_SOURCE_DIRECTORY}/../tools/bin")
set(ALSATPLG_CMD "${SOF_ALSA_TOOLS_DIR}/alsatplg")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems this is passing Windows CI runs, so apparently there's no attempt to run this (which is good).

We do need to add a call to new build script somewhere in our build flows, and somewhere that is specific to Linux. E.g. our SOF jenkins build now failing:
https://sof-ci.01.org/sofpr/PR9870/build11207/build/topology/tplg.log

CMake Warning at topology/CMakeLists.txt:16 (message):
/home/sof/work/sof.git/tools/../../tools/bin/alsatplg --version returned
status: No such file or directory,

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is due to the missing alsa-utils patch

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed that part for github workflows that doen't use Docker

@lgirdwood lgirdwood force-pushed the lrg/topic/local-alsa branch 2 times, most recently from e5c19f6 to 1cf54d0 Compare March 5, 2025 13:01
@lgirdwood lgirdwood force-pushed the lrg/topic/local-alsa branch 8 times, most recently from 838b80a to b3670cb Compare March 8, 2025 10:03
@lgirdwood lgirdwood changed the title topology: build using a local ALSA install [SKIP SOFCI-TEST] topology: build using a local ALSA install Mar 8, 2025
@lgirdwood lgirdwood force-pushed the lrg/topic/local-alsa branch 7 times, most recently from c89110c to 140a0ec Compare March 8, 2025 14:31
lgirdwood and others added 2 commits March 8, 2025 14:44
This script builds a local installation of ALSA lib and associated
ALSA utilities that does not impact the system ALSA installation.

This will enable a later update to locally build topologies without
using the docker container.

Signed-off-by: Liam Girdwood <[email protected]>
Add a command line option to rebuild the ALSA libraries and tools
required to build all topologies.

Signed-off-by: Liam Girdwood <[email protected]>
@lgirdwood lgirdwood force-pushed the lrg/topic/local-alsa branch 11 times, most recently from 83241bc to 11ad0e1 Compare March 8, 2025 16:10
lrgirdwo and others added 3 commits March 8, 2025 16:36
Update testbench to build withou docker and use a local ALSA lib
and ALSA utils version from SOF ALSA git to align with latest
topology developments.

Signed-off-by: Liam Girdwood <[email protected]>
Dont use the system ALSA installation which may be out of date with
current topology development. Use the locally installed ALSA lib and
utils installed in the SOF workspace.

Signed-off-by: Liam Girdwood <[email protected]>
The installer workflow uses the legacy SDK build tools and is no longer
valid for Zephyr based SDK migration.

This also reduces effort in maintaining a SOF Docker container.

Signed-off-by: Liam Girdwood <[email protected]>
@lgirdwood lgirdwood force-pushed the lrg/topic/local-alsa branch from 11ad0e1 to da8184e Compare March 8, 2025 16:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
DNM Do Not Merge tag
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants