Skip to content

Conversation

@juimonen
Copy link

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

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>
Copy link
Collaborator

@marc-hb marc-hb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like these two changes are completely unrelated to each other, so they should be two different commits.

I find the ulimit change quite cryptic, can you say more about it? I think a comment mentioning crosstool-ng wouldn't hurt in the code because I doubt many people could relate this option to crosstool-ng in the future without git blame.

Maybe it's obvious for others but some information/references about why we don't need our own ALSA branches any more would be welcome too.

@juimonen
Copy link
Author

juimonen commented Dec 1, 2020

@marc-hb should have marked this as draft etc. Idea was that I got the docker build working with this ulimit settings, and the alsa-lib upstream made enum controls to compile in topology. So this is basis for discussion to see if this is the correct way to fix this. I also don't know why we are using our "own" versions of alsa-lib, I suspect that historically we've had some differentiation from upstream. crosstools-ng bailed out in compilation saying something like "compilation might need more open files than your current limit 1024, so changing it -> can't set ulimit, error". So don't know if that's something in my docker setup, or some change in crosstools-ng configure check? I think I've been able to build the docker image before...

@juimonen juimonen changed the title scripts: docker build changes to support enum control [RFC] scripts: docker build changes to support enum control Dec 1, 2020
@xiulipan
Copy link
Contributor

xiulipan commented Dec 1, 2020

@ranj063 @lrgirdwo any idea here? Do we need to change the CI alsa-lib to upstream version?

@marc-hb marc-hb marked this pull request as draft December 1, 2020 17:41
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 && \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would hold off here as there are some alsa-lib patches being worked on for topology 2.0. Best to just update our local copies of alsa-lib etc in the mean time.

@marc-hb
Copy link
Collaborator

marc-hb commented Dec 3, 2020

crosstools-ng bailed out in compilation saying something like "compilation might need more open files than your current limit 1024, so changing it -> can't set ulimit, error"

Looks like a good enough code comment to me.

@juimonen
Copy link
Author

juimonen commented Dec 3, 2020

crosstools-ng bailed out in compilation saying something like "compilation might need more open files than your current limit 1024, so changing it -> can't set ulimit, error"

Looks like a good enough code comment to me.

Yes, would be just good if someone else would try to build the image: still I'm not sure this issue is just with my environment or exists generally for everyone.

Anyway seems we have a plan:

  1. update our internal alsa-lib & alsa-utils (so don't do what I'm doing here)
  2. check if ulimit settings is really needed

Let's keep this open, until we have the above checked... @xiulipan can you try the docker build?

@juimonen
Copy link
Author

juimonen commented Dec 3, 2020

thesofproject/alsa-lib#1
thesofproject/alsa-utils#1

@lgirdwood you remember about your commit on top of alsa-lib? Is it replaced with some other related code in upstream master as I didn't seem to need it for enum compilation i.e. is it still needed?

@lgirdwood
Copy link
Member

thesofproject/alsa-lib#1
thesofproject/alsa-utils#1

@lgirdwood you remember about your commit on top of alsa-lib? Is it replaced with some other related code in upstream master as I didn't seem to need it for enum compilation i.e. is it still needed?

oh, it can be reverted.

@juimonen juimonen mentioned this pull request Dec 16, 2020
@juimonen
Copy link
Author

juimonen commented Feb 8, 2021

@xiuli, did we update the sof docker? if so, we can close this...

@xiulipan
Copy link
Contributor

xiulipan commented Feb 8, 2021

@juimonen I think the docker image is already updated, you can try with some PR.

@lgirdwood
Copy link
Member

@juimonen please update if ready to merge, still draft.

@juimonen
Copy link
Author

juimonen commented Feb 9, 2021

@xiulipan @lgirdwood #3695 is compiling now in CI (has enum controls in topology) so I think we can close this.

@juimonen juimonen closed this Feb 9, 2021
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.

4 participants