Skip to content

Fix incremental builds of topology2 that were missing ALSA_CONFIG_DIR. - #5255

Merged
ranj063 merged 3 commits into
thesofproject:mainfrom
marc-hb:alsa-config-dir
Jan 26, 2022
Merged

ranj063 merged 3 commits into
thesofproject:mainfrom
marc-hb:alsa-config-dir

Conversation

@marc-hb

@marc-hb marc-hb commented Jan 25, 2022 •

Copy link
Copy Markdown
Collaborator

3 commits, please review individually.

Follow-up to #5249 and before.

Zephyr requires CMake 3.21 and SOF requires 3.13, see
commit a0acad3 ("CMake: require version 3.13")

Fixes commit 4b2edf8 ("zephyr: wrapper: complete zephyr support for
working audio")

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
alsatplg accepts empty definitions -D "" so let's simplify
commit cb80023 ("topology2: fix build issues with no command line
definitions"); 10 lines shorter. The less CMake code the better.

Zero change, the build directory is bit for bit identical after this
commit.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
Fixes incremental builds of topology2 that were missing ALSA_CONFIG_DIR.

This was making it impossible to troubleshoot alsatplg issues like thesofproject#5249.
Now incremental builds fail or pass the same as builds from scratch.

Fixes commit 308a24a ("topology2: Add build support")

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
@marc-hb

marc-hb commented Jan 25, 2022

Copy link
Copy Markdown
Collaborator Author

Lucky me everything passed in https://sof-ci.01.org/sofpr/PR5255/build11770/devicetest/ except unrelated thesofproject/linux/issues/3370

@marc-hb

marc-hb commented Jan 26, 2022

Copy link
Copy Markdown
Collaborator Author

I left this as draft by mistake sorry.

@marc-hb
marc-hb marked this pull request as ready for review January 26, 2022 18:13
@ranj063
ranj063 merged commit 0bf7b73 into thesofproject:main Jan 26, 2022
@marc-hb
marc-hb deleted the alsa-config-dir branch January 26, 2022 18:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants