From: Prarit Bhargava <pra...@redhat.com>
redhat/Makefile: Rename __YSTREAM and __ZSTREAM
The __YSTREAM and __ZSTREAM names can be replaced with YSTREAM_FLAG and
ZSTREAM_FLAG. This makes future changes easier.
Signed-off-by: Prarit Bhargava <pra...@redhat.com>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -283,19 +283,19 @@ TARBALL:=$(REDHAT)/$(TARFILE)
include Makefile.rhpkg
ifeq ("$(ZSTREAM)", "yes")
- __YSTREAM = no
+ YSTREAM_FLAG = no
ifeq ("$(origin RHDISTGIT_BRANCH)", "command line")
- __ZSTREAM = branch
+ ZSTREAM_FLAG = branch
else
- __ZSTREAM = yes
+ ZSTREAM_FLAG = yes
endif
BUILDOPTS += +kabidupchk
else
- __ZSTREAM = no
+ ZSTREAM_FLAG = no
ifeq ("$(EARLY_YSTREAM)", "yes")
- __YSTREAM = early
+ YSTREAM_FLAG = early
else
- __YSTREAM = yes
+ YSTREAM_FLAG = yes
endif
endif
@@ -607,7 +607,7 @@ dist-release-changed: setup-source
echo "Nothing changed, skipping updates"; \
else \
$(GIT) checkout -- $(REDHAT)/$(SPECCHANGELOG); \
- $(REDHAT)/scripts/new_release.sh $(REDHAT) $(__YSTREAM)
$(__ZSTREAM) $(BUMP_RELEASE); \
+ $(REDHAT)/scripts/new_release.sh $(REDHAT) $(YSTREAM_FLAG)
$(ZSTREAM_FLAG) $(BUMP_RELEASE); \
$(MAKE) dist-release-finish; \
fi
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
@@ -72,10 +72,10 @@ TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
UPSTREAM_TARBALL_NAME=5.16-rc5
VERSION_ON_UPSTREAM=1
+YSTREAM_FLAG=yes
+ZSTREAM_FLAG=no
_OUTPUT=..
_TAG=v5.16-rc5
-__YSTREAM=yes
-__ZSTREAM=no
DIST_BRANCH="os-build"
DIST=.el7
DISTRO=centos
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
@@ -72,10 +72,10 @@ TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
UPSTREAM_TARBALL_NAME=5.16-rc5
VERSION_ON_UPSTREAM=1
+YSTREAM_FLAG=yes
+ZSTREAM_FLAG=no
_OUTPUT=..
_TAG=v5.16-rc5
-__YSTREAM=yes
-__ZSTREAM=no
DIST_BRANCH="os-build"
DIST=.fc25
DISTRO=centos
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
@@ -72,10 +72,10 @@ TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae586
VERSION_ON_UPSTREAM=1
+YSTREAM_FLAG=yes
+ZSTREAM_FLAG=no
_OUTPUT=..
_TAG=v5.16-11523-g78e36f3b0dae586
-__YSTREAM=yes
-__ZSTREAM=no
DIST_BRANCH="os-build"
DIST=.el7
DISTRO=centos
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
@@ -72,10 +72,10 @@ TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae586
VERSION_ON_UPSTREAM=1
+YSTREAM_FLAG=yes
+ZSTREAM_FLAG=no
_OUTPUT=..
_TAG=v5.16-11523-g78e36f3b0dae586
-__YSTREAM=yes
-__ZSTREAM=no
DIST_BRANCH="os-build"
DIST=.fc25
DISTRO=centos
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
@@ -72,10 +72,10 @@ TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
UPSTREAM_TARBALL_NAME=5.16
VERSION_ON_UPSTREAM=1
+YSTREAM_FLAG=yes
+ZSTREAM_FLAG=no
_OUTPUT=..
_TAG=v5.16
-__YSTREAM=yes
-__ZSTREAM=no
DIST_BRANCH="os-build"
DIST=.el7
DISTRO=centos
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
@@ -72,10 +72,10 @@ TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
UPSTREAM_TARBALL_NAME=5.16
VERSION_ON_UPSTREAM=1
+YSTREAM_FLAG=yes
+ZSTREAM_FLAG=no
_OUTPUT=..
_TAG=v5.16
-__YSTREAM=yes
-__ZSTREAM=no
DIST_BRANCH="os-build"
DIST=.fc25
DISTRO=centos
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
@@ -72,10 +72,10 @@ TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fbd9f
VERSION_ON_UPSTREAM=1
+YSTREAM_FLAG=yes
+ZSTREAM_FLAG=no
_OUTPUT=..
_TAG=v5.16-rc5-1-gfce15c45d3fbd9f
-__YSTREAM=yes
-__ZSTREAM=no
DIST_BRANCH="os-build"
DIST=.el7
DISTRO=centos
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
@@ -72,10 +72,10 @@ TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fbd9f
VERSION_ON_UPSTREAM=1
+YSTREAM_FLAG=yes
+ZSTREAM_FLAG=no
_OUTPUT=..
_TAG=v5.16-rc5-1-gfce15c45d3fbd9f
-__YSTREAM=yes
-__ZSTREAM=no
DIST_BRANCH="os-build"
DIST=.fc25
DISTRO=centos
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
@@ -70,10 +70,10 @@ TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
UPSTREAM_TARBALL_NAME=5.16-rc5
VERSION_ON_UPSTREAM=1
+YSTREAM_FLAG=yes
+ZSTREAM_FLAG=no
_OUTPUT=..
_TAG=v5.16-rc5
-__YSTREAM=yes
-__ZSTREAM=no
DIST_BRANCH="os-build"
DIST=.el7
DISTRO=fedora
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
@@ -70,10 +70,10 @@ TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
UPSTREAM_TARBALL_NAME=5.16-rc5
VERSION_ON_UPSTREAM=1
+YSTREAM_FLAG=yes
+ZSTREAM_FLAG=no
_OUTPUT=..
_TAG=v5.16-rc5
-__YSTREAM=yes
-__ZSTREAM=no
DIST_BRANCH="os-build"
DIST=.fc25
DISTRO=fedora
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
@@ -70,10 +70,10 @@ TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae586
VERSION_ON_UPSTREAM=1
+YSTREAM_FLAG=yes
+ZSTREAM_FLAG=no
_OUTPUT=..
_TAG=v5.16-11523-g78e36f3b0dae586
-__YSTREAM=yes
-__ZSTREAM=no
DIST_BRANCH="os-build"
DIST=.el7
DISTRO=fedora
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
@@ -70,10 +70,10 @@ TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae586
VERSION_ON_UPSTREAM=1
+YSTREAM_FLAG=yes
+ZSTREAM_FLAG=no
_OUTPUT=..
_TAG=v5.16-11523-g78e36f3b0dae586
-__YSTREAM=yes
-__ZSTREAM=no
DIST_BRANCH="os-build"
DIST=.fc25
DISTRO=fedora
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
@@ -70,10 +70,10 @@ TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
UPSTREAM_TARBALL_NAME=5.16
VERSION_ON_UPSTREAM=1
+YSTREAM_FLAG=yes
+ZSTREAM_FLAG=no
_OUTPUT=..
_TAG=v5.16
-__YSTREAM=yes
-__ZSTREAM=no
DIST_BRANCH="os-build"
DIST=.el7
DISTRO=fedora
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
@@ -70,10 +70,10 @@ TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
UPSTREAM_TARBALL_NAME=5.16
VERSION_ON_UPSTREAM=1
+YSTREAM_FLAG=yes
+ZSTREAM_FLAG=no
_OUTPUT=..
_TAG=v5.16
-__YSTREAM=yes
-__ZSTREAM=no
DIST_BRANCH="os-build"
DIST=.fc25
DISTRO=fedora
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
@@ -70,10 +70,10 @@ TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fbd9f
VERSION_ON_UPSTREAM=1
+YSTREAM_FLAG=yes
+ZSTREAM_FLAG=no
_OUTPUT=..
_TAG=v5.16-rc5-1-gfce15c45d3fbd9f
-__YSTREAM=yes
-__ZSTREAM=no
DIST_BRANCH="os-build"
DIST=.el7
DISTRO=fedora
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
@@ -70,10 +70,10 @@ TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fbd9f
VERSION_ON_UPSTREAM=1
+YSTREAM_FLAG=yes
+ZSTREAM_FLAG=no
_OUTPUT=..
_TAG=v5.16-rc5-1-gfce15c45d3fbd9f
-__YSTREAM=yes
-__ZSTREAM=no
DIST_BRANCH="os-build"
DIST=.fc25
DISTRO=fedora
diff --git a/redhat/self-test/data/rhel-2585cf9dfaad.el7
b/redhat/self-test/data/rhel-2585cf9dfaad.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/rhel-2585cf9dfaad.el7
+++ b/redhat/self-test/data/rhel-2585cf9dfaad.el7
@@ -70,10 +70,10 @@ TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
UPSTREAM_TARBALL_NAME=5.16-rc5
VERSION_ON_UPSTREAM=1
+YSTREAM_FLAG=yes
+ZSTREAM_FLAG=no
_OUTPUT=..
_TAG=v5.16-rc5
-__YSTREAM=yes
-__ZSTREAM=no
DIST_BRANCH="os-build"
DIST=.el7
DISTRO=rhel
diff --git a/redhat/self-test/data/rhel-2585cf9dfaad.fc25
b/redhat/self-test/data/rhel-2585cf9dfaad.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/rhel-2585cf9dfaad.fc25
+++ b/redhat/self-test/data/rhel-2585cf9dfaad.fc25
@@ -70,10 +70,10 @@ TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
UPSTREAM_TARBALL_NAME=5.16-rc5
VERSION_ON_UPSTREAM=1
+YSTREAM_FLAG=yes
+ZSTREAM_FLAG=no
_OUTPUT=..
_TAG=v5.16-rc5
-__YSTREAM=yes
-__ZSTREAM=no
DIST_BRANCH="os-build"
DIST=.fc25
DISTRO=rhel
diff --git a/redhat/self-test/data/rhel-78e36f3b0dae.el7
b/redhat/self-test/data/rhel-78e36f3b0dae.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/rhel-78e36f3b0dae.el7
+++ b/redhat/self-test/data/rhel-78e36f3b0dae.el7
@@ -70,10 +70,10 @@ TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae586
VERSION_ON_UPSTREAM=1
+YSTREAM_FLAG=yes
+ZSTREAM_FLAG=no
_OUTPUT=..
_TAG=v5.16-11523-g78e36f3b0dae586
-__YSTREAM=yes
-__ZSTREAM=no
DIST_BRANCH="os-build"
DIST=.el7
DISTRO=rhel
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1757
_______________________________________________
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
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@lists.fedoraproject.org
Do not reply to spam on the list, report it:
https://pagure.io/fedora-infrastructure
