From: Prarit Bhargava <prarit@xxxxxxxxxx>
redhat/genspec: Rename PATCHLIST_CHANGELOG to SPECPATCHLIST_CHANGELOG
Change PATCHLIST_CHANGELOG to SPECPATCHLIST_CHANGELOG so that readers
understand it is passed into the spec file.
Rename PATCHLIST_CHANGELOG to SPECPATCHLIST_CHANGELOG.
Signed-off-by: Prarit Bhargava <prarit@xxxxxxxxxx>
diff --git a/redhat/genspec.sh b/redhat/genspec.sh
index blahblah..blahblah 100755
--- a/redhat/genspec.sh
+++ b/redhat/genspec.sh
@@ -40,7 +40,7 @@ EXCLUDE_FILES=":(exclude,top).get_maintainer.conf \
# If PATCHLIST_URL is not set to "none", generate Patchlist.changelog file that
# holds the shas and commits not included upstream and git commit url.
-PATCHLIST_CHANGELOG=0
+SPECPATCHLIST_CHANGELOG=0
if [ "$PATCHLIST_URL" != "none" ]; then
# sed convert
# <sha> <description>
@@ -53,7 +53,7 @@ if [ "$PATCHLIST_URL" != "none" ]; then
git log --no-merges --pretty=oneline --no-decorate ${UPSTREAM}.. $EXCLUDE_FILES | \
sed "s!^\([^ ]*\)!$PATCHLIST_URL/\1\n &!; s!\$!\n!" \
> "$SOURCES"/Patchlist.changelog
- PATCHLIST_CHANGELOG=1
+ SPECPATCHLIST_CHANGELOG=1
fi
test -f "$SOURCES/$SPECFILE" &&
@@ -70,7 +70,7 @@ test -f "$SOURCES/$SPECFILE" &&
s/%%SPECDEBUG_BUILDS_ENABLED%%/$SPECDEBUG_BUILDS_ENABLED/
s/%%INCLUDE_FEDORA_FILES%%/$INCLUDE_FEDORA_FILES/
s/%%INCLUDE_RHEL_FILES%%/$INCLUDE_RHEL_FILES/
- s/%%PATCHLIST_CHANGELOG%%/$PATCHLIST_CHANGELOG/
+ s/%%SPECPATCHLIST_CHANGELOG%%/$SPECPATCHLIST_CHANGELOG/
s/%%SPECVERSION%%/$SPECVERSION/
s/%%TARFILE_RELEASE%%/$TARFILE_RELEASE/" "$SOURCES/$SPECFILE"
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100755
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -8,7 +8,7 @@
# Include RHEL files
%global include_rhel %%INCLUDE_RHEL_FILES%%
# Provide Patchlist.changelog file
-%global patchlist_changelog %%PATCHLIST_CHANGELOG%%
+%global patchlist_changelog %%SPECPATCHLIST_CHANGELOG%%
# Disable LTO in userspace packages.
%global _lto_cflags %{nil}
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1728
_______________________________________________
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 on the list, report it: https://pagure.io/fedora-infrastructure
