From d364f9790d836709ad3ad7d8bb90fabf5ed8c277 Mon Sep 17 00:00:00 2001
From: Jaska Uimonen <jaska.uimonen@intel.com>
Date: Mon, 30 Nov 2020 10:01:29 +0200
Subject: [PATCH] scripts: docker build changes to support enum control

Update docker build description to use alsa-lib and alsa-utils upstream
rather than sofproject versions. Also update ulimit for docker build to
support crosstools-ng.

Signed-off-by: Jaska Uimonen <jaska.uimonen@intel.com>
---
 scripts/docker_build/sof_builder/Dockerfile      | 4 ++--
 scripts/docker_build/sof_builder/docker-build.sh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/docker_build/sof_builder/Dockerfile b/scripts/docker_build/sof_builder/Dockerfile
index c0a534c74c40..ddb2e4a2cd39 100644
--- a/scripts/docker_build/sof_builder/Dockerfile
+++ b/scripts/docker_build/sof_builder/Dockerfile
@@ -59,8 +59,8 @@ ENV HOME /home/sof
 
 # Use ToT alsa utils for the latest topology patches.
 RUN mkdir -p /home/sof/work/alsa && cd /home/sof/work/alsa && \
-git clone $CLONE_DEFAULTS https://github.com/thesofproject/alsa-lib.git && \
-git clone $CLONE_DEFAULTS https://github.com/thesofproject/alsa-utils.git && \
+git clone $CLONE_DEFAULTS https://github.com/alsa-project/alsa-lib.git && \
+git clone $CLONE_DEFAULTS https://github.com/alsa-project/alsa-utils.git && \
 cd /home/sof/work/alsa/alsa-lib && ./gitcompile &&  make install && \
 cd /home/sof/work/alsa/alsa-utils && ./gitcompile &&  make install &&\
 chown -R sof:sof /home/sof
diff --git a/scripts/docker_build/sof_builder/docker-build.sh b/scripts/docker_build/sof_builder/docker-build.sh
index b676f0c13643..d1c76867f757 100755
--- a/scripts/docker_build/sof_builder/docker-build.sh
+++ b/scripts/docker_build/sof_builder/docker-build.sh
@@ -7,4 +7,4 @@ if [ -f "/etc/apt/apt.conf" ]; then
 else
 	touch apt.conf
 fi
-docker build --build-arg UID=$(id -u) --build-arg host_http_proxy=$http_proxy --build-arg host_https_proxy=$https_proxy -t sof .
+docker build --ulimit nofile=65536:65536 --build-arg UID=$(id -u) --build-arg host_http_proxy=$http_proxy --build-arg host_https_proxy=$https_proxy -t sof .