[OS-BUILD PATCHv4 3/8] redhat: drop merge ark patches hack

[Herton R. Krzesinski (via Email Bridge)]

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

redhat: drop merge ark patches hack

Changelog generation carries a temporary hack to add a merge ark-patches
entry in the changelog. I think we can drop this today.

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
@@ -58,14 +58,6 @@ if [ "$MARKER" != "$LAST_MARKER" ]; then
 	rm "$clogf.tmp" "$clogf.unique"
 fi
 
-# HACK temporary hack until single tree workflow
-# Don't reprint all the ark-patches again.
-if [ -n "$(git log --oneline --first-parent --grep="Merge ark patches"
"$lasttag"..)" ]; then
-	# Throw away the clogf and just print the summary merge
-	echo "" > "$clogf"
-	echo "- Merge ark-patches" >> "$clogf"
-fi
-
 # during rh-dist-git genspec runs again and generates empty changelog
 # create empty file to avoid adding extra header to changelog
 LENGTH=$(grep -c "^-" "$clogf" | awk '{print $1}')

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