From: Prarit Bhargava <prarit@xxxxxxxxxx>
redhat/genspec: Rename BUILDID_DEFINE to SPECBUILDID
Change BUILDID_DEFINE to SPECBUILDID so that readers understand it is passed
into the spec file.
Rename BUILDID_DEFINE to SPECBUILDID.
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
@@ -23,9 +23,9 @@ else
fi
if [ -n "$BUILDID" ]; then
- BUILDID_DEFINE=$(printf "%%define buildid %s" "$BUILDID")
+ SPECBUILDID=$(printf "%%define buildid %s" "$BUILDID")
else
- BUILDID_DEFINE="# define buildid .local"
+ SPECBUILDID="# define buildid .local"
fi
EXCLUDE_FILES=":(exclude,top).get_maintainer.conf \
@@ -59,7 +59,7 @@ test -f "$SOURCES/$SPECFILE" &&
sed -i -e "
/%%SPECCHANGELOG%%/r $SOURCES/$SPECCHANGELOG
/%%SPECCHANGELOG%%/d
- s/%%BUILDID%%/$BUILDID_DEFINE/
+ s/%%SPECBUILDID%%/$SPECBUILDID/
s/%%SPECKVERSION%%/$SPECKVERSION/
s/%%SPECKPATCHLEVEL%%/$SPECKPATCHLEVEL/
s/%%PKGRELEASE%%/$PKGRELEASE/
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
@@ -117,7 +117,7 @@ Summary: The Linux kernel
# for parallel xz processes, replace with 1 to go back to single process
%endif
-%%BUILDID%%
+%%SPECBUILDID%%
%if 0%{?fedora}
--
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
