[OS-BUILD PATCH] Revert variable switch for lasttag

From: Justin M. Forbes <jforbes(a)fedoraproject.org&gt; Revert variable switch for lasttag MR 1757 cleaned up a lot of Makefile variables. In this case though, it has us searching for a full tag with a release, after it has been bumped. As this will never match, the script assumes that this is the first release and appends the entire history to the changelog every time. This change reverts that specific change, and cleans up several thousand lines of changelog mess that it caused. Signed-off-by: Justin M. Forbes <jforbes(a)fedoraproject.org&gt; diff --git a/redhat/genspec.sh b/redhat/genspec.sh index blahblah..blahblah 100755 --- a/redhat/genspec.sh +++ b/redhat/genspec.sh @@ -99,7 +99,7 @@ fi GIT_FORMAT="--format=- %s (%an)%n%N%n^^^NOTES-END^^^%n%b" GIT_NOTES="--notes=refs/notes/${RHEL_MAJOR}.${RHEL_MINOR}*" -lasttag=$(git rev-list --first-parent --grep="^\[redhat\] ${RELEASETAG}" --max-count=1 HEAD) +lasttag=$(git rev-list --first-parent --grep="^\[redhat\] kernel-${SPECKVERSION}.${SPECKPATCHLEVEL}" --max-count=1 HEAD) # if we didn't find the proper tag, assume this is the first release if [[ -z $lasttag ]]; then if [[ -z ${MARKER//[0-9a-f]/} ]]; then diff --git a/redhat/kernel.changelog-9.99 b/redhat/kernel.changelog-9.99 index blahblah..blahblah 100644 --- a/redhat/kernel.changelog-9.99 +++ b/redhat/kernel.changelog-9.99 -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1789