mirror of https://github.com/thesofproject/sof.git
9d2e82adf0
When neither -c nor -p is passed, the script defaults to '-p SOF_TOP/zephyrproject', initializing the `west_top` global with that. When everything is already cloned, this becomes zephyrproject/modules/audio/sof/zephyrproject which is really not a `west topdir`. Then west is pointed at: real_west_top/modules/audio/sof/zephyrproject/zephyr/samples/subsys/audio/sof which obviously fails. This was found while testing https://thesofproject.github.io/latest/getting_started/build-guide/build-with-zephyr.html and trying (and failing) to switch away from the older .sh script. Fix find_west_workspace() to return the output of `west topdir` and use that to update the `west_top` global. This bug was introduced from the very start when the script was converted from shell to python. The shell script did not have this problem because it could be used without using neither -c nor -p. This logical difference was mentioned in the code review: https://github.com/thesofproject/sof/pull/5299#discussion_r801158177 Also remove a couple of accidental creations of a sof/zephyrproject/ directory when sof is already inside a higher zephyrproject. Signed-off-by: Marc Herbert <marc.herbert@intel.com> |
||
|---|---|---|
| .. | ||
| cmake | ||
| docker_build | ||
| kconfig | ||
| scan | ||
| README.docker | ||
| build-tools.sh | ||
| checkpatch.pl | ||
| const_structs.checkpatch | ||
| docker-qemu.sh | ||
| docker-run.sh | ||
| gen-doc.sh | ||
| host-testbench.sh | ||
| qemu-check.sh | ||
| rebuild-testbench.sh | ||
| run-mocks.sh | ||
| sof-post-commit-hook.sh | ||
| sof-pre-commit-hook.sh | ||
| sof-target-install.sh | ||
| sof_fw.kb | ||
| spelling.txt | ||
| test-repro-build.sh | ||
| xtensa-build-all.sh | ||
| xtensa-build-zephyr.py | ||
| xtensa-build-zephyr.sh | ||
README.docker
The docker container provided in docker_build sets up a build environment for building Sound Open Firmware. A working docker installation is needed to run the docker build container. Note: In order to run docker as non sudo/root user please run. sudo usermod -aG docker your-user-name Then logout and login again. Quick Start: First, build the docker container. This step needs to be done initially and when the toolchain or alsa dependencies are updated. cd scripts/docker_build ./docker-build.sh After the container is built, it can be used to run the scripts. To build for baytrail: ./scripts/docker-run.sh ./scripts/xtensa-build-all.sh -l byt or (may need password test0000 for rimage install) ./scripts/docker-run.sh ./scripts/xtensa-build-all.sh byt To rebuild the topology and logger: ./scripts/docker-run.sh ./scripts/build-tools.sh An incremental sof.git build: ./scripts/docker-run.sh make Or enter a shell: ./scripts/docker-run.sh bash