From: Prarit Bhargava <prarit@xxxxxxxxxx> redhat/genspec: Rename DEBUG_BUILDS_ENABLED to SPECDEBUG_BUILDS_ENABLED Change DEBUG_BUILDS_ENABLED to SPECDEBUG_BUILDS_ENABLED so that readers understand it is passed into the spec file. Rename DEBUG_BUILDS_ENABLED to SPECDEBUG_BUILDS_ENABLED. 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 @@ -17,10 +17,10 @@ UPSTREAM=$(git rev-parse -q --verify origin/"${UPSTREAM_BRANCH}" || \ if [ "$SNAPSHOT" = 0 ]; then # This is based off a tag on Linus's tree (e.g. v5.5 or v5.5-rc5). # Two kernels are built, one with debug configuration and one without. - DEBUG_BUILDS_ENABLED=1 + SPECDEBUG_BUILDS_ENABLED=1 else # All kernels are built with debug configurations. - DEBUG_BUILDS_ENABLED=0 + SPECDEBUG_BUILDS_ENABLED=0 fi if [ -n "$BUILDID" ]; then @@ -67,7 +67,7 @@ test -f "$SOURCES/$SPECFILE" && s/%%SPECRELEASE%%/$SPECRELEASE/ s/%%SPECDISTROBUILD%%/$SPECDISTROBUILD/ s/%%RELEASED_KERNEL%%/$RELEASED_KERNEL/ - s/%%DEBUG_BUILDS_ENABLED%%/$DEBUG_BUILDS_ENABLED/ + 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/ 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 @@ -85,7 +85,7 @@ Summary: The Linux kernel # Set debugbuildsenabled to 0 to not build a separate debug kernel, but # to build the base kernel using the debug configuration. (Specifying # the --with-release option overrides this setting.) -%define debugbuildsenabled %%DEBUG_BUILDS_ENABLED%% +%define debugbuildsenabled %%SPECDEBUG_BUILDS_ENABLED%% %global distro_build %%SPECDISTROBUILD%% -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1727 _______________________________________________ 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