fsl-kernel-localversion: fix SRCREV_machine and AUTOREV use cases #1696
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Depending on how one uses the Yocto kernel classes the kernels hash is defined in either "SRCREV_machine" or "SRCREV". If "SRCREV_machine" is in use, "SRCREV" stays at its bitbake default "INVALID". If the "SRCREV_machine" or "SRCREV" is set to "AUTOREV" that value is replaced by "AUTOINC". If using "SRCREV_machine" and/or "AUTOREV" do_kernel_localversion fails | run.do_kernel_localversion:158 exit 128 from 'head=`git --git-dir=.../.git rev-parse --verify --short INVALID 2> /dev/null`' Cope with both use cases. Fixes: 4153739 ("classes: make localversion classes deterministic") Signed-off-by: Max Krummenacher <[email protected]>
otavio
approved these changes
Dec 4, 2023
|
Backport failed for Please cherry-pick the changes locally. git fetch origin kirkstone
git worktree add -d .worktree/backport-1696-to-kirkstone origin/kirkstone
cd .worktree/backport-1696-to-kirkstone
git checkout -b backport-1696-to-kirkstone
ancref=$(git merge-base 0fc1504fb3c8721f80182f5ec54644efe1f1e842 16a356ef0d5d62090e84530e125ea6952994aaeb)
git cherry-pick -x $ancref..16a356ef0d5d62090e84530e125ea6952994aaeb |
|
Successfully created backport PR #1697 for |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This would need backport to kirkstone too. The commit it fixes is currently a backport pull request for kirkstone: #1694