From: Prarit Bhargava <prarit@xxxxxxxxxx>
redhat/Makefile: Rename DISTRO_BUILD to SPECDISTROBUILD
Change DISTRO_BUILD to SPECDISTROBUILD so that readers understand it is passed
into the spec file.
Rename DISTRO_BUILD to SPECDISTROBUILD.
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
@@ -205,10 +205,10 @@ else
endif
SPECVERSION:=$(SPECKVERSION).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL)
-DISTRO_BUILD:=$(PREBUILD)$(shell echo $(BUILD) | sed -e 's|\(^[0-9]\{1,4\}\)\..*|\1|')
-KABI_TARBALL:=$(SOURCES)/kernel-abi-stablelists-$(SPECVERSION)-$(DISTRO_BUILD).tar.bz2
+SPECDISTROBUILD:=$(PREBUILD)$(shell echo $(BUILD) | sed -e 's|\(^[0-9]\{1,4\}\)\..*|\1|')
+KABI_TARBALL:=$(SOURCES)/kernel-abi-stablelists-$(SPECVERSION)-$(SPECDISTROBUILD).tar.bz2
KABIDW := $(REDHAT)/kabi-dwarf
-KABIDW_TARBALL:=$(SOURCES)/kernel-kabi-dw-$(SPECVERSION)-$(DISTRO_BUILD).tar.bz2
+KABIDW_TARBALL:=$(SOURCES)/kernel-kabi-dw-$(SPECVERSION)-$(SPECDISTROBUILD).tar.bz2
SPECBUILD:=$(PREBUILD)$(BUILD)$(BUILDID)
RPMVERSION:=$(SPECVERSION)-$(SPECBUILD)
SPECRELEASE:=$(PREBUILD)$(BUILD)%{?buildid}%{?dist}
@@ -425,12 +425,12 @@ dist-tarball: $(TARBALL)
dist-kernelrelease:
# deprecated at 5.17.0
@echo "WARNING: This target will be deprecated in a future release."
- @echo $(PACKAGE_NAME)-$(SPECVERSION)-$(DISTRO_BUILD)
+ @echo $(PACKAGE_NAME)-$(SPECVERSION)-$(SPECDISTROBUILD)
dist-kernelversion:
# deprecated at 5.17.0
@echo "WARNING: This target will be deprecated in a future release."
- @echo $(SPECVERSION)-$(DISTRO_BUILD)
+ @echo $(SPECVERSION)-$(SPECDISTROBUILD)
dist-specfile: setup-source
# deprecated at 5.17.0
diff --git a/redhat/genspec.sh b/redhat/genspec.sh
index blahblah..blahblah 100755
--- a/redhat/genspec.sh
+++ b/redhat/genspec.sh
@@ -65,7 +65,7 @@ test -f "$SOURCES/$SPECFILE" &&
s/%%SPECKPATCHLEVEL%%/$SPECKPATCHLEVEL/
s/%%SPECBUILD%%/$SPECBUILD/
s/%%SPECRELEASE%%/$SPECRELEASE/
- s/%%DISTRO_BUILD%%/$DISTRO_BUILD/
+ s/%%SPECDISTROBUILD%%/$SPECDISTROBUILD/
s/%%RELEASED_KERNEL%%/$RELEASED_KERNEL/
s/%%DEBUG_BUILDS_ENABLED%%/$DEBUG_BUILDS_ENABLED/
s/%%INCLUDE_FEDORA_FILES%%/$INCLUDE_FEDORA_FILES/
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
@@ -87,7 +87,7 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.)
%define debugbuildsenabled %%DEBUG_BUILDS_ENABLED%%
-%global distro_build %%DISTRO_BUILD%%
+%global distro_build %%SPECDISTROBUILD%%
%if 0%{?fedora}
%define secure_boot_arch x86_64
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
@@ -12,7 +12,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b
CURARCH=x86_64
DIST=.el7
DISTRO=centos
-DISTRO_BUILD=0.rc5.6
EARLY_YBUILD=
EARLY_YRELEASE=
FLAVOR=
@@ -55,6 +54,7 @@ SNAPSHOT=0
SOURCES=../redhat/rpm/SOURCES
SPECBUILD=0.rc5.6.test
SPECCHANGELOG=kernel.changelog-9.99
+SPECDISTROBUILD=0.rc5.6
SPECFILE=kernel.spec
SPECKEXTRAVERSION=-rc5
SPECKPATCHLEVEL=16
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
@@ -12,7 +12,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b
CURARCH=x86_64
DIST=.fc25
DISTRO=centos
-DISTRO_BUILD=0.rc5.6
EARLY_YBUILD=
EARLY_YRELEASE=
FLAVOR=
@@ -55,6 +54,7 @@ SNAPSHOT=0
SOURCES=../redhat/rpm/SOURCES
SPECBUILD=0.rc5.6.test
SPECCHANGELOG=kernel.changelog-9.99
+SPECDISTROBUILD=0.rc5.6
SPECFILE=kernel.spec
SPECKEXTRAVERSION=-rc5
SPECKPATCHLEVEL=16
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
@@ -12,7 +12,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b
CURARCH=x86_64
DIST=.el7
DISTRO=centos
-DISTRO_BUILD=0.rc0.78e36f3b0dae586.6
EARLY_YBUILD=
EARLY_YRELEASE=
FLAVOR=
@@ -55,6 +54,7 @@ SNAPSHOT=1
SOURCES=../redhat/rpm/SOURCES
SPECBUILD=0.rc0.78e36f3b0dae586.6.test
SPECCHANGELOG=kernel.changelog-9.99
+SPECDISTROBUILD=0.rc0.78e36f3b0dae586.6
SPECFILE=kernel.spec
SPECKEXTRAVERSION=
SPECKPATCHLEVEL=17
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
@@ -12,7 +12,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b
CURARCH=x86_64
DIST=.fc25
DISTRO=centos
-DISTRO_BUILD=0.rc0.78e36f3b0dae586.6
EARLY_YBUILD=
EARLY_YRELEASE=
FLAVOR=
@@ -55,6 +54,7 @@ SNAPSHOT=1
SOURCES=../redhat/rpm/SOURCES
SPECBUILD=0.rc0.78e36f3b0dae586.6.test
SPECCHANGELOG=kernel.changelog-9.99
+SPECDISTROBUILD=0.rc0.78e36f3b0dae586.6
SPECFILE=kernel.spec
SPECKEXTRAVERSION=
SPECKPATCHLEVEL=17
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
@@ -12,7 +12,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b
CURARCH=x86_64
DIST=.el7
DISTRO=centos
-DISTRO_BUILD=6
EARLY_YBUILD=
EARLY_YRELEASE=
FLAVOR=
@@ -55,6 +54,7 @@ SNAPSHOT=0
SOURCES=../redhat/rpm/SOURCES
SPECBUILD=6.test
SPECCHANGELOG=kernel.changelog-9.99
+SPECDISTROBUILD=6
SPECFILE=kernel.spec
SPECKEXTRAVERSION=
SPECKPATCHLEVEL=16
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
@@ -12,7 +12,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b
CURARCH=x86_64
DIST=.fc25
DISTRO=centos
-DISTRO_BUILD=6
EARLY_YBUILD=
EARLY_YRELEASE=
FLAVOR=
@@ -55,6 +54,7 @@ SNAPSHOT=0
SOURCES=../redhat/rpm/SOURCES
SPECBUILD=6.test
SPECCHANGELOG=kernel.changelog-9.99
+SPECDISTROBUILD=6
SPECFILE=kernel.spec
SPECKEXTRAVERSION=
SPECKPATCHLEVEL=16
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
@@ -12,7 +12,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b
CURARCH=x86_64
DIST=.el7
DISTRO=centos
-DISTRO_BUILD=0.rc5.fce15c45d3fbd9f.6
EARLY_YBUILD=
EARLY_YRELEASE=
FLAVOR=
@@ -55,6 +54,7 @@ SNAPSHOT=1
SOURCES=../redhat/rpm/SOURCES
SPECBUILD=0.rc5.fce15c45d3fbd9f.6.test
SPECCHANGELOG=kernel.changelog-9.99
+SPECDISTROBUILD=0.rc5.fce15c45d3fbd9f.6
SPECFILE=kernel.spec
SPECKEXTRAVERSION=-rc5
SPECKPATCHLEVEL=16
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
@@ -12,7 +12,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b
CURARCH=x86_64
DIST=.fc25
DISTRO=centos
-DISTRO_BUILD=0.rc5.fce15c45d3fbd9f.6
EARLY_YBUILD=
EARLY_YRELEASE=
FLAVOR=
@@ -55,6 +54,7 @@ SNAPSHOT=1
SOURCES=../redhat/rpm/SOURCES
SPECBUILD=0.rc5.fce15c45d3fbd9f.6.test
SPECCHANGELOG=kernel.changelog-9.99
+SPECDISTROBUILD=0.rc5.fce15c45d3fbd9f.6
SPECFILE=kernel.spec
SPECKEXTRAVERSION=-rc5
SPECKPATCHLEVEL=16
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
@@ -11,7 +11,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b
CURARCH=x86_64
DIST=.el7
DISTRO=fedora
-DISTRO_BUILD=0.rc5.6
EARLY_YBUILD=
EARLY_YRELEASE=
FLAVOR=
@@ -53,6 +52,7 @@ SNAPSHOT=0
SOURCES=../redhat/rpm/SOURCES
SPECBUILD=0.rc5.6.test
SPECCHANGELOG=kernel.changelog-9.99
+SPECDISTROBUILD=0.rc5.6
SPECFILE=kernel.spec
SPECKEXTRAVERSION=-rc5
SPECKPATCHLEVEL=16
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
@@ -11,7 +11,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b
CURARCH=x86_64
DIST=.fc25
DISTRO=fedora
-DISTRO_BUILD=0.rc5.6
EARLY_YBUILD=
EARLY_YRELEASE=
FLAVOR=
@@ -53,6 +52,7 @@ SNAPSHOT=0
SOURCES=../redhat/rpm/SOURCES
SPECBUILD=0.rc5.6.test
SPECCHANGELOG=kernel.changelog-9.99
+SPECDISTROBUILD=0.rc5.6
SPECFILE=kernel.spec
SPECKEXTRAVERSION=-rc5
SPECKPATCHLEVEL=16
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
@@ -11,7 +11,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b
CURARCH=x86_64
DIST=.el7
DISTRO=fedora
-DISTRO_BUILD=0.rc0.78e36f3b0dae586.6
EARLY_YBUILD=
EARLY_YRELEASE=
FLAVOR=
@@ -53,6 +52,7 @@ SNAPSHOT=1
SOURCES=../redhat/rpm/SOURCES
SPECBUILD=0.rc0.78e36f3b0dae586.6.test
SPECCHANGELOG=kernel.changelog-9.99
+SPECDISTROBUILD=0.rc0.78e36f3b0dae586.6
SPECFILE=kernel.spec
SPECKEXTRAVERSION=
SPECKPATCHLEVEL=17
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
@@ -11,7 +11,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b
CURARCH=x86_64
DIST=.fc25
DISTRO=fedora
-DISTRO_BUILD=0.rc0.78e36f3b0dae586.6
EARLY_YBUILD=
EARLY_YRELEASE=
FLAVOR=
@@ -53,6 +52,7 @@ SNAPSHOT=1
SOURCES=../redhat/rpm/SOURCES
SPECBUILD=0.rc0.78e36f3b0dae586.6.test
SPECCHANGELOG=kernel.changelog-9.99
+SPECDISTROBUILD=0.rc0.78e36f3b0dae586.6
SPECFILE=kernel.spec
SPECKEXTRAVERSION=
SPECKPATCHLEVEL=17
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
@@ -11,7 +11,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b
CURARCH=x86_64
DIST=.el7
DISTRO=fedora
-DISTRO_BUILD=6
EARLY_YBUILD=
EARLY_YRELEASE=
FLAVOR=
@@ -53,6 +52,7 @@ SNAPSHOT=0
SOURCES=../redhat/rpm/SOURCES
SPECBUILD=6.test
SPECCHANGELOG=kernel.changelog-9.99
+SPECDISTROBUILD=6
SPECFILE=kernel.spec
SPECKEXTRAVERSION=
SPECKPATCHLEVEL=16
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
@@ -11,7 +11,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b
CURARCH=x86_64
DIST=.fc25
DISTRO=fedora
-DISTRO_BUILD=6
EARLY_YBUILD=
EARLY_YRELEASE=
FLAVOR=
@@ -53,6 +52,7 @@ SNAPSHOT=0
SOURCES=../redhat/rpm/SOURCES
SPECBUILD=6.test
SPECCHANGELOG=kernel.changelog-9.99
+SPECDISTROBUILD=6
SPECFILE=kernel.spec
SPECKEXTRAVERSION=
SPECKPATCHLEVEL=16
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
@@ -11,7 +11,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b
CURARCH=x86_64
DIST=.el7
DISTRO=fedora
-DISTRO_BUILD=0.rc5.fce15c45d3fbd9f.6
EARLY_YBUILD=
EARLY_YRELEASE=
FLAVOR=
@@ -53,6 +52,7 @@ SNAPSHOT=1
SOURCES=../redhat/rpm/SOURCES
SPECBUILD=0.rc5.fce15c45d3fbd9f.6.test
SPECCHANGELOG=kernel.changelog-9.99
+SPECDISTROBUILD=0.rc5.fce15c45d3fbd9f.6
SPECFILE=kernel.spec
SPECKEXTRAVERSION=-rc5
SPECKPATCHLEVEL=16
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
@@ -11,7 +11,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b
CURARCH=x86_64
DIST=.fc25
DISTRO=fedora
-DISTRO_BUILD=0.rc5.fce15c45d3fbd9f.6
EARLY_YBUILD=
EARLY_YRELEASE=
FLAVOR=
@@ -53,6 +52,7 @@ SNAPSHOT=1
SOURCES=../redhat/rpm/SOURCES
SPECBUILD=0.rc5.fce15c45d3fbd9f.6.test
SPECCHANGELOG=kernel.changelog-9.99
+SPECDISTROBUILD=0.rc5.fce15c45d3fbd9f.6
SPECFILE=kernel.spec
SPECKEXTRAVERSION=-rc5
SPECKPATCHLEVEL=16
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
@@ -11,7 +11,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b
CURARCH=x86_64
DIST=.el7
DISTRO=rhel
-DISTRO_BUILD=0.rc5.6
EARLY_YBUILD=
EARLY_YRELEASE=
FLAVOR=
@@ -53,6 +52,7 @@ SNAPSHOT=0
SOURCES=../redhat/rpm/SOURCES
SPECBUILD=0.rc5.6.test
SPECCHANGELOG=kernel.changelog-9.99
+SPECDISTROBUILD=0.rc5.6
SPECFILE=kernel.spec
SPECKEXTRAVERSION=-rc5
SPECKPATCHLEVEL=16
--
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
