Skip to content

Conversation

@lgirdwood
Copy link
Member

Reverts #597

@lgirdwood lgirdwood merged commit 7a79343 into master Nov 21, 2018
@lgirdwood lgirdwood deleted the revert-597-topic/sof-dev-fix-version-number branch November 21, 2018 17:15
@jajanusz
Copy link
Contributor

@zhuyingjiang
I didn't try building from tarball, but by looking at scripts I can see it shouldn't work. #597 almost fixed it but went too far and requesting to manually edit .tarball-version is not good idea.

.tarball-version generation looks ok - it should be there when you do make dist, so it ends up in your tarball. So the only fix you should do is in version.sh because it doesn't look for .tarball-version and always tries to use .git. Please change just version.sh to use .tarball-version when there is no .git folder and it should work.

@zhuyingjiang
Copy link
Contributor

OK, the old version has no .tarball-version in it, and I checked today the latest code "make dist" can generate .tarball-version and .version. But a new issue found that(1) all the scripts are not in the tarball, that make the uncompressed tarball still can't compile. (2) the git tag after v.1.1 is not the format that git describe needed, so "git describe" always got v1.1. I think it better to open new issue to solve these.

@jajanusz
Copy link
Contributor

jajanusz commented Nov 22, 2018

(2) issue is caused by the fact that we probably have no clear tagging/released policy established and tagging for v1.2 was done differently than for v1.1 - 1.1 is in master 1.2 is only on stable branch so git describe cannot find it.

Run git branch -r --contains v1.2 and then git branch -r --contains v1.1 and you will know why get describe fails. We need to make dist and tag from the same branch - master or some stable branch per release.

@lgirdwood
Copy link
Member Author

@zhuyingjiang dont worry about 1.2 tag today, this will be fixed for 1.3 since we are all using master today. Just make sure that make dist generates all files and correct version (according to git) to build from a tarball.

ujfalusi added a commit to ujfalusi/sof that referenced this pull request Sep 27, 2024
Sometimes it can help to see how the chunks arrive from firmware when
comparing logs with the kernel for example.

The --mark-chunks flag will add a marker for each new chunk that is printed
with a running number and the size of the given chunk, for example:

--- Chunk thesofproject#604 start (size: 652) ---
[    0.000000] <inf> init: print_version_banner: FW ABI 0x301d001 DBG ABI 0x5003000 tags SOF:v2.5-stable-branch-2772-g76e650e56598-dirty zephyr:v3.7.0-2127-ge7c84756087f src hash 0x4ff3fd64 (ref hash 0x4ff3fd64)
*** Booting Zephyr OS build v3.7.0-2127-ge7c84756087f ***
[    0.000000] <inf> main: sof_app_main: SOF on intel_adsp
[    0.000000] <inf> main: sof_app_main: SOF initialized
[    0.000000] <inf> ipc: ipc_cmd: rx   : 0x44000000|0x31400008
[11896.403666] <inf> ipc: ipc_cmd: tx-reply     : 0x64000000|0x31400008
[11896.404076] <inf> ipc: ipc_cmd: rx   : 0x44000000|0x3060004c
[11896.404093] <inf> ipc: ipc_cmd: tx-reply     : 0x64000000|0x3060004c
--- Chunk thesofproject#605 start (size: 196) ---

[11896.969658] <inf> ipc: ipc_cmd: rx   : 0x11000005|0x0
[11896.969671] <inf> pipe: pipeline_new: pipeline new pipe_id 0 priority 0
[11896.969685] <inf> ipc: ipc_cmd: tx-reply     : 0xb1000000|0x0

--- Chunk thesofproject#606 start (size: 2236) ---

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
kv2019i pushed a commit that referenced this pull request Oct 1, 2024
Sometimes it can help to see how the chunks arrive from firmware when
comparing logs with the kernel for example.

The --mark-chunks flag will add a marker for each new chunk that is printed
with a running number and the size of the given chunk, for example:

--- Chunk #604 start (size: 652) ---
[    0.000000] <inf> init: print_version_banner: FW ABI 0x301d001 DBG ABI 0x5003000 tags SOF:v2.5-stable-branch-2772-g76e650e56598-dirty zephyr:v3.7.0-2127-ge7c84756087f src hash 0x4ff3fd64 (ref hash 0x4ff3fd64)
*** Booting Zephyr OS build v3.7.0-2127-ge7c84756087f ***
[    0.000000] <inf> main: sof_app_main: SOF on intel_adsp
[    0.000000] <inf> main: sof_app_main: SOF initialized
[    0.000000] <inf> ipc: ipc_cmd: rx   : 0x44000000|0x31400008
[11896.403666] <inf> ipc: ipc_cmd: tx-reply     : 0x64000000|0x31400008
[11896.404076] <inf> ipc: ipc_cmd: rx   : 0x44000000|0x3060004c
[11896.404093] <inf> ipc: ipc_cmd: tx-reply     : 0x64000000|0x3060004c
--- Chunk #605 start (size: 196) ---

[11896.969658] <inf> ipc: ipc_cmd: rx   : 0x11000005|0x0
[11896.969671] <inf> pipe: pipeline_new: pipeline new pipe_id 0 priority 0
[11896.969685] <inf> ipc: ipc_cmd: tx-reply     : 0xb1000000|0x0

--- Chunk #606 start (size: 2236) ---

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
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