From: Prarit Bhargava <prarit@xxxxxxxxxx>
redhat/Makefile: Deprecate SINGLE_TARBALL variable
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
@@ -3,13 +3,6 @@
#
# This section is intentionally left at the top of the Makefile so it won't be ignored.
#
-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
-
ifdef PREBUILD_GIT_ONLY
# deprecated in 5.18.0
$(warning WARNING: PREBUILD_GIT_ONLY will be deprecated in a later release, use UPSTREAMBUILD_GIT_ONLY instead.)
@@ -244,7 +237,6 @@ SRPM:=$(SRPMS)/$(RELEASETAG)$(DIST).src.rpm
# specific values should be set.
#
ifeq ("$(DISTRO)", "fedora")
- SINGLE_TARBALL:=0
RHDISTGIT_BRANCH:=rawhide
ifndef BUILD_TARGET
BUILD_TARGET:=rawhide
@@ -255,7 +247,6 @@ ifeq ("$(DISTRO)", "fedora")
SPECTARFILE_RELEASE:=$(UPSTREAM_TARBALL_NAME)
SPECKABIVERSION:=$(SPECVERSION)
else ifeq ("$(DISTRO)", "centos")
- SINGLE_TARBALL:=1
RHDISTGIT_BRANCH:=c$(RHEL_MAJOR)s
ifndef BUILD_PROFILE
BUILD_PROFILE:= -p stream
@@ -266,7 +257,6 @@ else ifeq ("$(DISTRO)", "centos")
SPECTARFILE_RELEASE:=$(BASEVERSION)
SPECKABIVERSION:=$(BASEVERSION)
else
- SINGLE_TARBALL:=1
RHDISTGIT_BRANCH:=rhel-$(RHEL_MAJOR).$(RHEL_MINOR).0
ifndef BUILD_TARGET
ifeq ("$(DIST)", ".eln")
diff --git a/redhat/Makefile.variables b/redhat/Makefile.variables
index blahblah..blahblah 100644
--- a/redhat/Makefile.variables
+++ b/redhat/Makefile.variables
@@ -124,8 +124,3 @@ 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, and 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
@@ -175,7 +175,7 @@ test -f "$SOURCES/$SPECFILE" &&
echo "MARKER is $MARKER"
-if [ "$SINGLE_TARBALL" = 0 ]; then
+if [ "$DISTRO" == "fedora" ]; then
# The tarball in the SRPM contains only the upstream sources.
# May need to preserve word splitting in EXCLUDE_FILES
diff --git a/redhat/scripts/create-tarball.sh b/redhat/scripts/create-tarball.sh
index blahblah..blahblah 100755
--- a/redhat/scripts/create-tarball.sh
+++ b/redhat/scripts/create-tarball.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# shellcheck disable=SC2153
-[ "$SINGLE_TARBALL" -eq 1 ] && _GITID="$GITID" || _GITID="$MARKER"
+[ "$DISTRO" != "fedora" ] && _GITID="$GITID" || _GITID="$MARKER"
# shellcheck disable=SC1083
XZ_THREADS=$(rpm --eval %{_smp_mflags} | sed -e 's!^-j!--threads !')
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7 b/redhat/self-test/data/centos-2585cf9dfaad.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-2585cf9dfaad.el7
+++ b/redhat/self-test/data/centos-2585cf9dfaad.el7
@@ -55,7 +55,6 @@ RHPKG_BIN=centpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
RPMBUILD=rpmbuild
-SINGLE_TARBALL=1
SNAPSHOT=0
SOURCES=../redhat/rpm/SOURCES
SPECBUILD=0.rc5.6.test
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25 b/redhat/self-test/data/centos-2585cf9dfaad.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-2585cf9dfaad.fc25
+++ b/redhat/self-test/data/centos-2585cf9dfaad.fc25
@@ -55,7 +55,6 @@ RHPKG_BIN=centpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
RPMBUILD=rpmbuild
-SINGLE_TARBALL=1
SNAPSHOT=0
SOURCES=../redhat/rpm/SOURCES
SPECBUILD=0.rc5.6.test
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7 b/redhat/self-test/data/centos-78e36f3b0dae.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-78e36f3b0dae.el7
+++ b/redhat/self-test/data/centos-78e36f3b0dae.el7
@@ -55,7 +55,6 @@ RHPKG_BIN=centpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
RPMBUILD=rpmbuild
-SINGLE_TARBALL=1
SNAPSHOT=1
SOURCES=../redhat/rpm/SOURCES
SPECBUILD=0.rc0.78e36f3b0dae.6.test
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25 b/redhat/self-test/data/centos-78e36f3b0dae.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-78e36f3b0dae.fc25
+++ b/redhat/self-test/data/centos-78e36f3b0dae.fc25
@@ -55,7 +55,6 @@ RHPKG_BIN=centpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
RPMBUILD=rpmbuild
-SINGLE_TARBALL=1
SNAPSHOT=1
SOURCES=../redhat/rpm/SOURCES
SPECBUILD=0.rc0.78e36f3b0dae.6.test
diff --git a/redhat/self-test/data/centos-df0cc57e057f.el7 b/redhat/self-test/data/centos-df0cc57e057f.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-df0cc57e057f.el7
+++ b/redhat/self-test/data/centos-df0cc57e057f.el7
@@ -55,7 +55,6 @@ RHPKG_BIN=centpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
RPMBUILD=rpmbuild
-SINGLE_TARBALL=1
SNAPSHOT=0
SOURCES=../redhat/rpm/SOURCES
SPECBUILD=6.test
diff --git a/redhat/self-test/data/centos-df0cc57e057f.fc25 b/redhat/self-test/data/centos-df0cc57e057f.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-df0cc57e057f.fc25
+++ b/redhat/self-test/data/centos-df0cc57e057f.fc25
@@ -55,7 +55,6 @@ RHPKG_BIN=centpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
RPMBUILD=rpmbuild
-SINGLE_TARBALL=1
SNAPSHOT=0
SOURCES=../redhat/rpm/SOURCES
SPECBUILD=6.test
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.el7 b/redhat/self-test/data/centos-fce15c45d3fb.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-fce15c45d3fb.el7
+++ b/redhat/self-test/data/centos-fce15c45d3fb.el7
@@ -55,7 +55,6 @@ RHPKG_BIN=centpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
RPMBUILD=rpmbuild
-SINGLE_TARBALL=1
SNAPSHOT=1
SOURCES=../redhat/rpm/SOURCES
SPECBUILD=0.rc5.fce15c45d3fb.6.test
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.fc25 b/redhat/self-test/data/centos-fce15c45d3fb.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-fce15c45d3fb.fc25
+++ b/redhat/self-test/data/centos-fce15c45d3fb.fc25
@@ -55,7 +55,6 @@ RHPKG_BIN=centpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
RPMBUILD=rpmbuild
-SINGLE_TARBALL=1
SNAPSHOT=1
SOURCES=../redhat/rpm/SOURCES
SPECBUILD=0.rc5.fce15c45d3fb.6.test
diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.el7 b/redhat/self-test/data/fedora-2585cf9dfaad.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/fedora-2585cf9dfaad.el7
+++ b/redhat/self-test/data/fedora-2585cf9dfaad.el7
@@ -54,7 +54,6 @@ RHPKG_BIN=fedpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
RPMBUILD=rpmbuild
-SINGLE_TARBALL=0
SNAPSHOT=0
SOURCES=../redhat/rpm/SOURCES
SPECBUILD=0.rc5.6.test
diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.fc25 b/redhat/self-test/data/fedora-2585cf9dfaad.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/fedora-2585cf9dfaad.fc25
+++ b/redhat/self-test/data/fedora-2585cf9dfaad.fc25
@@ -54,7 +54,6 @@ RHPKG_BIN=fedpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
RPMBUILD=rpmbuild
-SINGLE_TARBALL=0
SNAPSHOT=0
SOURCES=../redhat/rpm/SOURCES
SPECBUILD=0.rc5.6.test
diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.el7 b/redhat/self-test/data/fedora-78e36f3b0dae.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/fedora-78e36f3b0dae.el7
+++ b/redhat/self-test/data/fedora-78e36f3b0dae.el7
@@ -54,7 +54,6 @@ RHPKG_BIN=fedpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
RPMBUILD=rpmbuild
-SINGLE_TARBALL=0
SNAPSHOT=1
SOURCES=../redhat/rpm/SOURCES
SPECBUILD=0.rc0.78e36f3b0dae.6.test
diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.fc25 b/redhat/self-test/data/fedora-78e36f3b0dae.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/fedora-78e36f3b0dae.fc25
+++ b/redhat/self-test/data/fedora-78e36f3b0dae.fc25
@@ -54,7 +54,6 @@ RHPKG_BIN=fedpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
RPMBUILD=rpmbuild
-SINGLE_TARBALL=0
SNAPSHOT=1
SOURCES=../redhat/rpm/SOURCES
SPECBUILD=0.rc0.78e36f3b0dae.6.test
diff --git a/redhat/self-test/data/fedora-df0cc57e057f.el7 b/redhat/self-test/data/fedora-df0cc57e057f.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/fedora-df0cc57e057f.el7
+++ b/redhat/self-test/data/fedora-df0cc57e057f.el7
@@ -54,7 +54,6 @@ RHPKG_BIN=fedpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
RPMBUILD=rpmbuild
-SINGLE_TARBALL=0
SNAPSHOT=0
SOURCES=../redhat/rpm/SOURCES
SPECBUILD=6.test
diff --git a/redhat/self-test/data/fedora-df0cc57e057f.fc25 b/redhat/self-test/data/fedora-df0cc57e057f.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/fedora-df0cc57e057f.fc25
+++ b/redhat/self-test/data/fedora-df0cc57e057f.fc25
@@ -54,7 +54,6 @@ RHPKG_BIN=fedpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
RPMBUILD=rpmbuild
-SINGLE_TARBALL=0
SNAPSHOT=0
SOURCES=../redhat/rpm/SOURCES
SPECBUILD=6.test
diff --git a/redhat/self-test/data/fedora-fce15c45d3fb.el7 b/redhat/self-test/data/fedora-fce15c45d3fb.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/fedora-fce15c45d3fb.el7
+++ b/redhat/self-test/data/fedora-fce15c45d3fb.el7
@@ -54,7 +54,6 @@ RHPKG_BIN=fedpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
RPMBUILD=rpmbuild
-SINGLE_TARBALL=0
SNAPSHOT=1
SOURCES=../redhat/rpm/SOURCES
SPECBUILD=0.rc5.fce15c45d3fb.6.test
diff --git a/redhat/self-test/data/fedora-fce15c45d3fb.fc25 b/redhat/self-test/data/fedora-fce15c45d3fb.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/fedora-fce15c45d3fb.fc25
+++ b/redhat/self-test/data/fedora-fce15c45d3fb.fc25
@@ -54,7 +54,6 @@ RHPKG_BIN=fedpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
RPMBUILD=rpmbuild
-SINGLE_TARBALL=0
SNAPSHOT=1
SOURCES=../redhat/rpm/SOURCES
SPECBUILD=0.rc5.fce15c45d3fb.6.test
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1922
_______________________________________________
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
