HWE Next

~canonical-hwe-team/hwe-next/+git/sof:stable-v2.0

  1. Git
  2. lp:~canonical-hwe-team/hwe-next/+git/sof
  3. stable-v2.0
Last commit made on 2022-04-27
Get this branch:
git clone -b stable-v2.0 https://git.launchpad.net/~canonical-hwe-team/hwe-next/+git/sof

Branch merges

Branch information

Name:
stable-v2.0
Repository:
lp:~canonical-hwe-team/hwe-next/+git/sof

Recent commits

0edbeeb... by Marc Herbert <email address hidden>

zephyr/docker-build.sh: match UID with 'adduser' instead of 'chgrp -R'

Some conflicts because this branch does not have the new
xtensa-build-zephyr.py, it still uses xtensa-build-zephyr.sh

This fixes SOF version.cmake which was just broken by a recent git
security update and started to fail like this:

```
  -- SOF version.cmake starting at 2022-04-25T18:14:56Z UTC
  -- /workdir/zephyr/.. is at git commit with parent(s):
  fatal: unsafe repository ('/workdir' is owned by someone else)
  To add an exception for this directory, call:

   git config --global --add safe.directory /workdir
```
(example at https://github.com/thesofproject/sof/runs/6162885265)

chgrp -R was always an ugly hack because it was messing with
(persistent) file permissions on the host, outside the container. This
new adduser solution is unfortunately much more code but it does not
leak any side effect outside the container.

Do not fix scripts/docker-run.sh yet because there is still no UID
mismatch between Github Actions and the SOF container (they're both
1001) but add a warning + TODO.

Signed-off-by: Marc Herbert <email address hidden>
(cherry picked from commit d09844ab98cc0f03681d2edbc0395a4f3e1a17ee)

4c0143b... by Marc Herbert <email address hidden>

docker-run.sh: log command run and image digests

There's frequent confusion between image ID and image digest: display
both.

Show both sof and thesofproject/sof.

Use set -x to display the full command that is run.

Signed-off-by: Marc Herbert <email address hidden>
(cherry picked from commit f79d2341af3c6c3f025adadebc7c88bb5a4c8c28)

844ed48... by Marc Herbert <email address hidden>

Revert ".github/zephyr: hardcode zephyr container version to v0.21.0"

This reverts commit 7ec25f16af9ea557aaf0a4bbef6ab7ffc5505a0b because
compatibility with the latest SDK has just been restored in brand new
branch https://github.com/thesofproject/zephyr/commits/sof/stable-v2.0

Signed-off-by: Marc Herbert <email address hidden>

f8486cc... by Marc Herbert <email address hidden>

xtensa-build-zephyr.sh: switch to new Zephyr branch sof/stable-v2.0

The brand new sof/stable-v2.0 branch has (for now) only these two
commits that restore compatibility with the 0.14.0 Zephyr SDK and the
latest zephyr-build container

51d2a25590cc "Revert cmake: Zephyr sdk backward compatibility with 0.11.1 and 0.11.2"
af345ec33aa2 (sof/sof/stable-v2.0) cmake: remove xtensa workaround in Zephyr toolchain code.

See longer story in review #5654 for commit 7ec25f16af9e

Signed-off-by: Marc Herbert <email address hidden>

6ef1af0... by Marc Herbert <email address hidden>

xtensa-build: set default value instead of hardcoding Zephyr commit

This reverts commit b678a4dcaa1e7ad0c6a056e17dd38bfe095a4464 because
it's hardcoding the zephyr version real hard. Instead, merely
change the default value.

Signed-off-by: Marc Herbert <email address hidden>

7212c56... by Marc Herbert <email address hidden>

xtensa-build-zephyr.sh: add new -u zephyr_remote option

Same -u option as the new Python script.

We need this for the new sof/stable-v2.1 branch on
https://github.com/thesofproject/zephyr while our CI has not entirely
switched to the python script yet.

Signed-off-by: Marc Herbert <email address hidden>
(cherry picked from commit 177e18f701ef625fd780bfeb9d88b59fb44b3157)

ecbb4fb... by Kai Vehmanen

xtensa-build-zephyr: add -v option for verbose build

Align with xtensa-build-all.sh and add a "-v" option to toggle
verbose build log ("west -v build").

Signed-off-by: Kai Vehmanen <email address hidden>
(cherry picked from commit b95d995bd2fb1f4f2b13575f11e5a42e18ad110e)

7ec25f1... by Marc Herbert <email address hidden>

.github/zephyr: hardcode zephyr container version to v0.21.0

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
b678a4dcaa1e. 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:
https://github.com/zephyrproject-rtos/sdk-ng/commit/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 <email address hidden>

5f18af1... by Ranjani Sridharan <email address hidden>

test: topology: fix build with latest alsa-lib

Remove the extra space to make the topology build with upstream
alsa-lib.

Signed-off-by: Ranjani Sridharan <email address hidden>
(cherry picked from commit fcfd5d65be08f01598174bc574834b29d733a347)

09ed117... by Ranjani Sridharan <email address hidden>

topology1: fix errors due to newline in list generator

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 <email address hidden>
(cherry picked from commit 3e1c160e5053eae66769ad19955df83a08218270)