From: Prarit Bhargava <prarit@xxxxxxxxxx> redhat/Makefile: Deprecate SINGLE_TARBALL jforbes points out that the removal of the SINGLE_TARBALL may affect some SIGs. Since the users of the variable are unknown and maybe zero, mark it as deprecated. This commit can be reverted if anyone requests it be kept in place. Deprecate the SINGLE_TARBALL variable. Signed-off-by: Prarit Bhargava <prarit@xxxxxxxxxx> diff --git a/redhat/Makefile b/redhat/Makefile index blahblah..blahblah 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -18,6 +18,13 @@ ifdef TEST_FLAGS $(warning WARNING: TEST_FLAGS will be deprecated in a later release, use BUILD_FLAGS instead.) endif +ifdef SINGLE_TARBALL + # The commit that introduced this code can be reverted if there are users of + # this variable. + # deprecated in 5.18.0 + $(warning WARNING: SINGLE_TARBALL will be deprecated in a later release.) +endif + include Makefile.variables LANG=C diff --git a/redhat/Makefile.variables b/redhat/Makefile.variables index blahblah..blahblah 100644 --- a/redhat/Makefile.variables +++ b/redhat/Makefile.variables @@ -127,3 +127,8 @@ RHSELFTESTDATA ?= # This variable is used by the redhat/self-tests. It should not be # considered stable and my be changed or removed without warning. RHDISTDATADIR ?= + +# This variable is used in redhat/genspec.sh. It determines if all commits are rolled into +# a single tarball, or if the commits are individually broken out into separate patches +# and then included in the tarball. +SINGLE_TARBALL ?= diff --git a/redhat/genspec.sh b/redhat/genspec.sh index blahblah..blahblah 100755 --- a/redhat/genspec.sh +++ b/redhat/genspec.sh @@ -162,7 +162,7 @@ mv -f "$clogf.full" "$SOURCES/$CHANGELOG" echo "MARKER is $MARKER" -if [ "$DISTRO" == "fedora" ]; then +if [ "$DISTRO" == "fedora" ] || [ -n "$SINGLE_TARBALL" ]; then # The tarball in the SRPM contains only the upstream sources. # May need to preserve word splitting in EXCLUDE_FILES -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1647 _______________________________________________ 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
