Skip to content

tools: stop copying v2 topologies to the v1 directory #5716

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.

Sign up for GitHub

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

Merged
lgirdwood merged 2 commits into from
Apr 25, 2022
Merged

tools: stop copying v2 topologies to the v1 directory #5716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80770ca
installer: explain why we install only sof-*.tplg files
marc-hb Apr 22, 2022
2bbc8ef
tools: stop copying v2 topologies to the v1 directory
marc-hb Apr 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions installer/GNUmakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,8 @@ ifneq (true,${BUILD_ONLY_ONCE})
.PHONY: ${BUILD_TOOLS}
endif

# Deploy and release only "official", top-level topology files starting
# with the 'sof-' prefix to avoid any experimental stuff.
topologies: ${BUILD_TOOLS}
install ${INSTALL_OPTS} -t ${STAGING_SOF_TPLG}${VERSION_SUFFIX}/ \
${BUILD_TOOLS}/topology/sof-*.tplg
Expand Down
4 changes: 1 addition & 3 deletions tools/topology/topology1/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,9 +239,7 @@ set(TPLGS
# down.
add_subdirectory(production)

# "Install" all v1 production topologies two directory levels up. In the
# future, v2 topologies will be "installed" instead in the same place so
# users get upgraded without doing anything.
# "Install" all v1 production topologies two directory levels up.
add_custom_target(topologies1 ALL
COMMAND ${CMAKE_COMMAND} -E copy_directory production ${SOF_TOPOLOGY_BINARY_DIRECTORY}
)
Expand Down
9 changes: 1 addition & 8 deletions tools/topology/topology2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
# SPDX-License-Identifier: BSD-3-Clause
add_custom_target(topologies2
COMMAND ${CMAKE_COMMAND} -E copy_directory cavs ${SOF_TOPOLOGY_BINARY_DIRECTORY}
)
add_custom_target(topologies2)

# check alsatplg version and built topology2 if alsatplg version is 1.2.6 or greater
# This will override any common topologies built with topology1
execute_process(COMMAND alsatplg --version RESULT_VARIABLE STATUS OUTPUT_VARIABLE ALSA_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
if(STATUS AND NOT STATUS EQUAL 0)
message(WARNING "alsatplg error: ${STATUS}, topology2 will be skipped")
Expand All @@ -16,10 +13,6 @@ else()
message(WARNING "topology2 will be skipped. Minimum required version for alsatplg: 1.2.6")
else()
add_dependencies(topologies topologies2)

# make sure topology1 always builds first so that the installed binaries from v2 override the ones from v1
add_dependencies(topologies2 topologies1)

endif()
endif()

Expand Down
1 change: 0 additions & 1 deletion tools/topology/topology2/cavs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ execute_process(
OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/abi.conf
)

# This will override the topology1 binaries with topology2 binaries
add_custom_target(topology2_cavs)
add_dependencies(topologies2 topology2_cavs)

Expand Down