From: Herton R. Krzesinski <herton@xxxxxxxxxx>
redhat: change the changelog item for upstream merges
We do merges from upstream in ark, not real rebases. Reword the
changelog item as suggested by Don Zickus and Justin Forbes.
Signed-off-by: Herton R. Krzesinski <herton@xxxxxxxxxx>
diff --git a/redhat/genlog.sh b/redhat/genlog.sh
index blahblah..blahblah 100755
--- a/redhat/genlog.sh
+++ b/redhat/genlog.sh
@@ -50,7 +50,7 @@ fi
if [ "$MARKER" != "$LAST_MARKER" ]; then
# genlog.py always adds a Resolves: line, thus we
# can insert the rebase changelog item before it
- sed -i "s/\(^Resolves:.*\)/- $MARKER rebase\n\1/" "$clogf"
+ sed -i "s/\(^Resolves:.*\)/- Linux v${SPECVERSION}${UPSTREAMBUILD:+-}${UPSTREAMBUILD%.}\n\1/" "$clogf"
fi
# during rh-dist-git genspec runs again and generates empty changelog
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1980
_______________________________________________
kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx
Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx
Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
