[OS-BUILD PATCHv4 4/8] redhat: always add a rebase entry when ark merges from upstream

[Herton R. Krzesinski (via Email Bridge)]

From: Herton R. Krzesinski <herton(a)redhat.com&gt;

redhat: always add a rebase entry when ark merges from upstream

We have some complex logic to parse changelog entries to choose whether
we add a rebase entry or not to the changelog. Since genlog.py is adding
a Resolves entry always now, simply replace that logic with a
replacement using sed to add a rebase entry when the markers differ.
The marker check doesn't work at the moment due Makefile logic but
that will be fixed in the following changes.

Signed-off-by: Herton R. Krzesinski <herton(a)redhat.com&gt;

diff --git a/redhat/genlog.sh b/redhat/genlog.sh
index blahblah..blahblah 100755
--- a/redhat/genlog.sh
+++ b/redhat/genlog.sh
@@ -48,14 +48,9 @@ fi
 # If the markers aren't the same then this a rebase.
 # This means we need to zap entries that are already present in the changelog.
 if [ "$MARKER" != "$LAST_MARKER" ]; then
-	# awk trick to get all unique lines
-	awk '!seen[$0]++' "$SOURCES/$SPECCHANGELOG" "$clogf" >
"$clogf.unique"
-	# sed trick to get the end of the changelog minus the line
-	sed -e '1,/# END OF CHANGELOG/ d' "$clogf.unique" >
"$clogf.tmp"
-	# Add an explicit entry to indicate a rebase.
-	echo "" > "$clogf"
-	echo -e "- $MARKER rebase" | cat "$clogf.tmp" - >>
"$clogf"
-	rm "$clogf.tmp" "$clogf.unique"
+	# 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"
 fi
 
 # during rh-dist-git genspec runs again and generates empty changelog

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1980