Skip to content

Restore binary file name for sof FWs - #870

Merged
lgirdwood merged 3 commits into
thesofproject:masterfrom
xiulipan:pr/namerestore
Jan 23, 2019
Merged

Restore binary file name for sof FWs#870
lgirdwood merged 3 commits into
thesofproject:masterfrom
xiulipan:pr/namerestore

Conversation

@xiulipan

@xiulipan xiulipan commented Jan 23, 2019

Copy link
Copy Markdown
Contributor

restore the names for the build result binaries.
Change some scripts related things.

Fix #869

@xiulipan
CMake: restore the naming style of binaries
ef8c22d 
use sof-*.ri back to make alignment with Linux driver FW name
requirement.

Signed-off-by: Pan Xiuli <xiuli.pan@linux.intel.com>
jajanusz
jajanusz suggested changes Jan 23, 2019
View reviewed changes

@jajanusz jajanusz left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I intentionally changed it to underscores, because dashes are error-prone in cmake.
I'd like to keep it with underscores.
Also only the 1 CI has problem with it, others work.

jajanusz
jajanusz reviewed Jan 23, 2019
View reviewed changes

@jajanusz jajanusz left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We can revert that, just give me some time to apply changes to Internal CI.

@xiulipan
xiulipan requested a review from lgirdwood January 23, 2019 09:03
@xiulipan

xiulipan commented Jan 23, 2019

Copy link
Copy Markdown
Contributor Author

@lgirdwood Restore name for cmake is done.
I suppose both CI will need time to support that. Let wait @jajanusz to do that first.
And I will bring back sof-ci with the build system change together after this is merged.

@xiulipan
scripts: update build all scripts
ba42ba9 
Use different build folder for gcc and xcc build.
Will auto selected if ROM build is not supported for the platform,
thus make -a -r can work.

Signed-off-by: Pan Xiuli <xiuli.pan@linux.intel.com>
@jajanusz

jajanusz commented Jan 23, 2019

Copy link
Copy Markdown
Contributor

@xiulipan
Something is wrong with qemu-check on travis. Before your change it worked, so I guess that you just missed some renames in this PR (maybe related to rom-/rom_).

@xiulipan

xiulipan commented Jan 23, 2019

Copy link
Copy Markdown
Contributor Author

@jajanusz
reorder the scripts patches. Need to update the qume after the build scripts update. miss the build folder part in qemu check patch.
Fixed and re-push the PR.

@lgirdwood

lgirdwood commented Jan 23, 2019

Copy link
Copy Markdown
Member

@xiulipan @jajanusz I expect most of the CI should pass with this PR, or do we expect any failure ?

@xiulipan
scripts: change names for binary in qemu-check
36988f1 
Use back old style name.
Modify the build folder as gcc and xcc prefix added.

Signed-off-by: Pan Xiuli <xiuli.pan@linux.intel.com>
@xiulipan

xiulipan commented Jan 23, 2019

Copy link
Copy Markdown
Contributor Author

@lgirdwood
If any failure happen, either this PR need re-work or CI need to be updated due to the name restore.
Bring sof-ci back online based on changes of this PR. sof-ci should pass this.

@jajanusz

jajanusz commented Jan 23, 2019

Copy link
Copy Markdown
Contributor

QB CI is ok, you can merge it when travis is ok

@xiulipan

xiulipan commented Jan 23, 2019

Copy link
Copy Markdown
Contributor Author

@lgirdwood sof-ci is ok. small issues with binary storage server deploy.
travis for my own branch is passed. https://travis-ci.org/xiulipan/sof/builds/483311800

@lgirdwood
lgirdwood merged commit 2b02493 into thesofproject:master Jan 23, 2019
@jajanusz jajanusz mentioned this pull request Jan 23, 2019
Merged
@xiulipan
xiulipan deleted the pr/namerestore branch September 19, 2019 09:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tlauda tlauda Awaiting requested review from tlauda
@lgirdwood lgirdwood Awaiting requested review from lgirdwood
1 more reviewer
@jajanusz jajanusz jajanusz approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@xiulipan @jajanusz @lgirdwood