format-patch: correctly set UMPF_VERSION with --bb #39
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
rohieb
force-pushed
the
fopa-bb-umpf-version
branch
2 times, most recently
from
98a0779 to
de5cc6a
Compare
rohieb
force-pushed
the
fopa-bb-umpf-version
branch
from
de5cc6a to
ad57f40
Compare
rohieb
commented
Mar 15, 2024
rohieb
commented
Mar 15, 2024
When format-patch'ing a series for bitbake, UMPF_VERSION is taken from
${STATE}/version, but this file is never written when we don't set
STABLE for the "version" branch of parse(). Additionally, the version
must be parsed back from the input series in that case, otherwise it
will always be initialised to "-1", with the result that UMPF_VERSION
always ends in "-1" even when format-patch'ing an umpf that was built
with '-v2' or greater.
Update the test case with an appropriate tag name.
Fixes: 8d0d4cc (2024-03-06, "umpf: output version infos to bitbake variables during format-patch")
Signed-off-by: Roland Hieber <[email protected]>
rohieb
force-pushed
the
fopa-bb-umpf-version
branch
from
ad57f40 to
fd6a82b
Compare
In case of ${STABLE}, the version line comes from a previous utag, which
means it was written by umpf itself using ${VERSION_SEPARATOR}, which
was previously hard-coded as "-". Use it also when parsing back the
version.
Fixes: a864fe6 (2023-04-20, "umpf: split off VERSION_SEPARATOR from VERSION")
Signed-off-by: Roland Hieber <[email protected]>
rohieb
force-pushed
the
fopa-bb-umpf-version
branch
from
fd6a82b to
919b0e0
Compare
michaelolbrich
approved these changes
Mar 16, 2024
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.
When exporting with
--bb,UMPF_VERSIONis taken from${STATE}/version, but this file is never written when we don't setSTABLEfor the "version" branch ofparse(). Additionally, the version must be parsed back from the input series, otherwise it will always be initialised to "-1", with the result thatUMPF_VERSIONalways ends in "-1" even when format-patch'ing an umpf that was built with-v2or greater.Update the test case with an appropriate tag name.
Fixes: 8d0d4cc (2024-03-06, "umpf: output version infos to bitbake variables during format-patch")