[ranj063]

If there are not command line definitions, the build fails because the
4th argument to the add_alsatplg2_command macro is NULL.

Fix this by using named arguments for the macro and checking for the
optional argument for command line definitions.

Signed-off-by: Ranjani Sridharan ranjani.sridharan@linux.intel.com

[aiChaoSONG]

The build issue is fixed by this PR. But I found something unusual. For the cavs-nocodec topology, if I build it manually with

export ALSA_CONFIG_DIR=~/sof/tools/topology/topology2
alsatplg -p -v1 -c tools/topology/topology2/cavs/cavs-nocodec.conf -o cavs-nocodec.tplg

the size of the generated cavs-nocodec.tplg is 23884. But if I build it with the script ./scripts/build-tools.sh -T, the size is 23887.
I compared the two topology, the difference is in the manifect section.

[bardliao]

I tested the cavs-nocodec.tplg built by ./scripts/build-tools.sh and it works.

[ranj063]

The build issue is fixed by this PR. But I found something unusual. For the cavs-nocodec topology, if I build it manually with

export ALSA_CONFIG_DIR=~/sof/tools/topology/topology2
alsatplg -p -v1 -c tools/topology/topology2/cavs/cavs-nocodec.conf -o cavs-nocodec.tplg

the size of the generated cavs-nocodec.tplg is 23884. But if I build it with the script ./scripts/build-tools.sh -T, the size is 23887. I compared the two topology, the difference is in the manifect section.

@aiChaoSONG that's expected right? When u build manually , you won't include the manifest data

[aiChaoSONG]

@ranj063 Oh, yes, that makes sense, it's the SOF ABI.

[marc-hb]

Why was this failing only for incremental builds and not when building from scratch??

[marc-hb]

Why was this failing only for incremental builds and not when building from scratch??

OK, mystery solved. The problem is ALSA_CONFIG_DIR is defined in ./scripts/build-tools.sh. This makes alsatplg fail differently when building incrementally = when using ./scripts/build-tools.sh vs not. I should have caught this in commit 308a24a

• Green failure when using ./scripts/build-tools.sh with ALSA_CONFIG_DIR defined:

ALSA lib parser.c:182:(tplg_parse_config) unknown section Object
ALSA lib parser.c:182:(tplg_parse_config) unknown section Class
ALSA lib parser.c:182:(tplg_parse_config) unknown section Define
ALSA lib parser.c:182:(tplg_parse_config) unknown section IncludeByKey
B0x000000/000000 - header index 0 type 8 count 1 size 0x70/112 vendor 0 version 0
B0x000024/000036 - manifest: write 112 bytes
B0x000094/000148 - manifest: write 0 priv bytes
B0x000094/000148 - total size is 0x94/148

The -p is swallowed by -D

This is IMHO a bug in alsatplg, unknown sections should error and not just warn? @bardliao or @aiChaoSONG if you agree could you please file a new bug at https://github.com/alsa-project/alsa-utils/issues ?

• Different, red failure when ALSA_CONFIG_DIR is not defined:

alsatplg -I sof.git/tools/topology/topology2/cavs -D -p -c cavs-gain-hdmi.conf -o cavs-gain-hdmi.tplg

ALSA lib conf.c:810:(get_char_skip_comments) Invalid search dir /usr/share/alsa/cavs
ALSA lib conf.c:2005:(_snd_config_load_with_include) _toplevel_:6:16:Invalid argument
ALSA lib parser.c:204:(tplg_load_config) could not load configuration
Unable to load configuration: Invalid argument

FAILED: topology/topology2/cavs/cavs-gain-hdmi.tplg 

I will submit a PR that moves ALSA_CONFIG_DIR to CMake so everything always passes or fails the same, not depending on how you build.