From: Jan Stancek <jstancek@xxxxxxxxxx> redhat: introduce GEMINI and RHEL_REBASE_NUM variable Signed-off-by: Jan Stancek <jstancek@xxxxxxxxxx> diff --git a/Makefile.rhelver b/Makefile.rhelver index blahblah..blahblah 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -14,6 +14,19 @@ RHEL_MINOR = 99 # Do not trim this comment. RHEL_RELEASE = 42 +# +# RHEL_REBASE_NUM +# ---------------- +# +# Used in RPM version string for Gemini kernels, which dont use upstream +# VERSION/PATCHLEVEL/SUBLEVEL. The number represents rebase number for +# current MAJOR release. +# +# Use this spot to avoid future merge conflicts. +# Do not trim this comment. +RHEL_REBASE_NUM = 1 + + # # ZSTREAM # ------- diff --git a/redhat/Makefile.variables b/redhat/Makefile.variables index blahblah..blahblah 100644 --- a/redhat/Makefile.variables +++ b/redhat/Makefile.variables @@ -125,6 +125,12 @@ RHJOBS ?= # considered stable and may be changed or removed without warning. RHSELFTESTDATA ?= +# Use Gemini project versioning - $PACKAGE_NAME-A.B-C.$disttag +# A - major that introduced this kernel +# B - rebase number +# C - build number (X or X.Y.Z) +SPECGEMINI ?= 0 + # If set to 1, this variable will cause the kernel package build to fail if # the selftests fail to build. SPECSELFTESTS_MUST_BUILD ?= 0 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 @@ -59,6 +59,7 @@ RHDISTGIT_CACHE= RHDISTGIT_TMP=/tmp RHEL_MAJOR=9 RHEL_MINOR=99 +RHEL_REBASE_NUM=1 RHGITCOMMIT=2585cf9dfaad RHJOBS=1 RHPKG_BIN=centpkg @@ -71,6 +72,7 @@ SPECBPFTOOLVERSION=7.2.0 SPECBUILD=0.rc5.6.test SPECCHANGELOG=kernel.changelog-9.99 SPECFILE=kernel.spec +SPECGEMINI=0 SPECINCLUDE_FEDORA_FILES=1 SPECINCLUDE_RHEL_FILES=1 SPECKABIVERSION=5.16.0-0.rc5.6.test.el7 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 @@ -59,6 +59,7 @@ RHDISTGIT_CACHE= RHDISTGIT_TMP=/tmp RHEL_MAJOR=9 RHEL_MINOR=99 +RHEL_REBASE_NUM=1 RHGITCOMMIT=2585cf9dfaad RHJOBS=1 RHPKG_BIN=centpkg @@ -71,6 +72,7 @@ SPECBPFTOOLVERSION=7.2.0 SPECBUILD=0.rc5.6.test SPECCHANGELOG=kernel.changelog-9.99 SPECFILE=kernel.spec +SPECGEMINI=0 SPECINCLUDE_FEDORA_FILES=1 SPECINCLUDE_RHEL_FILES=1 SPECKABIVERSION=5.16.0-0.rc5.6.test.fc25 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 @@ -59,6 +59,7 @@ RHDISTGIT_CACHE= RHDISTGIT_TMP=/tmp RHEL_MAJOR=9 RHEL_MINOR=99 +RHEL_REBASE_NUM=1 RHGITCOMMIT=78e36f3b0dae RHJOBS=1 RHPKG_BIN=centpkg @@ -71,6 +72,7 @@ SPECBPFTOOLVERSION=7.2.0 SPECBUILD=0.rc0.78e36f3b0dae.6.test SPECCHANGELOG=kernel.changelog-9.99 SPECFILE=kernel.spec +SPECGEMINI=0 SPECINCLUDE_FEDORA_FILES=1 SPECINCLUDE_RHEL_FILES=1 SPECKABIVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test.el7 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 @@ -59,6 +59,7 @@ RHDISTGIT_CACHE= RHDISTGIT_TMP=/tmp RHEL_MAJOR=9 RHEL_MINOR=99 +RHEL_REBASE_NUM=1 RHGITCOMMIT=78e36f3b0dae RHJOBS=1 RHPKG_BIN=centpkg @@ -71,6 +72,7 @@ SPECBPFTOOLVERSION=7.2.0 SPECBUILD=0.rc0.78e36f3b0dae.6.test SPECCHANGELOG=kernel.changelog-9.99 SPECFILE=kernel.spec +SPECGEMINI=0 SPECINCLUDE_FEDORA_FILES=1 SPECINCLUDE_RHEL_FILES=1 SPECKABIVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test.fc25 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 @@ -59,6 +59,7 @@ RHDISTGIT_CACHE= RHDISTGIT_TMP=/tmp RHEL_MAJOR=9 RHEL_MINOR=99 +RHEL_REBASE_NUM=1 RHGITCOMMIT=df0cc57e057f RHJOBS=1 RHPKG_BIN=centpkg @@ -71,6 +72,7 @@ SPECBPFTOOLVERSION=7.2.0 SPECBUILD=6.test SPECCHANGELOG=kernel.changelog-9.99 SPECFILE=kernel.spec +SPECGEMINI=0 SPECINCLUDE_FEDORA_FILES=1 SPECINCLUDE_RHEL_FILES=1 SPECKABIVERSION=5.16.0-6.test.el7 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 @@ -59,6 +59,7 @@ RHDISTGIT_CACHE= RHDISTGIT_TMP=/tmp RHEL_MAJOR=9 RHEL_MINOR=99 +RHEL_REBASE_NUM=1 RHGITCOMMIT=df0cc57e057f RHJOBS=1 RHPKG_BIN=centpkg @@ -71,6 +72,7 @@ SPECBPFTOOLVERSION=7.2.0 SPECBUILD=6.test SPECCHANGELOG=kernel.changelog-9.99 SPECFILE=kernel.spec +SPECGEMINI=0 SPECINCLUDE_FEDORA_FILES=1 SPECINCLUDE_RHEL_FILES=1 SPECKABIVERSION=5.16.0-6.test.fc25 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 @@ -59,6 +59,7 @@ RHDISTGIT_CACHE= RHDISTGIT_TMP=/tmp RHEL_MAJOR=9 RHEL_MINOR=99 +RHEL_REBASE_NUM=1 RHGITCOMMIT=fce15c45d3fb RHJOBS=1 RHPKG_BIN=centpkg @@ -71,6 +72,7 @@ SPECBPFTOOLVERSION=7.2.0 SPECBUILD=0.rc5.fce15c45d3fb.6.test SPECCHANGELOG=kernel.changelog-9.99 SPECFILE=kernel.spec +SPECGEMINI=0 SPECINCLUDE_FEDORA_FILES=1 SPECINCLUDE_RHEL_FILES=1 SPECKABIVERSION=5.16.0-0.rc5.fce15c45d3fb.6.test.el7 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 @@ -59,6 +59,7 @@ RHDISTGIT_CACHE= RHDISTGIT_TMP=/tmp RHEL_MAJOR=9 RHEL_MINOR=99 +RHEL_REBASE_NUM=1 RHGITCOMMIT=fce15c45d3fb RHJOBS=1 RHPKG_BIN=centpkg @@ -71,6 +72,7 @@ SPECBPFTOOLVERSION=7.2.0 SPECBUILD=0.rc5.fce15c45d3fb.6.test SPECCHANGELOG=kernel.changelog-9.99 SPECFILE=kernel.spec +SPECGEMINI=0 SPECINCLUDE_FEDORA_FILES=1 SPECINCLUDE_RHEL_FILES=1 SPECKABIVERSION=5.16.0-0.rc5.fce15c45d3fb.6.test.fc25 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 @@ -59,6 +59,7 @@ RHDISTGIT_CACHE= RHDISTGIT_TMP=/tmp RHEL_MAJOR=9 RHEL_MINOR=99 +RHEL_REBASE_NUM=1 RHGITCOMMIT=2585cf9dfaad RHJOBS=1 RHPKG_BIN=fedpkg @@ -71,6 +72,7 @@ SPECBPFTOOLVERSION=7.2.0 SPECBUILD=0.rc5.6.test SPECCHANGELOG=kernel.changelog-9.99 SPECFILE=kernel.spec +SPECGEMINI=0 SPECINCLUDE_FEDORA_FILES=1 SPECINCLUDE_RHEL_FILES=1 SPECKABIVERSION=5.16.0 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 @@ -59,6 +59,7 @@ RHDISTGIT_CACHE= RHDISTGIT_TMP=/tmp RHEL_MAJOR=9 RHEL_MINOR=99 +RHEL_REBASE_NUM=1 RHGITCOMMIT=2585cf9dfaad RHJOBS=1 RHPKG_BIN=fedpkg @@ -71,6 +72,7 @@ SPECBPFTOOLVERSION=7.2.0 SPECBUILD=0.rc5.6.test SPECCHANGELOG=kernel.changelog-9.99 SPECFILE=kernel.spec +SPECGEMINI=0 SPECINCLUDE_FEDORA_FILES=1 SPECINCLUDE_RHEL_FILES=1 SPECKABIVERSION=5.16.0 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 @@ -59,6 +59,7 @@ RHDISTGIT_CACHE= RHDISTGIT_TMP=/tmp RHEL_MAJOR=9 RHEL_MINOR=99 +RHEL_REBASE_NUM=1 RHGITCOMMIT=78e36f3b0dae RHJOBS=1 RHPKG_BIN=fedpkg @@ -71,6 +72,7 @@ SPECBPFTOOLVERSION=7.2.0 SPECBUILD=0.rc0.78e36f3b0dae.6.test SPECCHANGELOG=kernel.changelog-9.99 SPECFILE=kernel.spec +SPECGEMINI=0 SPECINCLUDE_FEDORA_FILES=1 SPECINCLUDE_RHEL_FILES=1 SPECKABIVERSION=5.17.0 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 @@ -59,6 +59,7 @@ RHDISTGIT_CACHE= RHDISTGIT_TMP=/tmp RHEL_MAJOR=9 RHEL_MINOR=99 +RHEL_REBASE_NUM=1 RHGITCOMMIT=78e36f3b0dae RHJOBS=1 RHPKG_BIN=fedpkg @@ -71,6 +72,7 @@ SPECBPFTOOLVERSION=7.2.0 SPECBUILD=0.rc0.78e36f3b0dae.6.test SPECCHANGELOG=kernel.changelog-9.99 SPECFILE=kernel.spec +SPECGEMINI=0 SPECINCLUDE_FEDORA_FILES=1 SPECINCLUDE_RHEL_FILES=1 SPECKABIVERSION=5.17.0 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 @@ -59,6 +59,7 @@ RHDISTGIT_CACHE= RHDISTGIT_TMP=/tmp RHEL_MAJOR=9 RHEL_MINOR=99 +RHEL_REBASE_NUM=1 RHGITCOMMIT=df0cc57e057f RHJOBS=1 RHPKG_BIN=fedpkg @@ -71,6 +72,7 @@ SPECBPFTOOLVERSION=7.2.0 SPECBUILD=6.test SPECCHANGELOG=kernel.changelog-9.99 SPECFILE=kernel.spec +SPECGEMINI=0 SPECINCLUDE_FEDORA_FILES=1 SPECINCLUDE_RHEL_FILES=1 SPECKABIVERSION=5.16.0 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 @@ -59,6 +59,7 @@ RHDISTGIT_CACHE= RHDISTGIT_TMP=/tmp RHEL_MAJOR=9 RHEL_MINOR=99 +RHEL_REBASE_NUM=1 RHGITCOMMIT=df0cc57e057f RHJOBS=1 RHPKG_BIN=fedpkg @@ -71,6 +72,7 @@ SPECBPFTOOLVERSION=7.2.0 SPECBUILD=6.test SPECCHANGELOG=kernel.changelog-9.99 SPECFILE=kernel.spec +SPECGEMINI=0 SPECINCLUDE_FEDORA_FILES=1 SPECINCLUDE_RHEL_FILES=1 SPECKABIVERSION=5.16.0 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 @@ -59,6 +59,7 @@ RHDISTGIT_CACHE= RHDISTGIT_TMP=/tmp RHEL_MAJOR=9 RHEL_MINOR=99 +RHEL_REBASE_NUM=1 RHGITCOMMIT=fce15c45d3fb RHJOBS=1 RHPKG_BIN=fedpkg @@ -71,6 +72,7 @@ SPECBPFTOOLVERSION=7.2.0 SPECBUILD=0.rc5.fce15c45d3fb.6.test SPECCHANGELOG=kernel.changelog-9.99 SPECFILE=kernel.spec +SPECGEMINI=0 SPECINCLUDE_FEDORA_FILES=1 SPECINCLUDE_RHEL_FILES=1 SPECKABIVERSION=5.16.0 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 @@ -59,6 +59,7 @@ RHDISTGIT_CACHE= RHDISTGIT_TMP=/tmp RHEL_MAJOR=9 RHEL_MINOR=99 +RHEL_REBASE_NUM=1 RHGITCOMMIT=fce15c45d3fb RHJOBS=1 RHPKG_BIN=fedpkg @@ -71,6 +72,7 @@ SPECBPFTOOLVERSION=7.2.0 SPECBUILD=0.rc5.fce15c45d3fb.6.test SPECCHANGELOG=kernel.changelog-9.99 SPECFILE=kernel.spec +SPECGEMINI=0 SPECINCLUDE_FEDORA_FILES=1 SPECINCLUDE_RHEL_FILES=1 SPECKABIVERSION=5.16.0 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 @@ -59,6 +59,7 @@ RHDISTGIT_CACHE= RHDISTGIT_TMP=/tmp RHEL_MAJOR=9 RHEL_MINOR=99 +RHEL_REBASE_NUM=1 RHGITCOMMIT=2585cf9dfaad RHJOBS=1 RHPKG_BIN=rhpkg @@ -71,6 +72,7 @@ SPECBPFTOOLVERSION=7.2.0 SPECBUILD=0.rc5.6.test SPECCHANGELOG=kernel.changelog-9.99 SPECFILE=kernel.spec +SPECGEMINI=0 SPECINCLUDE_FEDORA_FILES=1 SPECINCLUDE_RHEL_FILES=1 SPECKABIVERSION=5.16.0-0.rc5.6.test.el7 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 @@ -59,6 +59,7 @@ RHDISTGIT_CACHE= RHDISTGIT_TMP=/tmp RHEL_MAJOR=9 RHEL_MINOR=99 +RHEL_REBASE_NUM=1 RHGITCOMMIT=2585cf9dfaad RHJOBS=1 RHPKG_BIN=rhpkg @@ -71,6 +72,7 @@ SPECBPFTOOLVERSION=7.2.0 SPECBUILD=0.rc5.6.test SPECCHANGELOG=kernel.changelog-9.99 SPECFILE=kernel.spec +SPECGEMINI=0 SPECINCLUDE_FEDORA_FILES=1 SPECINCLUDE_RHEL_FILES=1 SPECKABIVERSION=5.16.0-0.rc5.6.test.fc25 -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2386 _______________________________________________ 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, report it: https://pagure.io/fedora-infrastructure/new_issue
