6:28 p.m.
From: Prarit Bhargava on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1757
Depends: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1728
This is a collection of various improvements and fixes for the redhat/Makefile
variables. These fixes include renaming and reorganizing of variables, an
explanation of how the kernel NVR is constructed, and fixing the dist-brew &
distg-brew so they can be executed without specifying any extra variables.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
---
redhat/scripts/new_release.sh | 24 +--
redhat/self-test/data/centos-2585cf9dfaad.el7 | 15 +-
redhat/self-test/data/centos-2585cf9dfaad.el7.spec | 64 +++++-----
redhat/self-test/data/centos-2585cf9dfaad.fc25 | 15 +-
redhat/self-test/data/centos-2585cf9dfaad.fc25.spec | 64 +++++-----
redhat/self-test/data/centos-78e36f3b0dae.el7 | 16 +-
redhat/self-test/data/centos-78e36f3b0dae.el7.spec | 64 +++++-----
redhat/self-test/data/centos-78e36f3b0dae.fc25 | 16 +-
redhat/self-test/data/centos-78e36f3b0dae.fc25.spec | 64 +++++-----
redhat/self-test/data/centos-df0cc57e057f.el7 | 15 +-
redhat/self-test/data/centos-df0cc57e057f.el7.spec | 64 +++++-----
redhat/self-test/data/centos-df0cc57e057f.fc25 | 15 +-
redhat/self-test/data/centos-df0cc57e057f.fc25.spec | 64 +++++-----
redhat/self-test/data/centos-fce15c45d3fb.el7 | 16 +-
redhat/self-test/data/centos-fce15c45d3fb.el7.spec | 64 +++++-----
redhat/self-test/data/centos-fce15c45d3fb.fc25 | 16 +-
redhat/self-test/data/centos-fce15c45d3fb.fc25.spec | 64 +++++-----
redhat/self-test/data/create-data.sh | 2 +
redhat/self-test/data/fedora-2585cf9dfaad.el7 | 15 +-
redhat/self-test/data/fedora-2585cf9dfaad.el7.spec | 64 +++++-----
redhat/self-test/data/fedora-2585cf9dfaad.fc25 | 15 +-
redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec | 64 +++++-----
redhat/self-test/data/fedora-78e36f3b0dae.el7 | 16 +-
redhat/self-test/data/fedora-78e36f3b0dae.el7.spec | 64 +++++-----
redhat/self-test/data/fedora-78e36f3b0dae.fc25 | 16 +-
redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec | 64 +++++-----
redhat/self-test/data/fedora-df0cc57e057f.el7 | 15 +-
redhat/self-test/data/fedora-df0cc57e057f.el7.spec | 64 +++++-----
redhat/self-test/data/fedora-df0cc57e057f.fc25 | 15 +-
redhat/self-test/data/fedora-df0cc57e057f.fc25.spec | 64 +++++-----
redhat/self-test/data/fedora-fce15c45d3fb.el7 | 16 +-
redhat/self-test/data/fedora-fce15c45d3fb.el7.spec | 64 +++++-----
redhat/self-test/data/fedora-fce15c45d3fb.fc25 | 16 +-
redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec | 64 +++++-----
redhat/self-test/data/rhel-2585cf9dfaad.el7 | 15 +-
redhat/self-test/data/rhel-2585cf9dfaad.el7.spec | 64 +++++-----
redhat/self-test/data/rhel-2585cf9dfaad.fc25 | 15 +-
redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec | 64 +++++-----
redhat/self-test/data/rhel-78e36f3b0dae.el7 | 16 +-
redhat/self-test/data/rhel-78e36f3b0dae.el7.spec | 64 +++++-----
redhat/self-test/data/rhel-78e36f3b0dae.fc25 | 16 +-
redhat/self-test/data/rhel-78e36f3b0dae.fc25.spec | 64 +++++-----
redhat/self-test/data/rhel-df0cc57e057f.el7 | 15 +-
redhat/self-test/data/rhel-df0cc57e057f.el7.spec | 64 +++++-----
redhat/self-test/data/rhel-df0cc57e057f.fc25 | 15 +-
redhat/self-test/data/rhel-df0cc57e057f.fc25.spec | 64 +++++-----
redhat/self-test/data/rhel-fce15c45d3fb.el7 | 16 +-
redhat/self-test/data/rhel-fce15c45d3fb.el7.spec | 64 +++++-----
redhat/self-test/data/rhel-fce15c45d3fb.fc25 | 16 +-
redhat/self-test/data/rhel-fce15c45d3fb.fc25.spec | 64 +++++-----
redhat/Makefile | 124 +++++++++++--------
redhat/Makefile.cross | 28 ++--
redhat/Makefile.variables | 2 +-
redhat/genspec.sh | 13 +-
redhat/kernel.spec.template | 64 +++++-----
55 files changed, 1057 insertions(+), 1108 deletions(-)
6:28 p.m.
New subject: [OS-BUILD PATCH 1/17] redhat/Makefile: Remove KEXTRAVERSION
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/Makefile: Remove KEXTRAVERSION
KEXTRAVERSION isn't used for anything and can be removed.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -147,11 +147,9 @@ endif
# from makefile as opposed to any adjusted version for snapshotting.
ifneq ($(SPECKEXTRAVERSION),)
MARKER:=v$(SPECKVERSION).$(SPECKPATCHLEVEL)$(SPECKEXTRAVERSION)
- KEXTRAVERSION:=$(shell echo $(SPECKEXTRAVERSION) | sed -e s/-/./)
- PREBUILD:=0$(KEXTRAVERSION).
+ PREBUILD:=0$(shell echo $(SPECKEXTRAVERSION) | sed -e s/-/./).
UPSTREAM_TARBALL_NAME:=$(SPECKVERSION).$(SPECKPATCHLEVEL)$(SPECKEXTRAVERSION)
else
- KEXTRAVERSION:=
ifeq ($(SPECKSUBLEVEL),0)
MARKER:=v$(SPECKVERSION).$(SPECKPATCHLEVEL)
UPSTREAM_TARBALL_NAME:=$(SPECKVERSION).$(SPECKPATCHLEVEL)
@@ -195,8 +193,7 @@ ifeq ($(VERSION_ON_UPSTREAM),1)
# packaging. Fix this by bumping the patch level and marking
# this as rc0
ifeq ($(SPECKEXTRAVERSION),)
- KEXTRAVERSION:=.rc0
- PREBUILD:=0$(KEXTRAVERSION).
+ PREBUILD:=0.rc0.
SPECKPATCHLEVEL:=$(shell expr $(SPECKPATCHLEVEL) + 1)
endif
ifndef PREBUILD_GIT_ONLY
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
@@ -24,7 +24,6 @@ INCLUDE_RHEL_FILES=1
KABIDW=../redhat/kabi-dwarf
KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.tar.bz2
KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.tar.bz2
-KEXTRAVERSION=.rc5
LANG=C
LOCVERFILE=../localversion
MACH=x86_64
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
@@ -24,7 +24,6 @@ INCLUDE_RHEL_FILES=1
KABIDW=../redhat/kabi-dwarf
KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.tar.bz2
KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.tar.bz2
-KEXTRAVERSION=.rc5
LANG=C
LOCVERFILE=../localversion
MACH=x86_64
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
@@ -24,7 +24,6 @@ INCLUDE_RHEL_FILES=1
KABIDW=../redhat/kabi-dwarf
KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.bz2
KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.bz2
-KEXTRAVERSION=.rc0
LANG=C
LOCVERFILE=../localversion
MACH=x86_64
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
@@ -24,7 +24,6 @@ INCLUDE_RHEL_FILES=1
KABIDW=../redhat/kabi-dwarf
KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.bz2
KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.bz2
-KEXTRAVERSION=.rc0
LANG=C
LOCVERFILE=../localversion
MACH=x86_64
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
@@ -24,7 +24,6 @@ INCLUDE_RHEL_FILES=1
KABIDW=../redhat/kabi-dwarf
KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-6.test.tar.bz2
KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-6.test.tar.bz2
-KEXTRAVERSION=
LANG=C
LOCVERFILE=../localversion
MACH=x86_64
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
@@ -24,7 +24,6 @@ INCLUDE_RHEL_FILES=1
KABIDW=../redhat/kabi-dwarf
KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-6.test.tar.bz2
KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-6.test.tar.bz2
-KEXTRAVERSION=
LANG=C
LOCVERFILE=../localversion
MACH=x86_64
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
@@ -24,7 +24,6 @@ INCLUDE_RHEL_FILES=1
KABIDW=../redhat/kabi-dwarf
KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.bz2
KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.bz2
-KEXTRAVERSION=.rc5
LANG=C
LOCVERFILE=../localversion
MACH=x86_64
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
@@ -24,7 +24,6 @@ INCLUDE_RHEL_FILES=1
KABIDW=../redhat/kabi-dwarf
KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.bz2
KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.bz2
-KEXTRAVERSION=.rc5
LANG=C
LOCVERFILE=../localversion
MACH=x86_64
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
@@ -22,7 +22,6 @@ INCLUDE_RHEL_FILES=1
KABIDW=../redhat/kabi-dwarf
KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.tar.bz2
KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.tar.bz2
-KEXTRAVERSION=.rc5
LANG=C
LOCVERFILE=../localversion
MACH=x86_64
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
@@ -22,7 +22,6 @@ INCLUDE_RHEL_FILES=1
KABIDW=../redhat/kabi-dwarf
KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.tar.bz2
KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.tar.bz2
-KEXTRAVERSION=.rc5
LANG=C
LOCVERFILE=../localversion
MACH=x86_64
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
@@ -22,7 +22,6 @@ INCLUDE_RHEL_FILES=1
KABIDW=../redhat/kabi-dwarf
KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.bz2
KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.bz2
-KEXTRAVERSION=.rc0
LANG=C
LOCVERFILE=../localversion
MACH=x86_64
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
@@ -22,7 +22,6 @@ INCLUDE_RHEL_FILES=1
KABIDW=../redhat/kabi-dwarf
KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.bz2
KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.bz2
-KEXTRAVERSION=.rc0
LANG=C
LOCVERFILE=../localversion
MACH=x86_64
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
@@ -22,7 +22,6 @@ INCLUDE_RHEL_FILES=1
KABIDW=../redhat/kabi-dwarf
KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-6.test.tar.bz2
KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-6.test.tar.bz2
-KEXTRAVERSION=
LANG=C
LOCVERFILE=../localversion
MACH=x86_64
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
@@ -22,7 +22,6 @@ INCLUDE_RHEL_FILES=1
KABIDW=../redhat/kabi-dwarf
KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-6.test.tar.bz2
KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-6.test.tar.bz2
-KEXTRAVERSION=
LANG=C
LOCVERFILE=../localversion
MACH=x86_64
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
@@ -22,7 +22,6 @@ INCLUDE_RHEL_FILES=1
KABIDW=../redhat/kabi-dwarf
KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.bz2
KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.bz2
-KEXTRAVERSION=.rc5
LANG=C
LOCVERFILE=../localversion
MACH=x86_64
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
@@ -22,7 +22,6 @@ INCLUDE_RHEL_FILES=1
KABIDW=../redhat/kabi-dwarf
KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.bz2
KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.bz2
-KEXTRAVERSION=.rc5
LANG=C
LOCVERFILE=../localversion
MACH=x86_64
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
@@ -22,7 +22,6 @@ INCLUDE_RHEL_FILES=1
KABIDW=../redhat/kabi-dwarf
KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.tar.bz2
KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.tar.bz2
-KEXTRAVERSION=.rc5
LANG=C
LOCVERFILE=../localversion
MACH=x86_64
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
@@ -22,7 +22,6 @@ INCLUDE_RHEL_FILES=1
KABIDW=../redhat/kabi-dwarf
KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.tar.bz2
KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.tar.bz2
-KEXTRAVERSION=.rc5
LANG=C
LOCVERFILE=../localversion
MACH=x86_64
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
@@ -22,7 +22,6 @@ INCLUDE_RHEL_FILES=1
KABIDW=../redhat/kabi-dwarf
KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.bz2
KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.bz2
-KEXTRAVERSION=.rc0
LANG=C
LOCVERFILE=../localversion
MACH=x86_64
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1757
6:28 p.m.
New subject: [OS-BUILD PATCH 2/17] redhat/Makefile: Use SPECFILE variable
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/Makefile: Use SPECFILE variable
Use the SPECFILE variable throughout the Makefiles.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -548,7 +548,7 @@ dist-test-patch: generate-testpatch-tmp
@mv $(TESTPATCH).tmp $(TESTPATCH);
do-rpmbuild: dist-sources
- $(RPMBUILD) --define "_sourcedir $(SOURCES)" --define "_builddir
$(RPM)/BUILD" --define "_srcrpmdir $(RPM)/SRPMS" --define "_rpmdir
$(RPM)/RPMS" --define "_specdir $(RPM)/SPECS" --define "dist
$(DIST)" $(RPMBUILDOPTS) $(RPM)/SOURCES/$(PACKAGE_NAME).spec
+ $(RPMBUILD) --define "_sourcedir $(SOURCES)" --define "_builddir
$(RPM)/BUILD" --define "_srcrpmdir $(RPM)/SRPMS" --define "_rpmdir
$(RPM)/RPMS" --define "_specdir $(RPM)/SPECS" --define "dist
$(DIST)" $(RPMBUILDOPTS) $(RPM)/SOURCES/$(SPECFILE)
dist-all-rpms: RPMBUILDOPTS=--target $(MACH) -ba
dist-all-rpms: dist-sources do-rpmbuild
@@ -580,7 +580,7 @@ dist-release-finish: setup-source
@cp $(SOURCES)/$(SPECCHANGELOG) $(REDHAT)/$(SPECCHANGELOG)
@$(GIT) add $(REDHAT)/$(SPECCHANGELOG)
@$(GIT) add $(REDHAT)/marker
- @$(GIT) commit -s ../Makefile.rhelver $(REDHAT)/marker $(REDHAT)/$(SPECCHANGELOG)
$(PACKAGE_NAME).spec.template -m "[redhat] $(PACKAGE_NAME)-$(RPMVERSION)"
+ @$(GIT) commit -s ../Makefile.rhelver $(REDHAT)/marker $(REDHAT)/$(SPECCHANGELOG)
$(SPECFILE).template -m "[redhat] $(PACKAGE_NAME)-$(RPMVERSION)"
dist-release-changed: setup-source
@cp $(SOURCES)/$(SPECCHANGELOG) $(REDHAT)/$(SPECCHANGELOG)
@echo $(MARKER) > $(REDHAT)/marker
@@ -643,8 +643,8 @@ dist-brew dist-koji: dist-%: dist-vr-check dist-srpm
distg-brew distg-koji: distg-%: dist-vr-check
$* $(BUILD_PROFILE) build $(BUILD_FLAGS) $(BUILD_TARGET)
"$(RHGITURL)?redhat/koji#$(RHGITCOMMIT)"
-.PHONY: $(REDHAT)/rpm/SOURCES/$(PACKAGE_NAME).spec
-$(REDHAT)/rpm/SOURCES/$(PACKAGE_NAME).spec:
+.PHONY: $(REDHAT)/rpm/SOURCES/$(SPECFILE)
+$(REDHAT)/rpm/SOURCES/$(SPECFILE):
@echo "dist-sources"
@$(MAKE) dist-sources
diff --git a/redhat/Makefile.cross b/redhat/Makefile.cross
index blahblah..blahblah 100644
--- a/redhat/Makefile.cross
+++ b/redhat/Makefile.cross
@@ -26,46 +26,46 @@ dist-cross-download:
dist-cross-aarch64-rpms: dist-cross-download dist-sources
$(REDHAT)/scripts/x86_rngd.sh
- $(CROSS_RPMFLAGS) --target aarch64 --with cross -ba $(RPM)/SOURCES/$(PACKAGE_NAME).spec
+ $(CROSS_RPMFLAGS) --target aarch64 --with cross -ba $(RPM)/SOURCES/$(SPECFILE)
$(REDHAT)/scripts/generate-cross-report.sh "aarch64"
dist-cross-ppc64-rpms: dist-cross-download dist-sources
$(REDHAT)/scripts/x86_rngd.sh
- $(CROSS_RPMFLAGS) --target ppc64 --with cross -ba $(RPM)/SOURCES/$(PACKAGE_NAME).spec
+ $(CROSS_RPMFLAGS) --target ppc64 --with cross -ba $(RPM)/SOURCES/$(SPECFILE)
$(REDHAT)/scripts/generate-cross-report.sh "ppc64"
dist-cross-s390x-rpms: dist-cross-download dist-sources
$(REDHAT)/scripts/x86_rngd.sh
- $(CROSS_RPMFLAGS) --target s390x --with cross -ba $(RPM)/SOURCES/$(PACKAGE_NAME).spec
+ $(CROSS_RPMFLAGS) --target s390x --with cross -ba $(RPM)/SOURCES/$(SPECFILE)
$(REDHAT)/scripts/generate-cross-report.sh "s390x"
dist-cross-all-rpms: dist-cross-download dist-sources
$(REDHAT)/scripts/x86_rngd.sh
- $(CROSS_RPMFLAGS) --target aarch64 --with cross -ba $(RPM)/SOURCES/$(PACKAGE_NAME).spec
- $(CROSS_RPMFLAGS) --target ppc64 --with cross -ba $(RPM)/SOURCES/$(PACKAGE_NAME).spec
- $(CROSS_RPMFLAGS) --target s390x --with cross -ba $(RPM)/SOURCES/$(PACKAGE_NAME).spec
- $(CROSS_RPMFLAGS) -ba $(RPM)/SOURCES/$(PACKAGE_NAME).spec
+ $(CROSS_RPMFLAGS) --target aarch64 --with cross -ba $(RPM)/SOURCES/$(SPECFILE)
+ $(CROSS_RPMFLAGS) --target ppc64 --with cross -ba $(RPM)/SOURCES/$(SPECFILE)
+ $(CROSS_RPMFLAGS) --target s390x --with cross -ba $(RPM)/SOURCES/$(SPECFILE)
+ $(CROSS_RPMFLAGS) -ba $(RPM)/SOURCES/$(SPECFILE)
$(REDHAT)/scripts/generate-cross-report.sh "aarch64 ppc64 s390x x86_64"
dist-cross-aarch64-build: dist-cross-download dist-sources
$(REDHAT)/scripts/x86_rngd.sh
- $(CROSS_RPMFLAGS) --target aarch64 --with cross --without debuginfo -bc
$(RPM)/SOURCES/$(PACKAGE_NAME).spec
+ $(CROSS_RPMFLAGS) --target aarch64 --with cross --without debuginfo -bc
$(RPM)/SOURCES/$(SPECFILE)
$(REDHAT)/scripts/generate-cross-report.sh "aarch64"
dist-cross-ppc64-build: dist-cross-download dist-sources
$(REDHAT)/scripts/x86_rngd.sh
- $(CROSS_RPMFLAGS) --target ppc64 --with cross --without debuginfo -bc
$(RPM)/SOURCES/$(PACKAGE_NAME).spec
+ $(CROSS_RPMFLAGS) --target ppc64 --with cross --without debuginfo -bc
$(RPM)/SOURCES/$(SPECFILE)
$(REDHAT)/scripts/generate-cross-report.sh "ppc64"
dist-cross-s390x-build: dist-cross-download dist-sources
$(REDHAT)/scripts/x86_rngd.sh
- $(CROSS_RPMFLAGS) --target s390x --with cross --without debuginfo -bc
$(RPM)/SOURCES/$(PACKAGE_NAME).spec
+ $(CROSS_RPMFLAGS) --target s390x --with cross --without debuginfo -bc
$(RPM)/SOURCES/$(SPECFILE)
$(REDHAT)/scripts/generate-cross-report.sh "s390x"
dist-cross-all-builds: dist-cross-download dist-sources
$(REDHAT)/scripts/x86_rngd.sh
- $(CROSS_RPMFLAGS) --target aarch64 --with cross --without debuginfo -bc
$(RPM)/SOURCES/$(PACKAGE_NAME).spec
- $(CROSS_RPMFLAGS) --target ppc64 --with cross --without debuginfo -bc
$(RPM)/SOURCES/$(PACKAGE_NAME).spec
- $(CROSS_RPMFLAGS) --target s390x --with cross --without debuginfo -bc
$(RPM)/SOURCES/$(PACKAGE_NAME).spec
- $(CROSS_RPMFLAGS) --without debuginfo -bc $(RPM)/SOURCES/$(PACKAGE_NAME).spec
+ $(CROSS_RPMFLAGS) --target aarch64 --with cross --without debuginfo -bc
$(RPM)/SOURCES/$(SPECFILE)
+ $(CROSS_RPMFLAGS) --target ppc64 --with cross --without debuginfo -bc
$(RPM)/SOURCES/$(SPECFILE)
+ $(CROSS_RPMFLAGS) --target s390x --with cross --without debuginfo -bc
$(RPM)/SOURCES/$(SPECFILE)
+ $(CROSS_RPMFLAGS) --without debuginfo -bc $(RPM)/SOURCES/$(SPECFILE)
$(REDHAT)/scripts/generate-cross-report.sh "aarch64 ppc64 s390x x86_64"
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1757
6:28 p.m.
New subject: [OS-BUILD PATCH 3/17] redhat/Makefile: Add kernel-NVR comment
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/Makefile: Add kernel-NVR comment
Add a comment explaining the variables used in constructing the kernel
package's NVR, and reorganize the variables.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -216,14 +216,30 @@ else
SNAPSHOT:=0
endif
-SPECVERSION:=$(SPECKVERSION).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL)
+# This section contains the variables that represent the kernel rpm's NVR.
+# The NVR looks like, for example, kernel-5.17.0-0.rc8.551acdc3c3d2.124.test.fc35.
+# This string can be deconstructed as
+#
+#
$(PACKAGE_NAME)-$(SPECKVERSION).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL)-$(PREBUILD)$(BUILD)$(BUILDID)$(DIST)
+#
+# This can be evaluated as
+#
+# $(PACKAGE_NAME)-$(SPECKVERSION).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL)-$(SPECBUILD)
$(DIST)
+# $(PACKAGE_NAME)-$(SPECVERSION) -$(SPECBUILD)
$(DIST)
+# $(PACKAGE_NAME)-$(RPMVERSION)
$(DIST)
+# $(RELEASETAG)
$(DIST)
+#
SPECBUILD:=$(PREBUILD)$(BUILD)$(BUILDID)
-KABI_TARBALL:=$(SOURCES)/kernel-abi-stablelists-$(SPECVERSION)-$(SPECBUILD).tar.bz2
-KABIDW := $(REDHAT)/kabi-dwarf
-KABIDW_TARBALL:=$(SOURCES)/kernel-kabi-dw-$(SPECVERSION)-$(SPECBUILD).tar.bz2
+SPECVERSION:=$(SPECKVERSION).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL)
RPMVERSION:=$(SPECVERSION)-$(SPECBUILD)
+RELEASETAG=$(PACKAGE_NAME)-$(RPMVERSION)
+SRPM:=$(SRPMS)/$(RELEASETAG)$(DIST).src.rpm
SPECRELEASE:=$(PREBUILD)$(BUILD)%{?buildid}%{?dist}
-SRPM:=$(SRPMS)/$(PACKAGE_NAME)-$(RPMVERSION)$(DIST).src.rpm
+
+# kabi variables
+KABI_TARBALL:=$(SOURCES)/kernel-abi-stablelists-$(RPMVERSION).tar.bz2
+KABIDW := $(REDHAT)/kabi-dwarf
+KABIDW_TARBALL:=$(SOURCES)/kernel-kabi-dw-$(RPMVERSION).tar.bz2
#
# This conditional statement is where fedora, centos, and other (aka RHEL)
@@ -436,12 +452,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)-$(SPECBUILD)
+ @echo $(PACKAGE_NAME)-$(RPMVERSION)
dist-kernelversion:
# deprecated at 5.17.0
@echo "WARNING: This target will be deprecated in a future release."
- @echo $(SPECVERSION)-$(SPECBUILD)
+ @echo $(RPMVERSION)
dist-specfile: setup-source
# deprecated at 5.17.0
@@ -580,7 +596,7 @@ dist-release-finish: setup-source
@cp $(SOURCES)/$(SPECCHANGELOG) $(REDHAT)/$(SPECCHANGELOG)
@$(GIT) add $(REDHAT)/$(SPECCHANGELOG)
@$(GIT) add $(REDHAT)/marker
- @$(GIT) commit -s ../Makefile.rhelver $(REDHAT)/marker $(REDHAT)/$(SPECCHANGELOG)
$(SPECFILE).template -m "[redhat] $(PACKAGE_NAME)-$(RPMVERSION)"
+ @$(GIT) commit -s ../Makefile.rhelver $(REDHAT)/marker $(REDHAT)/$(SPECCHANGELOG)
$(SPECFILE).template -m "[redhat] $(RELEASETAG)"
dist-release-changed: setup-source
@cp $(SOURCES)/$(SPECCHANGELOG) $(REDHAT)/$(SPECCHANGELOG)
@echo $(MARKER) > $(REDHAT)/marker
@@ -596,7 +612,7 @@ dist-release-changed: setup-source
dist-release: dist-clean-sources
@$(MAKE) dist-release-changed
dist-release-tag:
- @$(GIT) tag -a -m "$(PACKAGE_NAME)-$(RPMVERSION)"
$(PACKAGE_NAME)-$(RPMVERSION)
+ @$(GIT) tag -a -m "$(RELEASETAG)" $(RELEASETAG)
git-tree-check:
@if test -n "$(DIST_PUSH)" && test -z "$(shell $(GIT) remote
get-url gitlab 2>/dev/null)"; then \
@@ -638,7 +654,7 @@ dist-vr-check:
fi
dist-brew dist-koji: dist-%: dist-vr-check dist-srpm
- $* $(BUILD_PROFILE) build $(BUILD_FLAGS) $(BUILD_TARGET)
$(SRPMS)/$(PACKAGE_NAME)-$(RPMVERSION)$(DIST).src.rpm $(OUTPUT_FILE)
+ $* $(BUILD_PROFILE) build $(BUILD_FLAGS) $(BUILD_TARGET)
$(SRPMS)/$(RELEASETAG)$(DIST).src.rpm $(OUTPUT_FILE)
distg-brew distg-koji: distg-%: dist-vr-check
$* $(BUILD_PROFILE) build $(BUILD_FLAGS) $(BUILD_TARGET)
"$(RHGITURL)?redhat/koji#$(RHGITCOMMIT)"
diff --git a/redhat/genspec.sh b/redhat/genspec.sh
index blahblah..blahblah 100755
--- a/redhat/genspec.sh
+++ b/redhat/genspec.sh
@@ -95,7 +95,7 @@ fi
GIT_FORMAT="--format=- %s (%an)%n%N%n^^^NOTES-END^^^%n%b"
GIT_NOTES="--notes=refs/notes/${RHEL_MAJOR}.${RHEL_MINOR}*"
-lasttag=$(git rev-list --first-parent --grep="^\[redhat\]
kernel-${SPECKVERSION}.${SPECKPATCHLEVEL}" --max-count=1 HEAD)
+lasttag=$(git rev-list --first-parent --grep="^\[redhat\] ${RELEASETAG}"
--max-count=1 HEAD)
# if we didn't find the proper tag, assume this is the first release
if [[ -z $lasttag ]]; then
if [[ -z ${MARKER//[0-9a-f]/} ]]; then
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
@@ -36,6 +36,7 @@ PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
RELEASED_KERNEL=0
+RELEASETAG=kernel-5.16.0-0.rc5.6.test
RHDISTGIT=git@gitlab.com:/kernel.git
RHDISTGIT_BRANCH=c9s
RHDISTGIT_TMP=/tmp
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
@@ -36,6 +36,7 @@ PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
RELEASED_KERNEL=0
+RELEASETAG=kernel-5.16.0-0.rc5.6.test
RHDISTGIT=git@gitlab.com:/kernel.git
RHDISTGIT_BRANCH=c9s
RHDISTGIT_TMP=/tmp
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
@@ -36,6 +36,7 @@ PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
RELEASED_KERNEL=0
+RELEASETAG=kernel-5.17.0-0.rc0.78e36f3b0dae586.6.test
RHDISTGIT=git@gitlab.com:/kernel.git
RHDISTGIT_BRANCH=c9s
RHDISTGIT_TMP=/tmp
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
@@ -36,6 +36,7 @@ PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
RELEASED_KERNEL=0
+RELEASETAG=kernel-5.17.0-0.rc0.78e36f3b0dae586.6.test
RHDISTGIT=git@gitlab.com:/kernel.git
RHDISTGIT_BRANCH=c9s
RHDISTGIT_TMP=/tmp
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
@@ -36,6 +36,7 @@ PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
RELEASED_KERNEL=0
+RELEASETAG=kernel-5.16.0-6.test
RHDISTGIT=git@gitlab.com:/kernel.git
RHDISTGIT_BRANCH=c9s
RHDISTGIT_TMP=/tmp
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
@@ -36,6 +36,7 @@ PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
RELEASED_KERNEL=0
+RELEASETAG=kernel-5.16.0-6.test
RHDISTGIT=git@gitlab.com:/kernel.git
RHDISTGIT_BRANCH=c9s
RHDISTGIT_TMP=/tmp
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
@@ -36,6 +36,7 @@ PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
RELEASED_KERNEL=0
+RELEASETAG=kernel-5.16.0-0.rc5.fce15c45d3fbd9f.6.test
RHDISTGIT=git@gitlab.com:/kernel.git
RHDISTGIT_BRANCH=c9s
RHDISTGIT_TMP=/tmp
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
@@ -36,6 +36,7 @@ PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
RELEASED_KERNEL=0
+RELEASETAG=kernel-5.16.0-0.rc5.fce15c45d3fbd9f.6.test
RHDISTGIT=git@gitlab.com:/kernel.git
RHDISTGIT_BRANCH=c9s
RHDISTGIT_TMP=/tmp
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
@@ -34,6 +34,7 @@ PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
RELEASED_KERNEL=0
+RELEASETAG=kernel-5.16.0-0.rc5.6.test
RHDISTGIT=ssh://"shadowman"@pkgs.fedoraproject.org/rpms/kernel
RHDISTGIT_BRANCH=rawhide
RHDISTGIT_TMP=/tmp
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
@@ -34,6 +34,7 @@ PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
RELEASED_KERNEL=0
+RELEASETAG=kernel-5.16.0-0.rc5.6.test
RHDISTGIT=ssh://"shadowman"@pkgs.fedoraproject.org/rpms/kernel
RHDISTGIT_BRANCH=rawhide
RHDISTGIT_TMP=/tmp
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
@@ -34,6 +34,7 @@ PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
RELEASED_KERNEL=0
+RELEASETAG=kernel-5.17.0-0.rc0.78e36f3b0dae586.6.test
RHDISTGIT=ssh://"shadowman"@pkgs.fedoraproject.org/rpms/kernel
RHDISTGIT_BRANCH=rawhide
RHDISTGIT_TMP=/tmp
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
@@ -34,6 +34,7 @@ PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
RELEASED_KERNEL=0
+RELEASETAG=kernel-5.17.0-0.rc0.78e36f3b0dae586.6.test
RHDISTGIT=ssh://"shadowman"@pkgs.fedoraproject.org/rpms/kernel
RHDISTGIT_BRANCH=rawhide
RHDISTGIT_TMP=/tmp
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
@@ -34,6 +34,7 @@ PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
RELEASED_KERNEL=0
+RELEASETAG=kernel-5.16.0-6.test
RHDISTGIT=ssh://"shadowman"@pkgs.fedoraproject.org/rpms/kernel
RHDISTGIT_BRANCH=rawhide
RHDISTGIT_TMP=/tmp
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
@@ -34,6 +34,7 @@ PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
RELEASED_KERNEL=0
+RELEASETAG=kernel-5.16.0-6.test
RHDISTGIT=ssh://"shadowman"@pkgs.fedoraproject.org/rpms/kernel
RHDISTGIT_BRANCH=rawhide
RHDISTGIT_TMP=/tmp
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
@@ -34,6 +34,7 @@ PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
RELEASED_KERNEL=0
+RELEASETAG=kernel-5.16.0-0.rc5.fce15c45d3fbd9f.6.test
RHDISTGIT=ssh://"shadowman"@pkgs.fedoraproject.org/rpms/kernel
RHDISTGIT_BRANCH=rawhide
RHDISTGIT_TMP=/tmp
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
@@ -34,6 +34,7 @@ PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
RELEASED_KERNEL=0
+RELEASETAG=kernel-5.16.0-0.rc5.fce15c45d3fbd9f.6.test
RHDISTGIT=ssh://"shadowman"@pkgs.fedoraproject.org/rpms/kernel
RHDISTGIT_BRANCH=rawhide
RHDISTGIT_TMP=/tmp
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
@@ -34,6 +34,7 @@ PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
RELEASED_KERNEL=0
+RELEASETAG=kernel-5.16.0-0.rc5.6.test
RHDISTGIT=ssh://"shadowman"@pkgs.devel.redhat.com/rpms/kernel
RHDISTGIT_BRANCH=rhel-9.99.0
RHDISTGIT_TMP=/tmp
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
@@ -34,6 +34,7 @@ PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
RELEASED_KERNEL=0
+RELEASETAG=kernel-5.16.0-0.rc5.6.test
RHDISTGIT=ssh://"shadowman"@pkgs.devel.redhat.com/rpms/kernel
RHDISTGIT_BRANCH=rhel-9.99.0
RHDISTGIT_TMP=/tmp
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1757
6:28 p.m.
New subject: [OS-BUILD PATCH 4/17] redhat/Makefile: Move SPECRELEASE to genspec.sh
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/Makefile: Move SPECRELEASE to genspec.sh
Move SPECRELEASE to genspec.sh. It is the only place it is used.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -234,7 +234,6 @@ SPECVERSION:=$(SPECKVERSION).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL)
RPMVERSION:=$(SPECVERSION)-$(SPECBUILD)
RELEASETAG=$(PACKAGE_NAME)-$(RPMVERSION)
SRPM:=$(SRPMS)/$(RELEASETAG)$(DIST).src.rpm
-SPECRELEASE:=$(PREBUILD)$(BUILD)%{?buildid}%{?dist}
# kabi variables
KABI_TARBALL:=$(SOURCES)/kernel-abi-stablelists-$(RPMVERSION).tar.bz2
diff --git a/redhat/genspec.sh b/redhat/genspec.sh
index blahblah..blahblah 100755
--- a/redhat/genspec.sh
+++ b/redhat/genspec.sh
@@ -56,6 +56,8 @@ if [ "$PATCHLIST_URL" != "none" ]; then
SPECPATCHLIST_CHANGELOG=1
fi
+SPECRELEASE="${PREBUILD}""${BUILD}""%{?buildid}%{?dist}"
+
# self-test begin
test -f "$SOURCES/$SPECFILE" &&
sed -i -e "
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
@@ -61,7 +61,6 @@ SPECKEXTRAVERSION=-rc5
SPECKPATCHLEVEL=16
SPECKSUBLEVEL=0
SPECKVERSION=5
-SPECRELEASE=0.rc5.6%{?buildid}%{?dist}
SPECRELEASED_KERNEL=0
SPECTARFILE_RELEASE=5.16.0-0.rc5.6.test
SPECVERSION=5.16.0
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
@@ -61,7 +61,6 @@ SPECKEXTRAVERSION=-rc5
SPECKPATCHLEVEL=16
SPECKSUBLEVEL=0
SPECKVERSION=5
-SPECRELEASE=0.rc5.6%{?buildid}%{?dist}
SPECRELEASED_KERNEL=0
SPECTARFILE_RELEASE=5.16.0-0.rc5.6.test
SPECVERSION=5.16.0
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
@@ -61,7 +61,6 @@ SPECKEXTRAVERSION=
SPECKPATCHLEVEL=17
SPECKSUBLEVEL=0
SPECKVERSION=5
-SPECRELEASE=0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist}
SPECRELEASED_KERNEL=0
SPECTARFILE_RELEASE=5.17.0-0.rc0.78e36f3b0dae586.6.test
SPECVERSION=5.17.0
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
@@ -61,7 +61,6 @@ SPECKEXTRAVERSION=
SPECKPATCHLEVEL=17
SPECKSUBLEVEL=0
SPECKVERSION=5
-SPECRELEASE=0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist}
SPECRELEASED_KERNEL=0
SPECTARFILE_RELEASE=5.17.0-0.rc0.78e36f3b0dae586.6.test
SPECVERSION=5.17.0
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
@@ -61,7 +61,6 @@ SPECKEXTRAVERSION=
SPECKPATCHLEVEL=16
SPECKSUBLEVEL=0
SPECKVERSION=5
-SPECRELEASE=6%{?buildid}%{?dist}
SPECRELEASED_KERNEL=0
SPECTARFILE_RELEASE=5.16.0-6.test
SPECVERSION=5.16.0
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
@@ -61,7 +61,6 @@ SPECKEXTRAVERSION=
SPECKPATCHLEVEL=16
SPECKSUBLEVEL=0
SPECKVERSION=5
-SPECRELEASE=6%{?buildid}%{?dist}
SPECRELEASED_KERNEL=0
SPECTARFILE_RELEASE=5.16.0-6.test
SPECVERSION=5.16.0
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
@@ -61,7 +61,6 @@ SPECKEXTRAVERSION=-rc5
SPECKPATCHLEVEL=16
SPECKSUBLEVEL=0
SPECKVERSION=5
-SPECRELEASE=0.rc5.fce15c45d3fbd9f.6%{?buildid}%{?dist}
SPECRELEASED_KERNEL=0
SPECTARFILE_RELEASE=5.16.0-0.rc5.fce15c45d3fbd9f.6.test
SPECVERSION=5.16.0
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
@@ -61,7 +61,6 @@ SPECKEXTRAVERSION=-rc5
SPECKPATCHLEVEL=16
SPECKSUBLEVEL=0
SPECKVERSION=5
-SPECRELEASE=0.rc5.fce15c45d3fbd9f.6%{?buildid}%{?dist}
SPECRELEASED_KERNEL=0
SPECTARFILE_RELEASE=5.16.0-0.rc5.fce15c45d3fbd9f.6.test
SPECVERSION=5.16.0
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,7 +59,6 @@ SPECKEXTRAVERSION=-rc5
SPECKPATCHLEVEL=16
SPECKSUBLEVEL=0
SPECKVERSION=5
-SPECRELEASE=0.rc5.6%{?buildid}%{?dist}
SPECRELEASED_KERNEL=0
SPECTARFILE_RELEASE=5.16-rc5
SPECVERSION=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,7 +59,6 @@ SPECKEXTRAVERSION=-rc5
SPECKPATCHLEVEL=16
SPECKSUBLEVEL=0
SPECKVERSION=5
-SPECRELEASE=0.rc5.6%{?buildid}%{?dist}
SPECRELEASED_KERNEL=0
SPECTARFILE_RELEASE=5.16-rc5
SPECVERSION=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,7 +59,6 @@ SPECKEXTRAVERSION=
SPECKPATCHLEVEL=17
SPECKSUBLEVEL=0
SPECKVERSION=5
-SPECRELEASE=0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist}
SPECRELEASED_KERNEL=0
SPECTARFILE_RELEASE=5.16-11523-g78e36f3b0dae586
SPECVERSION=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,7 +59,6 @@ SPECKEXTRAVERSION=
SPECKPATCHLEVEL=17
SPECKSUBLEVEL=0
SPECKVERSION=5
-SPECRELEASE=0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist}
SPECRELEASED_KERNEL=0
SPECTARFILE_RELEASE=5.16-11523-g78e36f3b0dae586
SPECVERSION=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,7 +59,6 @@ SPECKEXTRAVERSION=
SPECKPATCHLEVEL=16
SPECKSUBLEVEL=0
SPECKVERSION=5
-SPECRELEASE=6%{?buildid}%{?dist}
SPECRELEASED_KERNEL=0
SPECTARFILE_RELEASE=5.16
SPECVERSION=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,7 +59,6 @@ SPECKEXTRAVERSION=
SPECKPATCHLEVEL=16
SPECKSUBLEVEL=0
SPECKVERSION=5
-SPECRELEASE=6%{?buildid}%{?dist}
SPECRELEASED_KERNEL=0
SPECTARFILE_RELEASE=5.16
SPECVERSION=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,7 +59,6 @@ SPECKEXTRAVERSION=-rc5
SPECKPATCHLEVEL=16
SPECKSUBLEVEL=0
SPECKVERSION=5
-SPECRELEASE=0.rc5.fce15c45d3fbd9f.6%{?buildid}%{?dist}
SPECRELEASED_KERNEL=0
SPECTARFILE_RELEASE=5.16-rc5-1-gfce15c45d3fbd9f
SPECVERSION=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,7 +59,6 @@ SPECKEXTRAVERSION=-rc5
SPECKPATCHLEVEL=16
SPECKSUBLEVEL=0
SPECKVERSION=5
-SPECRELEASE=0.rc5.fce15c45d3fbd9f.6%{?buildid}%{?dist}
SPECRELEASED_KERNEL=0
SPECTARFILE_RELEASE=5.16-rc5-1-gfce15c45d3fbd9f
SPECVERSION=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,7 +59,6 @@ SPECKEXTRAVERSION=-rc5
SPECKPATCHLEVEL=16
SPECKSUBLEVEL=0
SPECKVERSION=5
-SPECRELEASE=0.rc5.6%{?buildid}%{?dist}
SPECRELEASED_KERNEL=0
SPECTARFILE_RELEASE=5.16.0-0.rc5.6.test
SPECVERSION=5.16.0
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,7 +59,6 @@ SPECKEXTRAVERSION=-rc5
SPECKPATCHLEVEL=16
SPECKSUBLEVEL=0
SPECKVERSION=5
-SPECRELEASE=0.rc5.6%{?buildid}%{?dist}
SPECRELEASED_KERNEL=0
SPECTARFILE_RELEASE=5.16.0-0.rc5.6.test
SPECVERSION=5.16.0
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1757
6:28 p.m.
New subject: [OS-BUILD PATCH 5/17] redhat/Makefile: Target whitespace cleanup
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/Makefile: Target whitespace cleanup
Some simple whitespace cleanups.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -442,7 +442,6 @@ $(KABIDW_TARBALL):
fi
@(cd kabi-dwarf && tar cjf $(KABIDW_TARBALL) base run_kabi-dw.sh)
-
dist-tarball: $(TARBALL)
# deprecated at 5.17.0
@echo "WARNING: This target will be deprecated in a future release."
@@ -608,8 +607,10 @@ dist-release-changed: setup-source
$(REDHAT)/scripts/new_release.sh $(REDHAT) $(__YSTREAM) $(__ZSTREAM) $(BUMP_RELEASE);
\
$(MAKE) dist-release-finish; \
fi
+
dist-release: dist-clean-sources
@$(MAKE) dist-release-changed
+
dist-release-tag:
@$(GIT) tag -a -m "$(RELEASETAG)" $(RELEASETAG)
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1757
6:28 p.m.
New subject: [OS-BUILD PATCH 6/17] redhat/Makefile: Rename RPMVERSION to
BASEVERSION
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/Makefile: Rename RPMVERSION to BASEVERSION
RPMVERSION is the rpm NVR without the dist tag. It is not the RPM
version so RPMVERSION is not an accurate name for this field.
Rename RPMVERSION to BASEVERSION.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -226,19 +226,19 @@ endif
#
# $(PACKAGE_NAME)-$(SPECKVERSION).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL)-$(SPECBUILD)
$(DIST)
# $(PACKAGE_NAME)-$(SPECVERSION) -$(SPECBUILD)
$(DIST)
-# $(PACKAGE_NAME)-$(RPMVERSION)
$(DIST)
+# $(PACKAGE_NAME)-$(BASEVERSION)
$(DIST)
# $(RELEASETAG)
$(DIST)
#
SPECBUILD:=$(PREBUILD)$(BUILD)$(BUILDID)
SPECVERSION:=$(SPECKVERSION).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL)
-RPMVERSION:=$(SPECVERSION)-$(SPECBUILD)
-RELEASETAG=$(PACKAGE_NAME)-$(RPMVERSION)
+BASEVERSION:=$(SPECVERSION)-$(SPECBUILD)
+RELEASETAG=$(PACKAGE_NAME)-$(BASEVERSION)
SRPM:=$(SRPMS)/$(RELEASETAG)$(DIST).src.rpm
# kabi variables
-KABI_TARBALL:=$(SOURCES)/kernel-abi-stablelists-$(RPMVERSION).tar.bz2
+KABI_TARBALL:=$(SOURCES)/kernel-abi-stablelists-$(BASEVERSION).tar.bz2
KABIDW := $(REDHAT)/kabi-dwarf
-KABIDW_TARBALL:=$(SOURCES)/kernel-kabi-dw-$(RPMVERSION).tar.bz2
+KABIDW_TARBALL:=$(SOURCES)/kernel-kabi-dw-$(BASEVERSION).tar.bz2
#
# This conditional statement is where fedora, centos, and other (aka RHEL)
@@ -260,14 +260,14 @@ else ifeq ("$(DISTRO)", "centos")
ifndef BUILD_SCRATCH_TARGET
BUILD_SCRATCH_TARGET:=c$(RHEL_MAJOR)s-candidate
endif
- SPECTARFILE_RELEASE:=$(RPMVERSION)
+ SPECTARFILE_RELEASE:=$(BASEVERSION)
else
SINGLE_TARBALL:=1
RHDISTGIT_BRANCH:=rhel-$(RHEL_MAJOR).$(RHEL_MINOR).0
ifndef BUILD_SCRATCH_TARGET
BUILD_SCRATCH_TARGET:=rhel-$(RHEL_MAJOR).$(RHEL_MINOR).0-test-pesign
endif
- SPECTARFILE_RELEASE:=$(RPMVERSION)
+ SPECTARFILE_RELEASE:=$(BASEVERSION)
endif
ifndef BUILD_TARGET
@@ -450,12 +450,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)-$(RPMVERSION)
+ @echo $(PACKAGE_NAME)-$(BASEVERSION)
dist-kernelversion:
# deprecated at 5.17.0
@echo "WARNING: This target will be deprecated in a future release."
- @echo $(RPMVERSION)
+ @echo $(BASEVERSION)
dist-specfile: setup-source
# deprecated at 5.17.0
@@ -492,7 +492,7 @@ setup-source: dist-git-version-check dist-clean-sources
@if [ -z "$(RHSELFTESTDATA)" ]; then \
cp $(REDHAT)/$(SPECCHANGELOG) $(SOURCES)/$(SPECCHANGELOG); \
else \
- echo "Mon Mar 28 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org>
[$(RPMVERSION)]" > $(SOURCES)/$(SPECCHANGELOG); \
+ echo "Mon Mar 28 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org>
[$(BASEVERSION)]" > $(SOURCES)/$(SPECCHANGELOG); \
fi
@if [ -z "$(PATCHLIST_URL)" ]; then \
echo "Error: PATCHLIST_URL must be set (to 'none' or any URL)"; \
diff --git a/redhat/genspec.sh b/redhat/genspec.sh
index blahblah..blahblah 100755
--- a/redhat/genspec.sh
+++ b/redhat/genspec.sh
@@ -113,7 +113,7 @@ echo "Gathering new log entries since $lasttag"
cname="$(git var GIT_COMMITTER_IDENT |sed 's/>.*/>/')"
cdate="$(LC_ALL=C date +"%a %b %d %Y")"
-cversion="[$RPMVERSION]";
+cversion="[$BASEVERSION]";
echo "* $cdate $cname $cversion" > "$clogf"
git log --topo-order --no-merges -z "$GIT_NOTES" "$GIT_FORMAT" \
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
@@ -2,6 +2,7 @@
.SHELLSTATUS=1
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
+BASEVERSION=5.16.0-0.rc5.6.test
BUILD=6
BUILD_FLAGS=
BUILD_PROFILE=-p stream
@@ -47,7 +48,6 @@ RHPKG_BIN=centpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
RPMBUILD=rpmbuild
-RPMVERSION=5.16.0-0.rc5.6.test
SHELL=/bin/sh
SINGLE_TARBALL=1
SNAPSHOT=0
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
@@ -2,6 +2,7 @@
.SHELLSTATUS=1
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
+BASEVERSION=5.16.0-0.rc5.6.test
BUILD=6
BUILD_FLAGS=
BUILD_PROFILE=-p stream
@@ -47,7 +48,6 @@ RHPKG_BIN=centpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
RPMBUILD=rpmbuild
-RPMVERSION=5.16.0-0.rc5.6.test
SHELL=/bin/sh
SINGLE_TARBALL=1
SNAPSHOT=0
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
@@ -2,6 +2,7 @@
.SHELLSTATUS=0
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
+BASEVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test
BUILD=6
BUILD_FLAGS=
BUILD_PROFILE=-p stream
@@ -47,7 +48,6 @@ RHPKG_BIN=centpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
RPMBUILD=rpmbuild
-RPMVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test
SHELL=/bin/sh
SINGLE_TARBALL=1
SNAPSHOT=1
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
@@ -2,6 +2,7 @@
.SHELLSTATUS=0
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
+BASEVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test
BUILD=6
BUILD_FLAGS=
BUILD_PROFILE=-p stream
@@ -47,7 +48,6 @@ RHPKG_BIN=centpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
RPMBUILD=rpmbuild
-RPMVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test
SHELL=/bin/sh
SINGLE_TARBALL=1
SNAPSHOT=1
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
@@ -2,6 +2,7 @@
.SHELLSTATUS=1
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
+BASEVERSION=5.16.0-6.test
BUILD=6
BUILD_FLAGS=
BUILD_PROFILE=-p stream
@@ -47,7 +48,6 @@ RHPKG_BIN=centpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
RPMBUILD=rpmbuild
-RPMVERSION=5.16.0-6.test
SHELL=/bin/sh
SINGLE_TARBALL=1
SNAPSHOT=0
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
@@ -2,6 +2,7 @@
.SHELLSTATUS=1
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
+BASEVERSION=5.16.0-6.test
BUILD=6
BUILD_FLAGS=
BUILD_PROFILE=-p stream
@@ -47,7 +48,6 @@ RHPKG_BIN=centpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
RPMBUILD=rpmbuild
-RPMVERSION=5.16.0-6.test
SHELL=/bin/sh
SINGLE_TARBALL=1
SNAPSHOT=0
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
@@ -2,6 +2,7 @@
.SHELLSTATUS=0
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
+BASEVERSION=5.16.0-0.rc5.fce15c45d3fbd9f.6.test
BUILD=6
BUILD_FLAGS=
BUILD_PROFILE=-p stream
@@ -47,7 +48,6 @@ RHPKG_BIN=centpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
RPMBUILD=rpmbuild
-RPMVERSION=5.16.0-0.rc5.fce15c45d3fbd9f.6.test
SHELL=/bin/sh
SINGLE_TARBALL=1
SNAPSHOT=1
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
@@ -2,6 +2,7 @@
.SHELLSTATUS=0
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
+BASEVERSION=5.16.0-0.rc5.fce15c45d3fbd9f.6.test
BUILD=6
BUILD_FLAGS=
BUILD_PROFILE=-p stream
@@ -47,7 +48,6 @@ RHPKG_BIN=centpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
RPMBUILD=rpmbuild
-RPMVERSION=5.16.0-0.rc5.fce15c45d3fbd9f.6.test
SHELL=/bin/sh
SINGLE_TARBALL=1
SNAPSHOT=1
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
@@ -2,6 +2,7 @@
.SHELLSTATUS=1
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
+BASEVERSION=5.16.0-0.rc5.6.test
BUILD=6
BUILD_FLAGS=
BUMP_RELEASE=yes
@@ -45,7 +46,6 @@ RHPKG_BIN=fedpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
RPMBUILD=rpmbuild
-RPMVERSION=5.16.0-0.rc5.6.test
SHELL=/bin/sh
SINGLE_TARBALL=0
SNAPSHOT=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
@@ -2,6 +2,7 @@
.SHELLSTATUS=1
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
+BASEVERSION=5.16.0-0.rc5.6.test
BUILD=6
BUILD_FLAGS=
BUMP_RELEASE=yes
@@ -45,7 +46,6 @@ RHPKG_BIN=fedpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
RPMBUILD=rpmbuild
-RPMVERSION=5.16.0-0.rc5.6.test
SHELL=/bin/sh
SINGLE_TARBALL=0
SNAPSHOT=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
@@ -2,6 +2,7 @@
.SHELLSTATUS=0
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
+BASEVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test
BUILD=6
BUILD_FLAGS=
BUMP_RELEASE=yes
@@ -45,7 +46,6 @@ RHPKG_BIN=fedpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
RPMBUILD=rpmbuild
-RPMVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test
SHELL=/bin/sh
SINGLE_TARBALL=0
SNAPSHOT=1
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
@@ -2,6 +2,7 @@
.SHELLSTATUS=0
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
+BASEVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test
BUILD=6
BUILD_FLAGS=
BUMP_RELEASE=yes
@@ -45,7 +46,6 @@ RHPKG_BIN=fedpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
RPMBUILD=rpmbuild
-RPMVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test
SHELL=/bin/sh
SINGLE_TARBALL=0
SNAPSHOT=1
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
@@ -2,6 +2,7 @@
.SHELLSTATUS=1
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
+BASEVERSION=5.16.0-6.test
BUILD=6
BUILD_FLAGS=
BUMP_RELEASE=yes
@@ -45,7 +46,6 @@ RHPKG_BIN=fedpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
RPMBUILD=rpmbuild
-RPMVERSION=5.16.0-6.test
SHELL=/bin/sh
SINGLE_TARBALL=0
SNAPSHOT=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
@@ -2,6 +2,7 @@
.SHELLSTATUS=1
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
+BASEVERSION=5.16.0-6.test
BUILD=6
BUILD_FLAGS=
BUMP_RELEASE=yes
@@ -45,7 +46,6 @@ RHPKG_BIN=fedpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
RPMBUILD=rpmbuild
-RPMVERSION=5.16.0-6.test
SHELL=/bin/sh
SINGLE_TARBALL=0
SNAPSHOT=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
@@ -2,6 +2,7 @@
.SHELLSTATUS=0
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
+BASEVERSION=5.16.0-0.rc5.fce15c45d3fbd9f.6.test
BUILD=6
BUILD_FLAGS=
BUMP_RELEASE=yes
@@ -45,7 +46,6 @@ RHPKG_BIN=fedpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
RPMBUILD=rpmbuild
-RPMVERSION=5.16.0-0.rc5.fce15c45d3fbd9f.6.test
SHELL=/bin/sh
SINGLE_TARBALL=0
SNAPSHOT=1
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
@@ -2,6 +2,7 @@
.SHELLSTATUS=0
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
+BASEVERSION=5.16.0-0.rc5.fce15c45d3fbd9f.6.test
BUILD=6
BUILD_FLAGS=
BUMP_RELEASE=yes
@@ -45,7 +46,6 @@ RHPKG_BIN=fedpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
RPMBUILD=rpmbuild
-RPMVERSION=5.16.0-0.rc5.fce15c45d3fbd9f.6.test
SHELL=/bin/sh
SINGLE_TARBALL=0
SNAPSHOT=1
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
@@ -2,6 +2,7 @@
.SHELLSTATUS=1
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
+BASEVERSION=5.16.0-0.rc5.6.test
BUILD=6
BUILD_FLAGS=
BUMP_RELEASE=yes
@@ -45,7 +46,6 @@ RHPKG_BIN=rhpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
RPMBUILD=rpmbuild
-RPMVERSION=5.16.0-0.rc5.6.test
SHELL=/bin/sh
SINGLE_TARBALL=1
SNAPSHOT=0
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
@@ -2,6 +2,7 @@
.SHELLSTATUS=1
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
+BASEVERSION=5.16.0-0.rc5.6.test
BUILD=6
BUILD_FLAGS=
BUMP_RELEASE=yes
@@ -45,7 +46,6 @@ RHPKG_BIN=rhpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
RPMBUILD=rpmbuild
-RPMVERSION=5.16.0-0.rc5.6.test
SHELL=/bin/sh
SINGLE_TARBALL=1
SNAPSHOT=0
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1757
6:28 p.m.
New subject: [OS-BUILD PATCH 7/17] redhat/Makefile: General cleanup
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/Makefile: General cleanup
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -246,11 +246,14 @@ KABIDW_TARBALL:=$(SOURCES)/kernel-kabi-dw-$(BASEVERSION).tar.bz2
#
ifeq ("$(DISTRO)", "fedora")
SINGLE_TARBALL:=0
- SPECTARFILE_RELEASE:=$(UPSTREAM_TARBALL_NAME)
RHDISTGIT_BRANCH:=rawhide
ifndef BUILD_SCRATCH_TARGET
BUILD_SCRATCH_TARGET:=temp-ark-rhel-8-test
endif
+ # The Fedora tarfile name is based on an upstream tag as users may
+ # replace the tarball from one with upstream, rebuild, and then deploy
+ # without changing anything else in the specfile.
+ SPECTARFILE_RELEASE:=$(UPSTREAM_TARBALL_NAME)
else ifeq ("$(DISTRO)", "centos")
SINGLE_TARBALL:=1
RHDISTGIT_BRANCH:=c$(RHEL_MAJOR)s
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1757
6:28 p.m.
New subject: [OS-BUILD PATCH 8/17] redhat/kernel.spec.template: Remove kversion
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/kernel.spec.template: Remove kversion
Remove kversion. It is unused.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
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
@@ -124,9 +124,6 @@ Summary: The Linux kernel
%define primary_target rhel
%endif
-# The kernel tarball/base version
-%define kversion %%SPECKVERSION%%.%%SPECKPATCHLEVEL%%
-
%define specversion %%SPECVERSION%%
%define patchversion %%SPECKVERSION%%.%%SPECKPATCHLEVEL%%
%define pkgrelease %%SPECBUILD%%
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
b/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
+++ b/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
@@ -124,9 +124,6 @@ Summary: The Linux kernel
%define primary_target rhel
%endif
-# The kernel tarball/base version
-%define kversion 5.16
-
%define specversion 5.16.0
%define patchversion 5.16
%define pkgrelease 0.rc5.6.test
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
b/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
+++ b/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
@@ -124,9 +124,6 @@ Summary: The Linux kernel
%define primary_target rhel
%endif
-# The kernel tarball/base version
-%define kversion 5.16
-
%define specversion 5.16.0
%define patchversion 5.16
%define pkgrelease 0.rc5.6.test
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
b/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
+++ b/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
@@ -124,9 +124,6 @@ Summary: The Linux kernel
%define primary_target rhel
%endif
-# The kernel tarball/base version
-%define kversion 5.17
-
%define specversion 5.17.0
%define patchversion 5.17
%define pkgrelease 0.rc0.78e36f3b0dae586.6.test
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
b/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
+++ b/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
@@ -124,9 +124,6 @@ Summary: The Linux kernel
%define primary_target rhel
%endif
-# The kernel tarball/base version
-%define kversion 5.17
-
%define specversion 5.17.0
%define patchversion 5.17
%define pkgrelease 0.rc0.78e36f3b0dae586.6.test
diff --git a/redhat/self-test/data/centos-df0cc57e057f.el7.spec
b/redhat/self-test/data/centos-df0cc57e057f.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-df0cc57e057f.el7.spec
+++ b/redhat/self-test/data/centos-df0cc57e057f.el7.spec
@@ -124,9 +124,6 @@ Summary: The Linux kernel
%define primary_target rhel
%endif
-# The kernel tarball/base version
-%define kversion 5.16
-
%define specversion 5.16.0
%define patchversion 5.16
%define pkgrelease 6.test
diff --git a/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
b/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
+++ b/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
@@ -124,9 +124,6 @@ Summary: The Linux kernel
%define primary_target rhel
%endif
-# The kernel tarball/base version
-%define kversion 5.16
-
%define specversion 5.16.0
%define patchversion 5.16
%define pkgrelease 6.test
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
b/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
+++ b/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
@@ -124,9 +124,6 @@ Summary: The Linux kernel
%define primary_target rhel
%endif
-# The kernel tarball/base version
-%define kversion 5.16
-
%define specversion 5.16.0
%define patchversion 5.16
%define pkgrelease 0.rc5.fce15c45d3fbd9f.6.test
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
b/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
+++ b/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
@@ -124,9 +124,6 @@ Summary: The Linux kernel
%define primary_target rhel
%endif
-# The kernel tarball/base version
-%define kversion 5.16
-
%define specversion 5.16.0
%define patchversion 5.16
%define pkgrelease 0.rc5.fce15c45d3fbd9f.6.test
diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
b/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
+++ b/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
@@ -124,9 +124,6 @@ Summary: The Linux kernel
%define primary_target rhel
%endif
-# The kernel tarball/base version
-%define kversion 5.16
-
%define specversion 5.16.0
%define patchversion 5.16
%define pkgrelease 0.rc5.6.test
diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec
b/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec
+++ b/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec
@@ -124,9 +124,6 @@ Summary: The Linux kernel
%define primary_target rhel
%endif
-# The kernel tarball/base version
-%define kversion 5.16
-
%define specversion 5.16.0
%define patchversion 5.16
%define pkgrelease 0.rc5.6.test
diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
b/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
+++ b/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
@@ -124,9 +124,6 @@ Summary: The Linux kernel
%define primary_target rhel
%endif
-# The kernel tarball/base version
-%define kversion 5.17
-
%define specversion 5.17.0
%define patchversion 5.17
%define pkgrelease 0.rc0.78e36f3b0dae586.6.test
diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
b/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
+++ b/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
@@ -124,9 +124,6 @@ Summary: The Linux kernel
%define primary_target rhel
%endif
-# The kernel tarball/base version
-%define kversion 5.17
-
%define specversion 5.17.0
%define patchversion 5.17
%define pkgrelease 0.rc0.78e36f3b0dae586.6.test
diff --git a/redhat/self-test/data/fedora-df0cc57e057f.el7.spec
b/redhat/self-test/data/fedora-df0cc57e057f.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-df0cc57e057f.el7.spec
+++ b/redhat/self-test/data/fedora-df0cc57e057f.el7.spec
@@ -124,9 +124,6 @@ Summary: The Linux kernel
%define primary_target rhel
%endif
-# The kernel tarball/base version
-%define kversion 5.16
-
%define specversion 5.16.0
%define patchversion 5.16
%define pkgrelease 6.test
diff --git a/redhat/self-test/data/fedora-df0cc57e057f.fc25.spec
b/redhat/self-test/data/fedora-df0cc57e057f.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-df0cc57e057f.fc25.spec
+++ b/redhat/self-test/data/fedora-df0cc57e057f.fc25.spec
@@ -124,9 +124,6 @@ Summary: The Linux kernel
%define primary_target rhel
%endif
-# The kernel tarball/base version
-%define kversion 5.16
-
%define specversion 5.16.0
%define patchversion 5.16
%define pkgrelease 6.test
diff --git a/redhat/self-test/data/fedora-fce15c45d3fb.el7.spec
b/redhat/self-test/data/fedora-fce15c45d3fb.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-fce15c45d3fb.el7.spec
+++ b/redhat/self-test/data/fedora-fce15c45d3fb.el7.spec
@@ -124,9 +124,6 @@ Summary: The Linux kernel
%define primary_target rhel
%endif
-# The kernel tarball/base version
-%define kversion 5.16
-
%define specversion 5.16.0
%define patchversion 5.16
%define pkgrelease 0.rc5.fce15c45d3fbd9f.6.test
diff --git a/redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec
b/redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec
+++ b/redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec
@@ -124,9 +124,6 @@ Summary: The Linux kernel
%define primary_target rhel
%endif
-# The kernel tarball/base version
-%define kversion 5.16
-
%define specversion 5.16.0
%define patchversion 5.16
%define pkgrelease 0.rc5.fce15c45d3fbd9f.6.test
diff --git a/redhat/self-test/data/rhel-2585cf9dfaad.el7.spec
b/redhat/self-test/data/rhel-2585cf9dfaad.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/rhel-2585cf9dfaad.el7.spec
+++ b/redhat/self-test/data/rhel-2585cf9dfaad.el7.spec
@@ -124,9 +124,6 @@ Summary: The Linux kernel
%define primary_target rhel
%endif
-# The kernel tarball/base version
-%define kversion 5.16
-
%define specversion 5.16.0
%define patchversion 5.16
%define pkgrelease 0.rc5.6.test
diff --git a/redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec
b/redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec
+++ b/redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec
@@ -124,9 +124,6 @@ Summary: The Linux kernel
%define primary_target rhel
%endif
-# The kernel tarball/base version
-%define kversion 5.16
-
%define specversion 5.16.0
%define patchversion 5.16
%define pkgrelease 0.rc5.6.test
diff --git a/redhat/self-test/data/rhel-78e36f3b0dae.el7.spec
b/redhat/self-test/data/rhel-78e36f3b0dae.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/rhel-78e36f3b0dae.el7.spec
+++ b/redhat/self-test/data/rhel-78e36f3b0dae.el7.spec
@@ -124,9 +124,6 @@ Summary: The Linux kernel
%define primary_target rhel
%endif
-# The kernel tarball/base version
-%define kversion 5.17
-
%define specversion 5.17.0
%define patchversion 5.17
%define pkgrelease 0.rc0.78e36f3b0dae586.6.test
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1757
6:28 p.m.
New subject: [OS-BUILD PATCH 9/17] redhat/kernel.spec.template: Move genspec
variables into
one section
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/kernel.spec.template: Move genspec variables into one section
Move the genspec variables into one section.
Additional fix: add a tarfile_release variable that maps to
SPECTARFILE_RELEASE.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
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
@@ -3,13 +3,6 @@
# environment changes that affect %%install need to go
# here before the %%install macro is pre-built.
-# Include Fedora files
-%global include_fedora %%SPECINCLUDE_FEDORA_FILES%%
-# Include RHEL files
-%global include_rhel %%SPECINCLUDE_RHEL_FILES%%
-# Provide Patchlist.changelog file
-%global patchlist_changelog %%SPECPATCHLIST_CHANGELOG%%
-
# Disable LTO in userspace packages.
%global _lto_cflags %{nil}
@@ -72,21 +65,6 @@
%endif
Summary: The Linux kernel
-
-# Set released_kernel to 1 when the upstream source tarball contains a
-# kernel release. (This includes prepatch or "rc" releases.)
-# Set released_kernel to 0 when the upstream source tarball contains an
-# unreleased kernel development snapshot.
-%global released_kernel %%SPECRELEASED_KERNEL%%
-
-# Set debugbuildsenabled to 1 to build separate base and debug kernels
-# (on supported architectures). The kernel-debug-* subpackages will
-# contain the debug kernel.
-# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
-# to build the base kernel using the debug configuration. (Specifying
-# the --with-release option overrides this setting.)
-%define debugbuildsenabled %%SPECDEBUG_BUILDS_ENABLED%%
-
%if 0%{?fedora}
%define secure_boot_arch x86_64
%else
@@ -115,25 +93,49 @@ Summary: The Linux kernel
# for parallel xz processes, replace with 1 to go back to single process
%endif
-%%SPECBUILDID%%
-
-
%if 0%{?fedora}
%define primary_target fedora
%else
%define primary_target rhel
%endif
+#
+# genspec.sh variables
+#
+
+# Include Fedora files
+%global include_fedora %%SPECINCLUDE_FEDORA_FILES%%
+# Include RHEL files
+%global include_rhel %%SPECINCLUDE_RHEL_FILES%%
+# Provide Patchlist.changelog file
+%global patchlist_changelog %%SPECPATCHLIST_CHANGELOG%%
+# Set released_kernel to 1 when the upstream source tarball contains a
+# kernel release. (This includes prepatch or "rc" releases.)
+# Set released_kernel to 0 when the upstream source tarball contains an
+# unreleased kernel development snapshot.
+%global released_kernel %%SPECRELEASED_KERNEL%%
+# Set debugbuildsenabled to 1 to build separate base and debug kernels
+# (on supported architectures). The kernel-debug-* subpackages will
+# contain the debug kernel.
+# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
+# to build the base kernel using the debug configuration. (Specifying
+# the --with-release option overrides this setting.)
+%define debugbuildsenabled %%SPECDEBUG_BUILDS_ENABLED%%
+%%SPECBUILDID%%
%define specversion %%SPECVERSION%%
%define patchversion %%SPECKVERSION%%.%%SPECKPATCHLEVEL%%
%define pkgrelease %%SPECBUILD%%
-
+%define kversion %%SPECKVERSION%%
+%define tarfile_release %%SPECTARFILE_RELEASE%%
# This is needed to do merge window version magic
%define patchlevel %%SPECKPATCHLEVEL%%
-
# allow pkg_release to have configurable %%{?dist} tag
%define specrelease %%SPECRELEASE%%
+#
+# End of genspec.sh variables
+#
+
%define pkg_release %{specrelease}
# libexec dir is not used by the linker, so the shared object there
@@ -687,7 +689,7 @@ BuildRequires: lld
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-%%SPECTARFILE_RELEASE%%.tar.xz
+Source0: linux-%{tarfile_release}.tar.xz
Source1: Makefile.rhelver
@@ -1352,7 +1354,7 @@ ApplyPatch()
exit 1
fi
if ! grep -E "^Patch[0-9]+: $patch\$" %{_specdir}/${RPM_PACKAGE_NAME}.spec ;
then
- if [ "${patch:0:8}" != "patch-%%SPECKVERSION%%." ] ; then
+ if [ "${patch:0:8}" != "patch-%{kversion}." ] ; then
echo "ERROR: Patch $patch not listed as a source patch in specfile"
exit 1
fi
@@ -1379,8 +1381,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-%%SPECTARFILE_RELEASE%% -c
-mv linux-%%SPECTARFILE_RELEASE%% linux-%{KVERREL}
+%setup -q -n kernel-%{tarfile_release} -c
+mv linux-%{tarfile_release} linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
b/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
+++ b/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
@@ -3,13 +3,6 @@
# environment changes that affect %%install need to go
# here before the %%install macro is pre-built.
-# Include Fedora files
-%global include_fedora 1
-# Include RHEL files
-%global include_rhel 1
-# Provide Patchlist.changelog file
-%global patchlist_changelog 1
-
# Disable LTO in userspace packages.
%global _lto_cflags %{nil}
@@ -72,21 +65,6 @@
%endif
Summary: The Linux kernel
-
-# Set released_kernel to 1 when the upstream source tarball contains a
-# kernel release. (This includes prepatch or "rc" releases.)
-# Set released_kernel to 0 when the upstream source tarball contains an
-# unreleased kernel development snapshot.
-%global released_kernel 0
-
-# Set debugbuildsenabled to 1 to build separate base and debug kernels
-# (on supported architectures). The kernel-debug-* subpackages will
-# contain the debug kernel.
-# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
-# to build the base kernel using the debug configuration. (Specifying
-# the --with-release option overrides this setting.)
-%define debugbuildsenabled 1
-
%if 0%{?fedora}
%define secure_boot_arch x86_64
%else
@@ -115,25 +93,49 @@ Summary: The Linux kernel
# for parallel xz processes, replace with 1 to go back to single process
%endif
-%define buildid .test
-
-
%if 0%{?fedora}
%define primary_target fedora
%else
%define primary_target rhel
%endif
+#
+# genspec.sh variables
+#
+
+# Include Fedora files
+%global include_fedora 1
+# Include RHEL files
+%global include_rhel 1
+# Provide Patchlist.changelog file
+%global patchlist_changelog 1
+# Set released_kernel to 1 when the upstream source tarball contains a
+# kernel release. (This includes prepatch or "rc" releases.)
+# Set released_kernel to 0 when the upstream source tarball contains an
+# unreleased kernel development snapshot.
+%global released_kernel 0
+# Set debugbuildsenabled to 1 to build separate base and debug kernels
+# (on supported architectures). The kernel-debug-* subpackages will
+# contain the debug kernel.
+# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
+# to build the base kernel using the debug configuration. (Specifying
+# the --with-release option overrides this setting.)
+%define debugbuildsenabled 1
+%define buildid .test
%define specversion 5.16.0
%define patchversion 5.16
%define pkgrelease 0.rc5.6.test
-
+%define kversion 5
+%define tarfile_release 5.16.0-0.rc5.6.test
# This is needed to do merge window version magic
%define patchlevel 16
-
# allow pkg_release to have configurable %%{?dist} tag
%define specrelease 0.rc5.6%{?buildid}%{?dist}
+#
+# End of genspec.sh variables
+#
+
%define pkg_release %{specrelease}
# libexec dir is not used by the linker, so the shared object there
@@ -687,7 +689,7 @@ BuildRequires: lld
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.16.0-0.rc5.6.test.tar.xz
+Source0: linux-%{tarfile_release}.tar.xz
Source1: Makefile.rhelver
@@ -1352,7 +1354,7 @@ ApplyPatch()
exit 1
fi
if ! grep -E "^Patch[0-9]+: $patch\$" %{_specdir}/${RPM_PACKAGE_NAME}.spec ;
then
- if [ "${patch:0:8}" != "patch-5." ] ; then
+ if [ "${patch:0:8}" != "patch-%{kversion}." ] ; then
echo "ERROR: Patch $patch not listed as a source patch in specfile"
exit 1
fi
@@ -1379,8 +1381,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.16.0-0.rc5.6.test -c
-mv linux-5.16.0-0.rc5.6.test linux-%{KVERREL}
+%setup -q -n kernel-%{tarfile_release} -c
+mv linux-%{tarfile_release} linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
b/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
+++ b/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
@@ -3,13 +3,6 @@
# environment changes that affect %%install need to go
# here before the %%install macro is pre-built.
-# Include Fedora files
-%global include_fedora 1
-# Include RHEL files
-%global include_rhel 1
-# Provide Patchlist.changelog file
-%global patchlist_changelog 1
-
# Disable LTO in userspace packages.
%global _lto_cflags %{nil}
@@ -72,21 +65,6 @@
%endif
Summary: The Linux kernel
-
-# Set released_kernel to 1 when the upstream source tarball contains a
-# kernel release. (This includes prepatch or "rc" releases.)
-# Set released_kernel to 0 when the upstream source tarball contains an
-# unreleased kernel development snapshot.
-%global released_kernel 0
-
-# Set debugbuildsenabled to 1 to build separate base and debug kernels
-# (on supported architectures). The kernel-debug-* subpackages will
-# contain the debug kernel.
-# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
-# to build the base kernel using the debug configuration. (Specifying
-# the --with-release option overrides this setting.)
-%define debugbuildsenabled 1
-
%if 0%{?fedora}
%define secure_boot_arch x86_64
%else
@@ -115,25 +93,49 @@ Summary: The Linux kernel
# for parallel xz processes, replace with 1 to go back to single process
%endif
-%define buildid .test
-
-
%if 0%{?fedora}
%define primary_target fedora
%else
%define primary_target rhel
%endif
+#
+# genspec.sh variables
+#
+
+# Include Fedora files
+%global include_fedora 1
+# Include RHEL files
+%global include_rhel 1
+# Provide Patchlist.changelog file
+%global patchlist_changelog 1
+# Set released_kernel to 1 when the upstream source tarball contains a
+# kernel release. (This includes prepatch or "rc" releases.)
+# Set released_kernel to 0 when the upstream source tarball contains an
+# unreleased kernel development snapshot.
+%global released_kernel 0
+# Set debugbuildsenabled to 1 to build separate base and debug kernels
+# (on supported architectures). The kernel-debug-* subpackages will
+# contain the debug kernel.
+# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
+# to build the base kernel using the debug configuration. (Specifying
+# the --with-release option overrides this setting.)
+%define debugbuildsenabled 1
+%define buildid .test
%define specversion 5.16.0
%define patchversion 5.16
%define pkgrelease 0.rc5.6.test
-
+%define kversion 5
+%define tarfile_release 5.16.0-0.rc5.6.test
# This is needed to do merge window version magic
%define patchlevel 16
-
# allow pkg_release to have configurable %%{?dist} tag
%define specrelease 0.rc5.6%{?buildid}%{?dist}
+#
+# End of genspec.sh variables
+#
+
%define pkg_release %{specrelease}
# libexec dir is not used by the linker, so the shared object there
@@ -687,7 +689,7 @@ BuildRequires: lld
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.16.0-0.rc5.6.test.tar.xz
+Source0: linux-%{tarfile_release}.tar.xz
Source1: Makefile.rhelver
@@ -1352,7 +1354,7 @@ ApplyPatch()
exit 1
fi
if ! grep -E "^Patch[0-9]+: $patch\$" %{_specdir}/${RPM_PACKAGE_NAME}.spec ;
then
- if [ "${patch:0:8}" != "patch-5." ] ; then
+ if [ "${patch:0:8}" != "patch-%{kversion}." ] ; then
echo "ERROR: Patch $patch not listed as a source patch in specfile"
exit 1
fi
@@ -1379,8 +1381,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.16.0-0.rc5.6.test -c
-mv linux-5.16.0-0.rc5.6.test linux-%{KVERREL}
+%setup -q -n kernel-%{tarfile_release} -c
+mv linux-%{tarfile_release} linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
b/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
+++ b/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
@@ -3,13 +3,6 @@
# environment changes that affect %%install need to go
# here before the %%install macro is pre-built.
-# Include Fedora files
-%global include_fedora 1
-# Include RHEL files
-%global include_rhel 1
-# Provide Patchlist.changelog file
-%global patchlist_changelog 1
-
# Disable LTO in userspace packages.
%global _lto_cflags %{nil}
@@ -72,21 +65,6 @@
%endif
Summary: The Linux kernel
-
-# Set released_kernel to 1 when the upstream source tarball contains a
-# kernel release. (This includes prepatch or "rc" releases.)
-# Set released_kernel to 0 when the upstream source tarball contains an
-# unreleased kernel development snapshot.
-%global released_kernel 0
-
-# Set debugbuildsenabled to 1 to build separate base and debug kernels
-# (on supported architectures). The kernel-debug-* subpackages will
-# contain the debug kernel.
-# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
-# to build the base kernel using the debug configuration. (Specifying
-# the --with-release option overrides this setting.)
-%define debugbuildsenabled 0
-
%if 0%{?fedora}
%define secure_boot_arch x86_64
%else
@@ -115,25 +93,49 @@ Summary: The Linux kernel
# for parallel xz processes, replace with 1 to go back to single process
%endif
-%define buildid .test
-
-
%if 0%{?fedora}
%define primary_target fedora
%else
%define primary_target rhel
%endif
+#
+# genspec.sh variables
+#
+
+# Include Fedora files
+%global include_fedora 1
+# Include RHEL files
+%global include_rhel 1
+# Provide Patchlist.changelog file
+%global patchlist_changelog 1
+# Set released_kernel to 1 when the upstream source tarball contains a
+# kernel release. (This includes prepatch or "rc" releases.)
+# Set released_kernel to 0 when the upstream source tarball contains an
+# unreleased kernel development snapshot.
+%global released_kernel 0
+# Set debugbuildsenabled to 1 to build separate base and debug kernels
+# (on supported architectures). The kernel-debug-* subpackages will
+# contain the debug kernel.
+# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
+# to build the base kernel using the debug configuration. (Specifying
+# the --with-release option overrides this setting.)
+%define debugbuildsenabled 0
+%define buildid .test
%define specversion 5.17.0
%define patchversion 5.17
%define pkgrelease 0.rc0.78e36f3b0dae586.6.test
-
+%define kversion 5
+%define tarfile_release 5.17.0-0.rc0.78e36f3b0dae586.6.test
# This is needed to do merge window version magic
%define patchlevel 17
-
# allow pkg_release to have configurable %%{?dist} tag
%define specrelease 0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist}
+#
+# End of genspec.sh variables
+#
+
%define pkg_release %{specrelease}
# libexec dir is not used by the linker, so the shared object there
@@ -687,7 +689,7 @@ BuildRequires: lld
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.xz
+Source0: linux-%{tarfile_release}.tar.xz
Source1: Makefile.rhelver
@@ -1352,7 +1354,7 @@ ApplyPatch()
exit 1
fi
if ! grep -E "^Patch[0-9]+: $patch\$" %{_specdir}/${RPM_PACKAGE_NAME}.spec ;
then
- if [ "${patch:0:8}" != "patch-5." ] ; then
+ if [ "${patch:0:8}" != "patch-%{kversion}." ] ; then
echo "ERROR: Patch $patch not listed as a source patch in specfile"
exit 1
fi
@@ -1379,8 +1381,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.17.0-0.rc0.78e36f3b0dae586.6.test -c
-mv linux-5.17.0-0.rc0.78e36f3b0dae586.6.test linux-%{KVERREL}
+%setup -q -n kernel-%{tarfile_release} -c
+mv linux-%{tarfile_release} linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
b/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
+++ b/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
@@ -3,13 +3,6 @@
# environment changes that affect %%install need to go
# here before the %%install macro is pre-built.
-# Include Fedora files
-%global include_fedora 1
-# Include RHEL files
-%global include_rhel 1
-# Provide Patchlist.changelog file
-%global patchlist_changelog 1
-
# Disable LTO in userspace packages.
%global _lto_cflags %{nil}
@@ -72,21 +65,6 @@
%endif
Summary: The Linux kernel
-
-# Set released_kernel to 1 when the upstream source tarball contains a
-# kernel release. (This includes prepatch or "rc" releases.)
-# Set released_kernel to 0 when the upstream source tarball contains an
-# unreleased kernel development snapshot.
-%global released_kernel 0
-
-# Set debugbuildsenabled to 1 to build separate base and debug kernels
-# (on supported architectures). The kernel-debug-* subpackages will
-# contain the debug kernel.
-# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
-# to build the base kernel using the debug configuration. (Specifying
-# the --with-release option overrides this setting.)
-%define debugbuildsenabled 0
-
%if 0%{?fedora}
%define secure_boot_arch x86_64
%else
@@ -115,25 +93,49 @@ Summary: The Linux kernel
# for parallel xz processes, replace with 1 to go back to single process
%endif
-%define buildid .test
-
-
%if 0%{?fedora}
%define primary_target fedora
%else
%define primary_target rhel
%endif
+#
+# genspec.sh variables
+#
+
+# Include Fedora files
+%global include_fedora 1
+# Include RHEL files
+%global include_rhel 1
+# Provide Patchlist.changelog file
+%global patchlist_changelog 1
+# Set released_kernel to 1 when the upstream source tarball contains a
+# kernel release. (This includes prepatch or "rc" releases.)
+# Set released_kernel to 0 when the upstream source tarball contains an
+# unreleased kernel development snapshot.
+%global released_kernel 0
+# Set debugbuildsenabled to 1 to build separate base and debug kernels
+# (on supported architectures). The kernel-debug-* subpackages will
+# contain the debug kernel.
+# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
+# to build the base kernel using the debug configuration. (Specifying
+# the --with-release option overrides this setting.)
+%define debugbuildsenabled 0
+%define buildid .test
%define specversion 5.17.0
%define patchversion 5.17
%define pkgrelease 0.rc0.78e36f3b0dae586.6.test
-
+%define kversion 5
+%define tarfile_release 5.17.0-0.rc0.78e36f3b0dae586.6.test
# This is needed to do merge window version magic
%define patchlevel 17
-
# allow pkg_release to have configurable %%{?dist} tag
%define specrelease 0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist}
+#
+# End of genspec.sh variables
+#
+
%define pkg_release %{specrelease}
# libexec dir is not used by the linker, so the shared object there
@@ -687,7 +689,7 @@ BuildRequires: lld
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.xz
+Source0: linux-%{tarfile_release}.tar.xz
Source1: Makefile.rhelver
@@ -1352,7 +1354,7 @@ ApplyPatch()
exit 1
fi
if ! grep -E "^Patch[0-9]+: $patch\$" %{_specdir}/${RPM_PACKAGE_NAME}.spec ;
then
- if [ "${patch:0:8}" != "patch-5." ] ; then
+ if [ "${patch:0:8}" != "patch-%{kversion}." ] ; then
echo "ERROR: Patch $patch not listed as a source patch in specfile"
exit 1
fi
@@ -1379,8 +1381,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.17.0-0.rc0.78e36f3b0dae586.6.test -c
-mv linux-5.17.0-0.rc0.78e36f3b0dae586.6.test linux-%{KVERREL}
+%setup -q -n kernel-%{tarfile_release} -c
+mv linux-%{tarfile_release} linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
diff --git a/redhat/self-test/data/centos-df0cc57e057f.el7.spec
b/redhat/self-test/data/centos-df0cc57e057f.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-df0cc57e057f.el7.spec
+++ b/redhat/self-test/data/centos-df0cc57e057f.el7.spec
@@ -3,13 +3,6 @@
# environment changes that affect %%install need to go
# here before the %%install macro is pre-built.
-# Include Fedora files
-%global include_fedora 1
-# Include RHEL files
-%global include_rhel 1
-# Provide Patchlist.changelog file
-%global patchlist_changelog 1
-
# Disable LTO in userspace packages.
%global _lto_cflags %{nil}
@@ -72,21 +65,6 @@
%endif
Summary: The Linux kernel
-
-# Set released_kernel to 1 when the upstream source tarball contains a
-# kernel release. (This includes prepatch or "rc" releases.)
-# Set released_kernel to 0 when the upstream source tarball contains an
-# unreleased kernel development snapshot.
-%global released_kernel 0
-
-# Set debugbuildsenabled to 1 to build separate base and debug kernels
-# (on supported architectures). The kernel-debug-* subpackages will
-# contain the debug kernel.
-# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
-# to build the base kernel using the debug configuration. (Specifying
-# the --with-release option overrides this setting.)
-%define debugbuildsenabled 1
-
%if 0%{?fedora}
%define secure_boot_arch x86_64
%else
@@ -115,25 +93,49 @@ Summary: The Linux kernel
# for parallel xz processes, replace with 1 to go back to single process
%endif
-%define buildid .test
-
-
%if 0%{?fedora}
%define primary_target fedora
%else
%define primary_target rhel
%endif
+#
+# genspec.sh variables
+#
+
+# Include Fedora files
+%global include_fedora 1
+# Include RHEL files
+%global include_rhel 1
+# Provide Patchlist.changelog file
+%global patchlist_changelog 1
+# Set released_kernel to 1 when the upstream source tarball contains a
+# kernel release. (This includes prepatch or "rc" releases.)
+# Set released_kernel to 0 when the upstream source tarball contains an
+# unreleased kernel development snapshot.
+%global released_kernel 0
+# Set debugbuildsenabled to 1 to build separate base and debug kernels
+# (on supported architectures). The kernel-debug-* subpackages will
+# contain the debug kernel.
+# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
+# to build the base kernel using the debug configuration. (Specifying
+# the --with-release option overrides this setting.)
+%define debugbuildsenabled 1
+%define buildid .test
%define specversion 5.16.0
%define patchversion 5.16
%define pkgrelease 6.test
-
+%define kversion 5
+%define tarfile_release 5.16.0-6.test
# This is needed to do merge window version magic
%define patchlevel 16
-
# allow pkg_release to have configurable %%{?dist} tag
%define specrelease 6%{?buildid}%{?dist}
+#
+# End of genspec.sh variables
+#
+
%define pkg_release %{specrelease}
# libexec dir is not used by the linker, so the shared object there
@@ -687,7 +689,7 @@ BuildRequires: lld
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.16.0-6.test.tar.xz
+Source0: linux-%{tarfile_release}.tar.xz
Source1: Makefile.rhelver
@@ -1352,7 +1354,7 @@ ApplyPatch()
exit 1
fi
if ! grep -E "^Patch[0-9]+: $patch\$" %{_specdir}/${RPM_PACKAGE_NAME}.spec ;
then
- if [ "${patch:0:8}" != "patch-5." ] ; then
+ if [ "${patch:0:8}" != "patch-%{kversion}." ] ; then
echo "ERROR: Patch $patch not listed as a source patch in specfile"
exit 1
fi
@@ -1379,8 +1381,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.16.0-6.test -c
-mv linux-5.16.0-6.test linux-%{KVERREL}
+%setup -q -n kernel-%{tarfile_release} -c
+mv linux-%{tarfile_release} linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
diff --git a/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
b/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
+++ b/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
@@ -3,13 +3,6 @@
# environment changes that affect %%install need to go
# here before the %%install macro is pre-built.
-# Include Fedora files
-%global include_fedora 1
-# Include RHEL files
-%global include_rhel 1
-# Provide Patchlist.changelog file
-%global patchlist_changelog 1
-
# Disable LTO in userspace packages.
%global _lto_cflags %{nil}
@@ -72,21 +65,6 @@
%endif
Summary: The Linux kernel
-
-# Set released_kernel to 1 when the upstream source tarball contains a
-# kernel release. (This includes prepatch or "rc" releases.)
-# Set released_kernel to 0 when the upstream source tarball contains an
-# unreleased kernel development snapshot.
-%global released_kernel 0
-
-# Set debugbuildsenabled to 1 to build separate base and debug kernels
-# (on supported architectures). The kernel-debug-* subpackages will
-# contain the debug kernel.
-# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
-# to build the base kernel using the debug configuration. (Specifying
-# the --with-release option overrides this setting.)
-%define debugbuildsenabled 1
-
%if 0%{?fedora}
%define secure_boot_arch x86_64
%else
@@ -115,25 +93,49 @@ Summary: The Linux kernel
# for parallel xz processes, replace with 1 to go back to single process
%endif
-%define buildid .test
-
-
%if 0%{?fedora}
%define primary_target fedora
%else
%define primary_target rhel
%endif
+#
+# genspec.sh variables
+#
+
+# Include Fedora files
+%global include_fedora 1
+# Include RHEL files
+%global include_rhel 1
+# Provide Patchlist.changelog file
+%global patchlist_changelog 1
+# Set released_kernel to 1 when the upstream source tarball contains a
+# kernel release. (This includes prepatch or "rc" releases.)
+# Set released_kernel to 0 when the upstream source tarball contains an
+# unreleased kernel development snapshot.
+%global released_kernel 0
+# Set debugbuildsenabled to 1 to build separate base and debug kernels
+# (on supported architectures). The kernel-debug-* subpackages will
+# contain the debug kernel.
+# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
+# to build the base kernel using the debug configuration. (Specifying
+# the --with-release option overrides this setting.)
+%define debugbuildsenabled 1
+%define buildid .test
%define specversion 5.16.0
%define patchversion 5.16
%define pkgrelease 6.test
-
+%define kversion 5
+%define tarfile_release 5.16.0-6.test
# This is needed to do merge window version magic
%define patchlevel 16
-
# allow pkg_release to have configurable %%{?dist} tag
%define specrelease 6%{?buildid}%{?dist}
+#
+# End of genspec.sh variables
+#
+
%define pkg_release %{specrelease}
# libexec dir is not used by the linker, so the shared object there
@@ -687,7 +689,7 @@ BuildRequires: lld
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.16.0-6.test.tar.xz
+Source0: linux-%{tarfile_release}.tar.xz
Source1: Makefile.rhelver
@@ -1352,7 +1354,7 @@ ApplyPatch()
exit 1
fi
if ! grep -E "^Patch[0-9]+: $patch\$" %{_specdir}/${RPM_PACKAGE_NAME}.spec ;
then
- if [ "${patch:0:8}" != "patch-5." ] ; then
+ if [ "${patch:0:8}" != "patch-%{kversion}." ] ; then
echo "ERROR: Patch $patch not listed as a source patch in specfile"
exit 1
fi
@@ -1379,8 +1381,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.16.0-6.test -c
-mv linux-5.16.0-6.test linux-%{KVERREL}
+%setup -q -n kernel-%{tarfile_release} -c
+mv linux-%{tarfile_release} linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
b/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
+++ b/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
@@ -3,13 +3,6 @@
# environment changes that affect %%install need to go
# here before the %%install macro is pre-built.
-# Include Fedora files
-%global include_fedora 1
-# Include RHEL files
-%global include_rhel 1
-# Provide Patchlist.changelog file
-%global patchlist_changelog 1
-
# Disable LTO in userspace packages.
%global _lto_cflags %{nil}
@@ -72,21 +65,6 @@
%endif
Summary: The Linux kernel
-
-# Set released_kernel to 1 when the upstream source tarball contains a
-# kernel release. (This includes prepatch or "rc" releases.)
-# Set released_kernel to 0 when the upstream source tarball contains an
-# unreleased kernel development snapshot.
-%global released_kernel 0
-
-# Set debugbuildsenabled to 1 to build separate base and debug kernels
-# (on supported architectures). The kernel-debug-* subpackages will
-# contain the debug kernel.
-# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
-# to build the base kernel using the debug configuration. (Specifying
-# the --with-release option overrides this setting.)
-%define debugbuildsenabled 0
-
%if 0%{?fedora}
%define secure_boot_arch x86_64
%else
@@ -115,25 +93,49 @@ Summary: The Linux kernel
# for parallel xz processes, replace with 1 to go back to single process
%endif
-%define buildid .test
-
-
%if 0%{?fedora}
%define primary_target fedora
%else
%define primary_target rhel
%endif
+#
+# genspec.sh variables
+#
+
+# Include Fedora files
+%global include_fedora 1
+# Include RHEL files
+%global include_rhel 1
+# Provide Patchlist.changelog file
+%global patchlist_changelog 1
+# Set released_kernel to 1 when the upstream source tarball contains a
+# kernel release. (This includes prepatch or "rc" releases.)
+# Set released_kernel to 0 when the upstream source tarball contains an
+# unreleased kernel development snapshot.
+%global released_kernel 0
+# Set debugbuildsenabled to 1 to build separate base and debug kernels
+# (on supported architectures). The kernel-debug-* subpackages will
+# contain the debug kernel.
+# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
+# to build the base kernel using the debug configuration. (Specifying
+# the --with-release option overrides this setting.)
+%define debugbuildsenabled 0
+%define buildid .test
%define specversion 5.16.0
%define patchversion 5.16
%define pkgrelease 0.rc5.fce15c45d3fbd9f.6.test
-
+%define kversion 5
+%define tarfile_release 5.16.0-0.rc5.fce15c45d3fbd9f.6.test
# This is needed to do merge window version magic
%define patchlevel 16
-
# allow pkg_release to have configurable %%{?dist} tag
%define specrelease 0.rc5.fce15c45d3fbd9f.6%{?buildid}%{?dist}
+#
+# End of genspec.sh variables
+#
+
%define pkg_release %{specrelease}
# libexec dir is not used by the linker, so the shared object there
@@ -687,7 +689,7 @@ BuildRequires: lld
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.xz
+Source0: linux-%{tarfile_release}.tar.xz
Source1: Makefile.rhelver
@@ -1352,7 +1354,7 @@ ApplyPatch()
exit 1
fi
if ! grep -E "^Patch[0-9]+: $patch\$" %{_specdir}/${RPM_PACKAGE_NAME}.spec ;
then
- if [ "${patch:0:8}" != "patch-5." ] ; then
+ if [ "${patch:0:8}" != "patch-%{kversion}." ] ; then
echo "ERROR: Patch $patch not listed as a source patch in specfile"
exit 1
fi
@@ -1379,8 +1381,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.16.0-0.rc5.fce15c45d3fbd9f.6.test -c
-mv linux-5.16.0-0.rc5.fce15c45d3fbd9f.6.test linux-%{KVERREL}
+%setup -q -n kernel-%{tarfile_release} -c
+mv linux-%{tarfile_release} linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
b/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
+++ b/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
@@ -3,13 +3,6 @@
# environment changes that affect %%install need to go
# here before the %%install macro is pre-built.
-# Include Fedora files
-%global include_fedora 1
-# Include RHEL files
-%global include_rhel 1
-# Provide Patchlist.changelog file
-%global patchlist_changelog 1
-
# Disable LTO in userspace packages.
%global _lto_cflags %{nil}
@@ -72,21 +65,6 @@
%endif
Summary: The Linux kernel
-
-# Set released_kernel to 1 when the upstream source tarball contains a
-# kernel release. (This includes prepatch or "rc" releases.)
-# Set released_kernel to 0 when the upstream source tarball contains an
-# unreleased kernel development snapshot.
-%global released_kernel 0
-
-# Set debugbuildsenabled to 1 to build separate base and debug kernels
-# (on supported architectures). The kernel-debug-* subpackages will
-# contain the debug kernel.
-# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
-# to build the base kernel using the debug configuration. (Specifying
-# the --with-release option overrides this setting.)
-%define debugbuildsenabled 0
-
%if 0%{?fedora}
%define secure_boot_arch x86_64
%else
@@ -115,25 +93,49 @@ Summary: The Linux kernel
# for parallel xz processes, replace with 1 to go back to single process
%endif
-%define buildid .test
-
-
%if 0%{?fedora}
%define primary_target fedora
%else
%define primary_target rhel
%endif
+#
+# genspec.sh variables
+#
+
+# Include Fedora files
+%global include_fedora 1
+# Include RHEL files
+%global include_rhel 1
+# Provide Patchlist.changelog file
+%global patchlist_changelog 1
+# Set released_kernel to 1 when the upstream source tarball contains a
+# kernel release. (This includes prepatch or "rc" releases.)
+# Set released_kernel to 0 when the upstream source tarball contains an
+# unreleased kernel development snapshot.
+%global released_kernel 0
+# Set debugbuildsenabled to 1 to build separate base and debug kernels
+# (on supported architectures). The kernel-debug-* subpackages will
+# contain the debug kernel.
+# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
+# to build the base kernel using the debug configuration. (Specifying
+# the --with-release option overrides this setting.)
+%define debugbuildsenabled 0
+%define buildid .test
%define specversion 5.16.0
%define patchversion 5.16
%define pkgrelease 0.rc5.fce15c45d3fbd9f.6.test
-
+%define kversion 5
+%define tarfile_release 5.16.0-0.rc5.fce15c45d3fbd9f.6.test
# This is needed to do merge window version magic
%define patchlevel 16
-
# allow pkg_release to have configurable %%{?dist} tag
%define specrelease 0.rc5.fce15c45d3fbd9f.6%{?buildid}%{?dist}
+#
+# End of genspec.sh variables
+#
+
%define pkg_release %{specrelease}
# libexec dir is not used by the linker, so the shared object there
@@ -687,7 +689,7 @@ BuildRequires: lld
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.xz
+Source0: linux-%{tarfile_release}.tar.xz
Source1: Makefile.rhelver
@@ -1352,7 +1354,7 @@ ApplyPatch()
exit 1
fi
if ! grep -E "^Patch[0-9]+: $patch\$" %{_specdir}/${RPM_PACKAGE_NAME}.spec ;
then
- if [ "${patch:0:8}" != "patch-5." ] ; then
+ if [ "${patch:0:8}" != "patch-%{kversion}." ] ; then
echo "ERROR: Patch $patch not listed as a source patch in specfile"
exit 1
fi
@@ -1379,8 +1381,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.16.0-0.rc5.fce15c45d3fbd9f.6.test -c
-mv linux-5.16.0-0.rc5.fce15c45d3fbd9f.6.test linux-%{KVERREL}
+%setup -q -n kernel-%{tarfile_release} -c
+mv linux-%{tarfile_release} linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
b/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
+++ b/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
@@ -3,13 +3,6 @@
# environment changes that affect %%install need to go
# here before the %%install macro is pre-built.
-# Include Fedora files
-%global include_fedora 1
-# Include RHEL files
-%global include_rhel 1
-# Provide Patchlist.changelog file
-%global patchlist_changelog 1
-
# Disable LTO in userspace packages.
%global _lto_cflags %{nil}
@@ -72,21 +65,6 @@
%endif
Summary: The Linux kernel
-
-# Set released_kernel to 1 when the upstream source tarball contains a
-# kernel release. (This includes prepatch or "rc" releases.)
-# Set released_kernel to 0 when the upstream source tarball contains an
-# unreleased kernel development snapshot.
-%global released_kernel 0
-
-# Set debugbuildsenabled to 1 to build separate base and debug kernels
-# (on supported architectures). The kernel-debug-* subpackages will
-# contain the debug kernel.
-# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
-# to build the base kernel using the debug configuration. (Specifying
-# the --with-release option overrides this setting.)
-%define debugbuildsenabled 1
-
%if 0%{?fedora}
%define secure_boot_arch x86_64
%else
@@ -115,25 +93,49 @@ Summary: The Linux kernel
# for parallel xz processes, replace with 1 to go back to single process
%endif
-%define buildid .test
-
-
%if 0%{?fedora}
%define primary_target fedora
%else
%define primary_target rhel
%endif
+#
+# genspec.sh variables
+#
+
+# Include Fedora files
+%global include_fedora 1
+# Include RHEL files
+%global include_rhel 1
+# Provide Patchlist.changelog file
+%global patchlist_changelog 1
+# Set released_kernel to 1 when the upstream source tarball contains a
+# kernel release. (This includes prepatch or "rc" releases.)
+# Set released_kernel to 0 when the upstream source tarball contains an
+# unreleased kernel development snapshot.
+%global released_kernel 0
+# Set debugbuildsenabled to 1 to build separate base and debug kernels
+# (on supported architectures). The kernel-debug-* subpackages will
+# contain the debug kernel.
+# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
+# to build the base kernel using the debug configuration. (Specifying
+# the --with-release option overrides this setting.)
+%define debugbuildsenabled 1
+%define buildid .test
%define specversion 5.16.0
%define patchversion 5.16
%define pkgrelease 0.rc5.6.test
-
+%define kversion 5
+%define tarfile_release 5.16-rc5
# This is needed to do merge window version magic
%define patchlevel 16
-
# allow pkg_release to have configurable %%{?dist} tag
%define specrelease 0.rc5.6%{?buildid}%{?dist}
+#
+# End of genspec.sh variables
+#
+
%define pkg_release %{specrelease}
# libexec dir is not used by the linker, so the shared object there
@@ -687,7 +689,7 @@ BuildRequires: lld
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.16-rc5.tar.xz
+Source0: linux-%{tarfile_release}.tar.xz
Source1: Makefile.rhelver
@@ -1352,7 +1354,7 @@ ApplyPatch()
exit 1
fi
if ! grep -E "^Patch[0-9]+: $patch\$" %{_specdir}/${RPM_PACKAGE_NAME}.spec ;
then
- if [ "${patch:0:8}" != "patch-5." ] ; then
+ if [ "${patch:0:8}" != "patch-%{kversion}." ] ; then
echo "ERROR: Patch $patch not listed as a source patch in specfile"
exit 1
fi
@@ -1379,8 +1381,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.16-rc5 -c
-mv linux-5.16-rc5 linux-%{KVERREL}
+%setup -q -n kernel-%{tarfile_release} -c
+mv linux-%{tarfile_release} linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec
b/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec
+++ b/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec
@@ -3,13 +3,6 @@
# environment changes that affect %%install need to go
# here before the %%install macro is pre-built.
-# Include Fedora files
-%global include_fedora 1
-# Include RHEL files
-%global include_rhel 1
-# Provide Patchlist.changelog file
-%global patchlist_changelog 1
-
# Disable LTO in userspace packages.
%global _lto_cflags %{nil}
@@ -72,21 +65,6 @@
%endif
Summary: The Linux kernel
-
-# Set released_kernel to 1 when the upstream source tarball contains a
-# kernel release. (This includes prepatch or "rc" releases.)
-# Set released_kernel to 0 when the upstream source tarball contains an
-# unreleased kernel development snapshot.
-%global released_kernel 0
-
-# Set debugbuildsenabled to 1 to build separate base and debug kernels
-# (on supported architectures). The kernel-debug-* subpackages will
-# contain the debug kernel.
-# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
-# to build the base kernel using the debug configuration. (Specifying
-# the --with-release option overrides this setting.)
-%define debugbuildsenabled 1
-
%if 0%{?fedora}
%define secure_boot_arch x86_64
%else
@@ -115,25 +93,49 @@ Summary: The Linux kernel
# for parallel xz processes, replace with 1 to go back to single process
%endif
-%define buildid .test
-
-
%if 0%{?fedora}
%define primary_target fedora
%else
%define primary_target rhel
%endif
+#
+# genspec.sh variables
+#
+
+# Include Fedora files
+%global include_fedora 1
+# Include RHEL files
+%global include_rhel 1
+# Provide Patchlist.changelog file
+%global patchlist_changelog 1
+# Set released_kernel to 1 when the upstream source tarball contains a
+# kernel release. (This includes prepatch or "rc" releases.)
+# Set released_kernel to 0 when the upstream source tarball contains an
+# unreleased kernel development snapshot.
+%global released_kernel 0
+# Set debugbuildsenabled to 1 to build separate base and debug kernels
+# (on supported architectures). The kernel-debug-* subpackages will
+# contain the debug kernel.
+# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
+# to build the base kernel using the debug configuration. (Specifying
+# the --with-release option overrides this setting.)
+%define debugbuildsenabled 1
+%define buildid .test
%define specversion 5.16.0
%define patchversion 5.16
%define pkgrelease 0.rc5.6.test
-
+%define kversion 5
+%define tarfile_release 5.16-rc5
# This is needed to do merge window version magic
%define patchlevel 16
-
# allow pkg_release to have configurable %%{?dist} tag
%define specrelease 0.rc5.6%{?buildid}%{?dist}
+#
+# End of genspec.sh variables
+#
+
%define pkg_release %{specrelease}
# libexec dir is not used by the linker, so the shared object there
@@ -687,7 +689,7 @@ BuildRequires: lld
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.16-rc5.tar.xz
+Source0: linux-%{tarfile_release}.tar.xz
Source1: Makefile.rhelver
@@ -1352,7 +1354,7 @@ ApplyPatch()
exit 1
fi
if ! grep -E "^Patch[0-9]+: $patch\$" %{_specdir}/${RPM_PACKAGE_NAME}.spec ;
then
- if [ "${patch:0:8}" != "patch-5." ] ; then
+ if [ "${patch:0:8}" != "patch-%{kversion}." ] ; then
echo "ERROR: Patch $patch not listed as a source patch in specfile"
exit 1
fi
@@ -1379,8 +1381,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.16-rc5 -c
-mv linux-5.16-rc5 linux-%{KVERREL}
+%setup -q -n kernel-%{tarfile_release} -c
+mv linux-%{tarfile_release} linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
b/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
+++ b/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
@@ -3,13 +3,6 @@
# environment changes that affect %%install need to go
# here before the %%install macro is pre-built.
-# Include Fedora files
-%global include_fedora 1
-# Include RHEL files
-%global include_rhel 1
-# Provide Patchlist.changelog file
-%global patchlist_changelog 1
-
# Disable LTO in userspace packages.
%global _lto_cflags %{nil}
@@ -72,21 +65,6 @@
%endif
Summary: The Linux kernel
-
-# Set released_kernel to 1 when the upstream source tarball contains a
-# kernel release. (This includes prepatch or "rc" releases.)
-# Set released_kernel to 0 when the upstream source tarball contains an
-# unreleased kernel development snapshot.
-%global released_kernel 0
-
-# Set debugbuildsenabled to 1 to build separate base and debug kernels
-# (on supported architectures). The kernel-debug-* subpackages will
-# contain the debug kernel.
-# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
-# to build the base kernel using the debug configuration. (Specifying
-# the --with-release option overrides this setting.)
-%define debugbuildsenabled 0
-
%if 0%{?fedora}
%define secure_boot_arch x86_64
%else
@@ -115,25 +93,49 @@ Summary: The Linux kernel
# for parallel xz processes, replace with 1 to go back to single process
%endif
-%define buildid .test
-
-
%if 0%{?fedora}
%define primary_target fedora
%else
%define primary_target rhel
%endif
+#
+# genspec.sh variables
+#
+
+# Include Fedora files
+%global include_fedora 1
+# Include RHEL files
+%global include_rhel 1
+# Provide Patchlist.changelog file
+%global patchlist_changelog 1
+# Set released_kernel to 1 when the upstream source tarball contains a
+# kernel release. (This includes prepatch or "rc" releases.)
+# Set released_kernel to 0 when the upstream source tarball contains an
+# unreleased kernel development snapshot.
+%global released_kernel 0
+# Set debugbuildsenabled to 1 to build separate base and debug kernels
+# (on supported architectures). The kernel-debug-* subpackages will
+# contain the debug kernel.
+# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
+# to build the base kernel using the debug configuration. (Specifying
+# the --with-release option overrides this setting.)
+%define debugbuildsenabled 0
+%define buildid .test
%define specversion 5.17.0
%define patchversion 5.17
%define pkgrelease 0.rc0.78e36f3b0dae586.6.test
-
+%define kversion 5
+%define tarfile_release 5.16-11523-g78e36f3b0dae586
# This is needed to do merge window version magic
%define patchlevel 17
-
# allow pkg_release to have configurable %%{?dist} tag
%define specrelease 0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist}
+#
+# End of genspec.sh variables
+#
+
%define pkg_release %{specrelease}
# libexec dir is not used by the linker, so the shared object there
@@ -687,7 +689,7 @@ BuildRequires: lld
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.16-11523-g78e36f3b0dae586.tar.xz
+Source0: linux-%{tarfile_release}.tar.xz
Source1: Makefile.rhelver
@@ -1352,7 +1354,7 @@ ApplyPatch()
exit 1
fi
if ! grep -E "^Patch[0-9]+: $patch\$" %{_specdir}/${RPM_PACKAGE_NAME}.spec ;
then
- if [ "${patch:0:8}" != "patch-5." ] ; then
+ if [ "${patch:0:8}" != "patch-%{kversion}." ] ; then
echo "ERROR: Patch $patch not listed as a source patch in specfile"
exit 1
fi
@@ -1379,8 +1381,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.16-11523-g78e36f3b0dae586 -c
-mv linux-5.16-11523-g78e36f3b0dae586 linux-%{KVERREL}
+%setup -q -n kernel-%{tarfile_release} -c
+mv linux-%{tarfile_release} linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
b/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
+++ b/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
@@ -3,13 +3,6 @@
# environment changes that affect %%install need to go
# here before the %%install macro is pre-built.
-# Include Fedora files
-%global include_fedora 1
-# Include RHEL files
-%global include_rhel 1
-# Provide Patchlist.changelog file
-%global patchlist_changelog 1
-
# Disable LTO in userspace packages.
%global _lto_cflags %{nil}
@@ -72,21 +65,6 @@
%endif
Summary: The Linux kernel
-
-# Set released_kernel to 1 when the upstream source tarball contains a
-# kernel release. (This includes prepatch or "rc" releases.)
-# Set released_kernel to 0 when the upstream source tarball contains an
-# unreleased kernel development snapshot.
-%global released_kernel 0
-
-# Set debugbuildsenabled to 1 to build separate base and debug kernels
-# (on supported architectures). The kernel-debug-* subpackages will
-# contain the debug kernel.
-# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
-# to build the base kernel using the debug configuration. (Specifying
-# the --with-release option overrides this setting.)
-%define debugbuildsenabled 0
-
%if 0%{?fedora}
%define secure_boot_arch x86_64
%else
@@ -115,25 +93,49 @@ Summary: The Linux kernel
# for parallel xz processes, replace with 1 to go back to single process
%endif
-%define buildid .test
-
-
%if 0%{?fedora}
%define primary_target fedora
%else
%define primary_target rhel
%endif
+#
+# genspec.sh variables
+#
+
+# Include Fedora files
+%global include_fedora 1
+# Include RHEL files
+%global include_rhel 1
+# Provide Patchlist.changelog file
+%global patchlist_changelog 1
+# Set released_kernel to 1 when the upstream source tarball contains a
+# kernel release. (This includes prepatch or "rc" releases.)
+# Set released_kernel to 0 when the upstream source tarball contains an
+# unreleased kernel development snapshot.
+%global released_kernel 0
+# Set debugbuildsenabled to 1 to build separate base and debug kernels
+# (on supported architectures). The kernel-debug-* subpackages will
+# contain the debug kernel.
+# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
+# to build the base kernel using the debug configuration. (Specifying
+# the --with-release option overrides this setting.)
+%define debugbuildsenabled 0
+%define buildid .test
%define specversion 5.17.0
%define patchversion 5.17
%define pkgrelease 0.rc0.78e36f3b0dae586.6.test
-
+%define kversion 5
+%define tarfile_release 5.16-11523-g78e36f3b0dae586
# This is needed to do merge window version magic
%define patchlevel 17
-
# allow pkg_release to have configurable %%{?dist} tag
%define specrelease 0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist}
+#
+# End of genspec.sh variables
+#
+
%define pkg_release %{specrelease}
# libexec dir is not used by the linker, so the shared object there
@@ -687,7 +689,7 @@ BuildRequires: lld
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.16-11523-g78e36f3b0dae586.tar.xz
+Source0: linux-%{tarfile_release}.tar.xz
Source1: Makefile.rhelver
@@ -1352,7 +1354,7 @@ ApplyPatch()
exit 1
fi
if ! grep -E "^Patch[0-9]+: $patch\$" %{_specdir}/${RPM_PACKAGE_NAME}.spec ;
then
- if [ "${patch:0:8}" != "patch-5." ] ; then
+ if [ "${patch:0:8}" != "patch-%{kversion}." ] ; then
echo "ERROR: Patch $patch not listed as a source patch in specfile"
exit 1
fi
@@ -1379,8 +1381,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.16-11523-g78e36f3b0dae586 -c
-mv linux-5.16-11523-g78e36f3b0dae586 linux-%{KVERREL}
+%setup -q -n kernel-%{tarfile_release} -c
+mv linux-%{tarfile_release} linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
diff --git a/redhat/self-test/data/fedora-df0cc57e057f.el7.spec
b/redhat/self-test/data/fedora-df0cc57e057f.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-df0cc57e057f.el7.spec
+++ b/redhat/self-test/data/fedora-df0cc57e057f.el7.spec
@@ -3,13 +3,6 @@
# environment changes that affect %%install need to go
# here before the %%install macro is pre-built.
-# Include Fedora files
-%global include_fedora 1
-# Include RHEL files
-%global include_rhel 1
-# Provide Patchlist.changelog file
-%global patchlist_changelog 1
-
# Disable LTO in userspace packages.
%global _lto_cflags %{nil}
@@ -72,21 +65,6 @@
%endif
Summary: The Linux kernel
-
-# Set released_kernel to 1 when the upstream source tarball contains a
-# kernel release. (This includes prepatch or "rc" releases.)
-# Set released_kernel to 0 when the upstream source tarball contains an
-# unreleased kernel development snapshot.
-%global released_kernel 0
-
-# Set debugbuildsenabled to 1 to build separate base and debug kernels
-# (on supported architectures). The kernel-debug-* subpackages will
-# contain the debug kernel.
-# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
-# to build the base kernel using the debug configuration. (Specifying
-# the --with-release option overrides this setting.)
-%define debugbuildsenabled 1
-
%if 0%{?fedora}
%define secure_boot_arch x86_64
%else
@@ -115,25 +93,49 @@ Summary: The Linux kernel
# for parallel xz processes, replace with 1 to go back to single process
%endif
-%define buildid .test
-
-
%if 0%{?fedora}
%define primary_target fedora
%else
%define primary_target rhel
%endif
+#
+# genspec.sh variables
+#
+
+# Include Fedora files
+%global include_fedora 1
+# Include RHEL files
+%global include_rhel 1
+# Provide Patchlist.changelog file
+%global patchlist_changelog 1
+# Set released_kernel to 1 when the upstream source tarball contains a
+# kernel release. (This includes prepatch or "rc" releases.)
+# Set released_kernel to 0 when the upstream source tarball contains an
+# unreleased kernel development snapshot.
+%global released_kernel 0
+# Set debugbuildsenabled to 1 to build separate base and debug kernels
+# (on supported architectures). The kernel-debug-* subpackages will
+# contain the debug kernel.
+# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
+# to build the base kernel using the debug configuration. (Specifying
+# the --with-release option overrides this setting.)
+%define debugbuildsenabled 1
+%define buildid .test
%define specversion 5.16.0
%define patchversion 5.16
%define pkgrelease 6.test
-
+%define kversion 5
+%define tarfile_release 5.16
# This is needed to do merge window version magic
%define patchlevel 16
-
# allow pkg_release to have configurable %%{?dist} tag
%define specrelease 6%{?buildid}%{?dist}
+#
+# End of genspec.sh variables
+#
+
%define pkg_release %{specrelease}
# libexec dir is not used by the linker, so the shared object there
@@ -687,7 +689,7 @@ BuildRequires: lld
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.16.tar.xz
+Source0: linux-%{tarfile_release}.tar.xz
Source1: Makefile.rhelver
@@ -1352,7 +1354,7 @@ ApplyPatch()
exit 1
fi
if ! grep -E "^Patch[0-9]+: $patch\$" %{_specdir}/${RPM_PACKAGE_NAME}.spec ;
then
- if [ "${patch:0:8}" != "patch-5." ] ; then
+ if [ "${patch:0:8}" != "patch-%{kversion}." ] ; then
echo "ERROR: Patch $patch not listed as a source patch in specfile"
exit 1
fi
@@ -1379,8 +1381,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.16 -c
-mv linux-5.16 linux-%{KVERREL}
+%setup -q -n kernel-%{tarfile_release} -c
+mv linux-%{tarfile_release} linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
diff --git a/redhat/self-test/data/fedora-df0cc57e057f.fc25.spec
b/redhat/self-test/data/fedora-df0cc57e057f.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-df0cc57e057f.fc25.spec
+++ b/redhat/self-test/data/fedora-df0cc57e057f.fc25.spec
@@ -3,13 +3,6 @@
# environment changes that affect %%install need to go
# here before the %%install macro is pre-built.
-# Include Fedora files
-%global include_fedora 1
-# Include RHEL files
-%global include_rhel 1
-# Provide Patchlist.changelog file
-%global patchlist_changelog 1
-
# Disable LTO in userspace packages.
%global _lto_cflags %{nil}
@@ -72,21 +65,6 @@
%endif
Summary: The Linux kernel
-
-# Set released_kernel to 1 when the upstream source tarball contains a
-# kernel release. (This includes prepatch or "rc" releases.)
-# Set released_kernel to 0 when the upstream source tarball contains an
-# unreleased kernel development snapshot.
-%global released_kernel 0
-
-# Set debugbuildsenabled to 1 to build separate base and debug kernels
-# (on supported architectures). The kernel-debug-* subpackages will
-# contain the debug kernel.
-# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
-# to build the base kernel using the debug configuration. (Specifying
-# the --with-release option overrides this setting.)
-%define debugbuildsenabled 1
-
%if 0%{?fedora}
%define secure_boot_arch x86_64
%else
@@ -115,25 +93,49 @@ Summary: The Linux kernel
# for parallel xz processes, replace with 1 to go back to single process
%endif
-%define buildid .test
-
-
%if 0%{?fedora}
%define primary_target fedora
%else
%define primary_target rhel
%endif
+#
+# genspec.sh variables
+#
+
+# Include Fedora files
+%global include_fedora 1
+# Include RHEL files
+%global include_rhel 1
+# Provide Patchlist.changelog file
+%global patchlist_changelog 1
+# Set released_kernel to 1 when the upstream source tarball contains a
+# kernel release. (This includes prepatch or "rc" releases.)
+# Set released_kernel to 0 when the upstream source tarball contains an
+# unreleased kernel development snapshot.
+%global released_kernel 0
+# Set debugbuildsenabled to 1 to build separate base and debug kernels
+# (on supported architectures). The kernel-debug-* subpackages will
+# contain the debug kernel.
+# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
+# to build the base kernel using the debug configuration. (Specifying
+# the --with-release option overrides this setting.)
+%define debugbuildsenabled 1
+%define buildid .test
%define specversion 5.16.0
%define patchversion 5.16
%define pkgrelease 6.test
-
+%define kversion 5
+%define tarfile_release 5.16
# This is needed to do merge window version magic
%define patchlevel 16
-
# allow pkg_release to have configurable %%{?dist} tag
%define specrelease 6%{?buildid}%{?dist}
+#
+# End of genspec.sh variables
+#
+
%define pkg_release %{specrelease}
# libexec dir is not used by the linker, so the shared object there
@@ -687,7 +689,7 @@ BuildRequires: lld
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.16.tar.xz
+Source0: linux-%{tarfile_release}.tar.xz
Source1: Makefile.rhelver
@@ -1352,7 +1354,7 @@ ApplyPatch()
exit 1
fi
if ! grep -E "^Patch[0-9]+: $patch\$" %{_specdir}/${RPM_PACKAGE_NAME}.spec ;
then
- if [ "${patch:0:8}" != "patch-5." ] ; then
+ if [ "${patch:0:8}" != "patch-%{kversion}." ] ; then
echo "ERROR: Patch $patch not listed as a source patch in specfile"
exit 1
fi
@@ -1379,8 +1381,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.16 -c
-mv linux-5.16 linux-%{KVERREL}
+%setup -q -n kernel-%{tarfile_release} -c
+mv linux-%{tarfile_release} linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
diff --git a/redhat/self-test/data/fedora-fce15c45d3fb.el7.spec
b/redhat/self-test/data/fedora-fce15c45d3fb.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-fce15c45d3fb.el7.spec
+++ b/redhat/self-test/data/fedora-fce15c45d3fb.el7.spec
@@ -3,13 +3,6 @@
# environment changes that affect %%install need to go
# here before the %%install macro is pre-built.
-# Include Fedora files
-%global include_fedora 1
-# Include RHEL files
-%global include_rhel 1
-# Provide Patchlist.changelog file
-%global patchlist_changelog 1
-
# Disable LTO in userspace packages.
%global _lto_cflags %{nil}
@@ -72,21 +65,6 @@
%endif
Summary: The Linux kernel
-
-# Set released_kernel to 1 when the upstream source tarball contains a
-# kernel release. (This includes prepatch or "rc" releases.)
-# Set released_kernel to 0 when the upstream source tarball contains an
-# unreleased kernel development snapshot.
-%global released_kernel 0
-
-# Set debugbuildsenabled to 1 to build separate base and debug kernels
-# (on supported architectures). The kernel-debug-* subpackages will
-# contain the debug kernel.
-# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
-# to build the base kernel using the debug configuration. (Specifying
-# the --with-release option overrides this setting.)
-%define debugbuildsenabled 0
-
%if 0%{?fedora}
%define secure_boot_arch x86_64
%else
@@ -115,25 +93,49 @@ Summary: The Linux kernel
# for parallel xz processes, replace with 1 to go back to single process
%endif
-%define buildid .test
-
-
%if 0%{?fedora}
%define primary_target fedora
%else
%define primary_target rhel
%endif
+#
+# genspec.sh variables
+#
+
+# Include Fedora files
+%global include_fedora 1
+# Include RHEL files
+%global include_rhel 1
+# Provide Patchlist.changelog file
+%global patchlist_changelog 1
+# Set released_kernel to 1 when the upstream source tarball contains a
+# kernel release. (This includes prepatch or "rc" releases.)
+# Set released_kernel to 0 when the upstream source tarball contains an
+# unreleased kernel development snapshot.
+%global released_kernel 0
+# Set debugbuildsenabled to 1 to build separate base and debug kernels
+# (on supported architectures). The kernel-debug-* subpackages will
+# contain the debug kernel.
+# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
+# to build the base kernel using the debug configuration. (Specifying
+# the --with-release option overrides this setting.)
+%define debugbuildsenabled 0
+%define buildid .test
%define specversion 5.16.0
%define patchversion 5.16
%define pkgrelease 0.rc5.fce15c45d3fbd9f.6.test
-
+%define kversion 5
+%define tarfile_release 5.16-rc5-1-gfce15c45d3fbd9f
# This is needed to do merge window version magic
%define patchlevel 16
-
# allow pkg_release to have configurable %%{?dist} tag
%define specrelease 0.rc5.fce15c45d3fbd9f.6%{?buildid}%{?dist}
+#
+# End of genspec.sh variables
+#
+
%define pkg_release %{specrelease}
# libexec dir is not used by the linker, so the shared object there
@@ -687,7 +689,7 @@ BuildRequires: lld
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.16-rc5-1-gfce15c45d3fbd9f.tar.xz
+Source0: linux-%{tarfile_release}.tar.xz
Source1: Makefile.rhelver
@@ -1352,7 +1354,7 @@ ApplyPatch()
exit 1
fi
if ! grep -E "^Patch[0-9]+: $patch\$" %{_specdir}/${RPM_PACKAGE_NAME}.spec ;
then
- if [ "${patch:0:8}" != "patch-5." ] ; then
+ if [ "${patch:0:8}" != "patch-%{kversion}." ] ; then
echo "ERROR: Patch $patch not listed as a source patch in specfile"
exit 1
fi
@@ -1379,8 +1381,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.16-rc5-1-gfce15c45d3fbd9f -c
-mv linux-5.16-rc5-1-gfce15c45d3fbd9f linux-%{KVERREL}
+%setup -q -n kernel-%{tarfile_release} -c
+mv linux-%{tarfile_release} linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
diff --git a/redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec
b/redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec
+++ b/redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec
@@ -3,13 +3,6 @@
# environment changes that affect %%install need to go
# here before the %%install macro is pre-built.
-# Include Fedora files
-%global include_fedora 1
-# Include RHEL files
-%global include_rhel 1
-# Provide Patchlist.changelog file
-%global patchlist_changelog 1
-
# Disable LTO in userspace packages.
%global _lto_cflags %{nil}
@@ -72,21 +65,6 @@
%endif
Summary: The Linux kernel
-
-# Set released_kernel to 1 when the upstream source tarball contains a
-# kernel release. (This includes prepatch or "rc" releases.)
-# Set released_kernel to 0 when the upstream source tarball contains an
-# unreleased kernel development snapshot.
-%global released_kernel 0
-
-# Set debugbuildsenabled to 1 to build separate base and debug kernels
-# (on supported architectures). The kernel-debug-* subpackages will
-# contain the debug kernel.
-# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
-# to build the base kernel using the debug configuration. (Specifying
-# the --with-release option overrides this setting.)
-%define debugbuildsenabled 0
-
%if 0%{?fedora}
%define secure_boot_arch x86_64
%else
@@ -115,25 +93,49 @@ Summary: The Linux kernel
# for parallel xz processes, replace with 1 to go back to single process
%endif
-%define buildid .test
-
-
%if 0%{?fedora}
%define primary_target fedora
%else
%define primary_target rhel
%endif
+#
+# genspec.sh variables
+#
+
+# Include Fedora files
+%global include_fedora 1
+# Include RHEL files
+%global include_rhel 1
+# Provide Patchlist.changelog file
+%global patchlist_changelog 1
+# Set released_kernel to 1 when the upstream source tarball contains a
+# kernel release. (This includes prepatch or "rc" releases.)
+# Set released_kernel to 0 when the upstream source tarball contains an
+# unreleased kernel development snapshot.
+%global released_kernel 0
+# Set debugbuildsenabled to 1 to build separate base and debug kernels
+# (on supported architectures). The kernel-debug-* subpackages will
+# contain the debug kernel.
+# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
+# to build the base kernel using the debug configuration. (Specifying
+# the --with-release option overrides this setting.)
+%define debugbuildsenabled 0
+%define buildid .test
%define specversion 5.16.0
%define patchversion 5.16
%define pkgrelease 0.rc5.fce15c45d3fbd9f.6.test
-
+%define kversion 5
+%define tarfile_release 5.16-rc5-1-gfce15c45d3fbd9f
# This is needed to do merge window version magic
%define patchlevel 16
-
# allow pkg_release to have configurable %%{?dist} tag
%define specrelease 0.rc5.fce15c45d3fbd9f.6%{?buildid}%{?dist}
+#
+# End of genspec.sh variables
+#
+
%define pkg_release %{specrelease}
# libexec dir is not used by the linker, so the shared object there
@@ -687,7 +689,7 @@ BuildRequires: lld
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.16-rc5-1-gfce15c45d3fbd9f.tar.xz
+Source0: linux-%{tarfile_release}.tar.xz
Source1: Makefile.rhelver
@@ -1352,7 +1354,7 @@ ApplyPatch()
exit 1
fi
if ! grep -E "^Patch[0-9]+: $patch\$" %{_specdir}/${RPM_PACKAGE_NAME}.spec ;
then
- if [ "${patch:0:8}" != "patch-5." ] ; then
+ if [ "${patch:0:8}" != "patch-%{kversion}." ] ; then
echo "ERROR: Patch $patch not listed as a source patch in specfile"
exit 1
fi
@@ -1379,8 +1381,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.16-rc5-1-gfce15c45d3fbd9f -c
-mv linux-5.16-rc5-1-gfce15c45d3fbd9f linux-%{KVERREL}
+%setup -q -n kernel-%{tarfile_release} -c
+mv linux-%{tarfile_release} linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
diff --git a/redhat/self-test/data/rhel-2585cf9dfaad.el7.spec
b/redhat/self-test/data/rhel-2585cf9dfaad.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/rhel-2585cf9dfaad.el7.spec
+++ b/redhat/self-test/data/rhel-2585cf9dfaad.el7.spec
@@ -3,13 +3,6 @@
# environment changes that affect %%install need to go
# here before the %%install macro is pre-built.
-# Include Fedora files
-%global include_fedora 1
-# Include RHEL files
-%global include_rhel 1
-# Provide Patchlist.changelog file
-%global patchlist_changelog 1
-
# Disable LTO in userspace packages.
%global _lto_cflags %{nil}
@@ -72,21 +65,6 @@
%endif
Summary: The Linux kernel
-
-# Set released_kernel to 1 when the upstream source tarball contains a
-# kernel release. (This includes prepatch or "rc" releases.)
-# Set released_kernel to 0 when the upstream source tarball contains an
-# unreleased kernel development snapshot.
-%global released_kernel 0
-
-# Set debugbuildsenabled to 1 to build separate base and debug kernels
-# (on supported architectures). The kernel-debug-* subpackages will
-# contain the debug kernel.
-# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
-# to build the base kernel using the debug configuration. (Specifying
-# the --with-release option overrides this setting.)
-%define debugbuildsenabled 1
-
%if 0%{?fedora}
%define secure_boot_arch x86_64
%else
@@ -115,25 +93,49 @@ Summary: The Linux kernel
# for parallel xz processes, replace with 1 to go back to single process
%endif
-%define buildid .test
-
-
%if 0%{?fedora}
%define primary_target fedora
%else
%define primary_target rhel
%endif
+#
+# genspec.sh variables
+#
+
+# Include Fedora files
+%global include_fedora 1
+# Include RHEL files
+%global include_rhel 1
+# Provide Patchlist.changelog file
+%global patchlist_changelog 1
+# Set released_kernel to 1 when the upstream source tarball contains a
+# kernel release. (This includes prepatch or "rc" releases.)
+# Set released_kernel to 0 when the upstream source tarball contains an
+# unreleased kernel development snapshot.
+%global released_kernel 0
+# Set debugbuildsenabled to 1 to build separate base and debug kernels
+# (on supported architectures). The kernel-debug-* subpackages will
+# contain the debug kernel.
+# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
+# to build the base kernel using the debug configuration. (Specifying
+# the --with-release option overrides this setting.)
+%define debugbuildsenabled 1
+%define buildid .test
%define specversion 5.16.0
%define patchversion 5.16
%define pkgrelease 0.rc5.6.test
-
+%define kversion 5
+%define tarfile_release 5.16.0-0.rc5.6.test
# This is needed to do merge window version magic
%define patchlevel 16
-
# allow pkg_release to have configurable %%{?dist} tag
%define specrelease 0.rc5.6%{?buildid}%{?dist}
+#
+# End of genspec.sh variables
+#
+
%define pkg_release %{specrelease}
# libexec dir is not used by the linker, so the shared object there
@@ -687,7 +689,7 @@ BuildRequires: lld
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.16.0-0.rc5.6.test.tar.xz
+Source0: linux-%{tarfile_release}.tar.xz
Source1: Makefile.rhelver
@@ -1352,7 +1354,7 @@ ApplyPatch()
exit 1
fi
if ! grep -E "^Patch[0-9]+: $patch\$" %{_specdir}/${RPM_PACKAGE_NAME}.spec ;
then
- if [ "${patch:0:8}" != "patch-5." ] ; then
+ if [ "${patch:0:8}" != "patch-%{kversion}." ] ; then
echo "ERROR: Patch $patch not listed as a source patch in specfile"
exit 1
fi
@@ -1379,8 +1381,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.16.0-0.rc5.6.test -c
-mv linux-5.16.0-0.rc5.6.test linux-%{KVERREL}
+%setup -q -n kernel-%{tarfile_release} -c
+mv linux-%{tarfile_release} linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
diff --git a/redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec
b/redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec
+++ b/redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec
@@ -3,13 +3,6 @@
# environment changes that affect %%install need to go
# here before the %%install macro is pre-built.
-# Include Fedora files
-%global include_fedora 1
-# Include RHEL files
-%global include_rhel 1
-# Provide Patchlist.changelog file
-%global patchlist_changelog 1
-
# Disable LTO in userspace packages.
%global _lto_cflags %{nil}
@@ -72,21 +65,6 @@
%endif
Summary: The Linux kernel
-
-# Set released_kernel to 1 when the upstream source tarball contains a
-# kernel release. (This includes prepatch or "rc" releases.)
-# Set released_kernel to 0 when the upstream source tarball contains an
-# unreleased kernel development snapshot.
-%global released_kernel 0
-
-# Set debugbuildsenabled to 1 to build separate base and debug kernels
-# (on supported architectures). The kernel-debug-* subpackages will
-# contain the debug kernel.
-# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
-# to build the base kernel using the debug configuration. (Specifying
-# the --with-release option overrides this setting.)
-%define debugbuildsenabled 1
-
%if 0%{?fedora}
%define secure_boot_arch x86_64
%else
@@ -115,25 +93,49 @@ Summary: The Linux kernel
# for parallel xz processes, replace with 1 to go back to single process
%endif
-%define buildid .test
-
-
%if 0%{?fedora}
%define primary_target fedora
%else
%define primary_target rhel
%endif
+#
+# genspec.sh variables
+#
+
+# Include Fedora files
+%global include_fedora 1
+# Include RHEL files
+%global include_rhel 1
+# Provide Patchlist.changelog file
+%global patchlist_changelog 1
+# Set released_kernel to 1 when the upstream source tarball contains a
+# kernel release. (This includes prepatch or "rc" releases.)
+# Set released_kernel to 0 when the upstream source tarball contains an
+# unreleased kernel development snapshot.
+%global released_kernel 0
+# Set debugbuildsenabled to 1 to build separate base and debug kernels
+# (on supported architectures). The kernel-debug-* subpackages will
+# contain the debug kernel.
+# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
+# to build the base kernel using the debug configuration. (Specifying
+# the --with-release option overrides this setting.)
+%define debugbuildsenabled 1
+%define buildid .test
%define specversion 5.16.0
%define patchversion 5.16
%define pkgrelease 0.rc5.6.test
-
+%define kversion 5
+%define tarfile_release 5.16.0-0.rc5.6.test
# This is needed to do merge window version magic
%define patchlevel 16
-
# allow pkg_release to have configurable %%{?dist} tag
%define specrelease 0.rc5.6%{?buildid}%{?dist}
+#
+# End of genspec.sh variables
+#
+
%define pkg_release %{specrelease}
# libexec dir is not used by the linker, so the shared object there
@@ -687,7 +689,7 @@ BuildRequires: lld
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.16.0-0.rc5.6.test.tar.xz
+Source0: linux-%{tarfile_release}.tar.xz
Source1: Makefile.rhelver
@@ -1352,7 +1354,7 @@ ApplyPatch()
exit 1
fi
if ! grep -E "^Patch[0-9]+: $patch\$" %{_specdir}/${RPM_PACKAGE_NAME}.spec ;
then
- if [ "${patch:0:8}" != "patch-5." ] ; then
+ if [ "${patch:0:8}" != "patch-%{kversion}." ] ; then
echo "ERROR: Patch $patch not listed as a source patch in specfile"
exit 1
fi
@@ -1379,8 +1381,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.16.0-0.rc5.6.test -c
-mv linux-5.16.0-0.rc5.6.test linux-%{KVERREL}
+%setup -q -n kernel-%{tarfile_release} -c
+mv linux-%{tarfile_release} linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
diff --git a/redhat/self-test/data/rhel-78e36f3b0dae.el7.spec
b/redhat/self-test/data/rhel-78e36f3b0dae.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/rhel-78e36f3b0dae.el7.spec
+++ b/redhat/self-test/data/rhel-78e36f3b0dae.el7.spec
@@ -3,13 +3,6 @@
# environment changes that affect %%install need to go
# here before the %%install macro is pre-built.
-# Include Fedora files
-%global include_fedora 1
-# Include RHEL files
-%global include_rhel 1
-# Provide Patchlist.changelog file
-%global patchlist_changelog 1
-
# Disable LTO in userspace packages.
%global _lto_cflags %{nil}
@@ -72,21 +65,6 @@
%endif
Summary: The Linux kernel
-
-# Set released_kernel to 1 when the upstream source tarball contains a
-# kernel release. (This includes prepatch or "rc" releases.)
-# Set released_kernel to 0 when the upstream source tarball contains an
-# unreleased kernel development snapshot.
-%global released_kernel 0
-
-# Set debugbuildsenabled to 1 to build separate base and debug kernels
-# (on supported architectures). The kernel-debug-* subpackages will
-# contain the debug kernel.
-# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
-# to build the base kernel using the debug configuration. (Specifying
-# the --with-release option overrides this setting.)
-%define debugbuildsenabled 0
-
%if 0%{?fedora}
%define secure_boot_arch x86_64
%else
@@ -115,25 +93,49 @@ Summary: The Linux kernel
# for parallel xz processes, replace with 1 to go back to single process
%endif
-%define buildid .test
-
-
%if 0%{?fedora}
%define primary_target fedora
%else
%define primary_target rhel
%endif
+#
+# genspec.sh variables
+#
+
+# Include Fedora files
+%global include_fedora 1
+# Include RHEL files
+%global include_rhel 1
+# Provide Patchlist.changelog file
+%global patchlist_changelog 1
+# Set released_kernel to 1 when the upstream source tarball contains a
+# kernel release. (This includes prepatch or "rc" releases.)
+# Set released_kernel to 0 when the upstream source tarball contains an
+# unreleased kernel development snapshot.
+%global released_kernel 0
+# Set debugbuildsenabled to 1 to build separate base and debug kernels
+# (on supported architectures). The kernel-debug-* subpackages will
+# contain the debug kernel.
+# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
+# to build the base kernel using the debug configuration. (Specifying
+# the --with-release option overrides this setting.)
+%define debugbuildsenabled 0
+%define buildid .test
%define specversion 5.17.0
%define patchversion 5.17
%define pkgrelease 0.rc0.78e36f3b0dae586.6.test
-
+%define kversion 5
+%define tarfile_release 5.17.0-0.rc0.78e36f3b0dae586.6.test
# This is needed to do merge window version magic
%define patchlevel 17
-
# allow pkg_release to have configurable %%{?dist} tag
%define specrelease 0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist}
+#
+# End of genspec.sh variables
+#
+
%define pkg_release %{specrelease}
# libexec dir is not used by the linker, so the shared object there
@@ -687,7 +689,7 @@ BuildRequires: lld
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.xz
+Source0: linux-%{tarfile_release}.tar.xz
Source1: Makefile.rhelver
@@ -1352,7 +1354,7 @@ ApplyPatch()
exit 1
fi
if ! grep -E "^Patch[0-9]+: $patch\$" %{_specdir}/${RPM_PACKAGE_NAME}.spec ;
then
- if [ "${patch:0:8}" != "patch-5." ] ; then
+ if [ "${patch:0:8}" != "patch-%{kversion}." ] ; then
echo "ERROR: Patch $patch not listed as a source patch in specfile"
exit 1
fi
@@ -1379,8 +1381,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.17.0-0.rc0.78e36f3b0dae586.6.test -c
-mv linux-5.17.0-0.rc0.78e36f3b0dae586.6.test linux-%{KVERREL}
+%setup -q -n kernel-%{tarfile_release} -c
+mv linux-%{tarfile_release} linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1757
6:28 p.m.
New subject: [OS-BUILD PATCH 10/17] redhat/genspec.sh: Remove SPECBUILDID
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/genspec.sh: Remove SPECBUILDID
The buildid variable isn't used in the spec file. The variable
declaration and the SPECBUILDID variable can be safely removed.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/genspec.sh b/redhat/genspec.sh
index blahblah..blahblah 100755
--- a/redhat/genspec.sh
+++ b/redhat/genspec.sh
@@ -23,12 +23,6 @@ else
SPECDEBUG_BUILDS_ENABLED=0
fi
-if [ -n "$BUILDID" ]; then
- SPECBUILDID=$(printf "%%define buildid %s" "$BUILDID")
-else
- SPECBUILDID="# define buildid .local"
-fi
-
EXCLUDE_FILES=":(exclude,top).get_maintainer.conf \
:(exclude,top).gitattributes \
:(exclude,top).gitignore \
@@ -61,7 +55,6 @@
SPECRELEASE="${PREBUILD}""${BUILD}""%{?buildid}%{?dist}"
# self-test begin
test -f "$SOURCES/$SPECFILE" &&
sed -i -e "
- s/%%SPECBUILDID%%/$SPECBUILDID/
s/%%SPECKVERSION%%/$SPECKVERSION/
s/%%SPECKPATCHLEVEL%%/$SPECKPATCHLEVEL/
s/%%SPECBUILD%%/$SPECBUILD/
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
@@ -121,7 +121,6 @@ Summary: The Linux kernel
# to build the base kernel using the debug configuration. (Specifying
# the --with-release option overrides this setting.)
%define debugbuildsenabled %%SPECDEBUG_BUILDS_ENABLED%%
-%%SPECBUILDID%%
%define specversion %%SPECVERSION%%
%define patchversion %%SPECKVERSION%%.%%SPECKPATCHLEVEL%%
%define pkgrelease %%SPECBUILD%%
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
b/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
+++ b/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
@@ -121,7 +121,6 @@ Summary: The Linux kernel
# to build the base kernel using the debug configuration. (Specifying
# the --with-release option overrides this setting.)
%define debugbuildsenabled 1
-%define buildid .test
%define specversion 5.16.0
%define patchversion 5.16
%define pkgrelease 0.rc5.6.test
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
b/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
+++ b/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
@@ -121,7 +121,6 @@ Summary: The Linux kernel
# to build the base kernel using the debug configuration. (Specifying
# the --with-release option overrides this setting.)
%define debugbuildsenabled 1
-%define buildid .test
%define specversion 5.16.0
%define patchversion 5.16
%define pkgrelease 0.rc5.6.test
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
b/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
+++ b/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
@@ -121,7 +121,6 @@ Summary: The Linux kernel
# to build the base kernel using the debug configuration. (Specifying
# the --with-release option overrides this setting.)
%define debugbuildsenabled 0
-%define buildid .test
%define specversion 5.17.0
%define patchversion 5.17
%define pkgrelease 0.rc0.78e36f3b0dae586.6.test
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
b/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
+++ b/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
@@ -121,7 +121,6 @@ Summary: The Linux kernel
# to build the base kernel using the debug configuration. (Specifying
# the --with-release option overrides this setting.)
%define debugbuildsenabled 0
-%define buildid .test
%define specversion 5.17.0
%define patchversion 5.17
%define pkgrelease 0.rc0.78e36f3b0dae586.6.test
diff --git a/redhat/self-test/data/centos-df0cc57e057f.el7.spec
b/redhat/self-test/data/centos-df0cc57e057f.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-df0cc57e057f.el7.spec
+++ b/redhat/self-test/data/centos-df0cc57e057f.el7.spec
@@ -121,7 +121,6 @@ Summary: The Linux kernel
# to build the base kernel using the debug configuration. (Specifying
# the --with-release option overrides this setting.)
%define debugbuildsenabled 1
-%define buildid .test
%define specversion 5.16.0
%define patchversion 5.16
%define pkgrelease 6.test
diff --git a/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
b/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
+++ b/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
@@ -121,7 +121,6 @@ Summary: The Linux kernel
# to build the base kernel using the debug configuration. (Specifying
# the --with-release option overrides this setting.)
%define debugbuildsenabled 1
-%define buildid .test
%define specversion 5.16.0
%define patchversion 5.16
%define pkgrelease 6.test
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
b/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
+++ b/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
@@ -121,7 +121,6 @@ Summary: The Linux kernel
# to build the base kernel using the debug configuration. (Specifying
# the --with-release option overrides this setting.)
%define debugbuildsenabled 0
-%define buildid .test
%define specversion 5.16.0
%define patchversion 5.16
%define pkgrelease 0.rc5.fce15c45d3fbd9f.6.test
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
b/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
+++ b/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
@@ -121,7 +121,6 @@ Summary: The Linux kernel
# to build the base kernel using the debug configuration. (Specifying
# the --with-release option overrides this setting.)
%define debugbuildsenabled 0
-%define buildid .test
%define specversion 5.16.0
%define patchversion 5.16
%define pkgrelease 0.rc5.fce15c45d3fbd9f.6.test
diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
b/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
+++ b/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
@@ -121,7 +121,6 @@ Summary: The Linux kernel
# to build the base kernel using the debug configuration. (Specifying
# the --with-release option overrides this setting.)
%define debugbuildsenabled 1
-%define buildid .test
%define specversion 5.16.0
%define patchversion 5.16
%define pkgrelease 0.rc5.6.test
diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec
b/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec
+++ b/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec
@@ -121,7 +121,6 @@ Summary: The Linux kernel
# to build the base kernel using the debug configuration. (Specifying
# the --with-release option overrides this setting.)
%define debugbuildsenabled 1
-%define buildid .test
%define specversion 5.16.0
%define patchversion 5.16
%define pkgrelease 0.rc5.6.test
diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
b/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
+++ b/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
@@ -121,7 +121,6 @@ Summary: The Linux kernel
# to build the base kernel using the debug configuration. (Specifying
# the --with-release option overrides this setting.)
%define debugbuildsenabled 0
-%define buildid .test
%define specversion 5.17.0
%define patchversion 5.17
%define pkgrelease 0.rc0.78e36f3b0dae586.6.test
diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
b/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
+++ b/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
@@ -121,7 +121,6 @@ Summary: The Linux kernel
# to build the base kernel using the debug configuration. (Specifying
# the --with-release option overrides this setting.)
%define debugbuildsenabled 0
-%define buildid .test
%define specversion 5.17.0
%define patchversion 5.17
%define pkgrelease 0.rc0.78e36f3b0dae586.6.test
diff --git a/redhat/self-test/data/fedora-df0cc57e057f.el7.spec
b/redhat/self-test/data/fedora-df0cc57e057f.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-df0cc57e057f.el7.spec
+++ b/redhat/self-test/data/fedora-df0cc57e057f.el7.spec
@@ -121,7 +121,6 @@ Summary: The Linux kernel
# to build the base kernel using the debug configuration. (Specifying
# the --with-release option overrides this setting.)
%define debugbuildsenabled 1
-%define buildid .test
%define specversion 5.16.0
%define patchversion 5.16
%define pkgrelease 6.test
diff --git a/redhat/self-test/data/fedora-df0cc57e057f.fc25.spec
b/redhat/self-test/data/fedora-df0cc57e057f.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-df0cc57e057f.fc25.spec
+++ b/redhat/self-test/data/fedora-df0cc57e057f.fc25.spec
@@ -121,7 +121,6 @@ Summary: The Linux kernel
# to build the base kernel using the debug configuration. (Specifying
# the --with-release option overrides this setting.)
%define debugbuildsenabled 1
-%define buildid .test
%define specversion 5.16.0
%define patchversion 5.16
%define pkgrelease 6.test
diff --git a/redhat/self-test/data/fedora-fce15c45d3fb.el7.spec
b/redhat/self-test/data/fedora-fce15c45d3fb.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-fce15c45d3fb.el7.spec
+++ b/redhat/self-test/data/fedora-fce15c45d3fb.el7.spec
@@ -121,7 +121,6 @@ Summary: The Linux kernel
# to build the base kernel using the debug configuration. (Specifying
# the --with-release option overrides this setting.)
%define debugbuildsenabled 0
-%define buildid .test
%define specversion 5.16.0
%define patchversion 5.16
%define pkgrelease 0.rc5.fce15c45d3fbd9f.6.test
diff --git a/redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec
b/redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec
+++ b/redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec
@@ -121,7 +121,6 @@ Summary: The Linux kernel
# to build the base kernel using the debug configuration. (Specifying
# the --with-release option overrides this setting.)
%define debugbuildsenabled 0
-%define buildid .test
%define specversion 5.16.0
%define patchversion 5.16
%define pkgrelease 0.rc5.fce15c45d3fbd9f.6.test
diff --git a/redhat/self-test/data/rhel-2585cf9dfaad.el7.spec
b/redhat/self-test/data/rhel-2585cf9dfaad.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/rhel-2585cf9dfaad.el7.spec
+++ b/redhat/self-test/data/rhel-2585cf9dfaad.el7.spec
@@ -121,7 +121,6 @@ Summary: The Linux kernel
# to build the base kernel using the debug configuration. (Specifying
# the --with-release option overrides this setting.)
%define debugbuildsenabled 1
-%define buildid .test
%define specversion 5.16.0
%define patchversion 5.16
%define pkgrelease 0.rc5.6.test
diff --git a/redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec
b/redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec
+++ b/redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec
@@ -121,7 +121,6 @@ Summary: The Linux kernel
# to build the base kernel using the debug configuration. (Specifying
# the --with-release option overrides this setting.)
%define debugbuildsenabled 1
-%define buildid .test
%define specversion 5.16.0
%define patchversion 5.16
%define pkgrelease 0.rc5.6.test
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1757
6:28 p.m.
New subject: [OS-BUILD PATCH 11/17] redhat/Makefile: Rename __YSTREAM and
__ZSTREAM
From: Prarit Bhargava <prarit(a)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 <prarit(a)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
6:28 p.m.
New subject: [OS-BUILD PATCH 12/17] redhat/scripts/new_release.sh: Use Makefile
variables
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/scripts/new_release.sh: Use Makefile variables
Use Makefile variables in new_release.sh.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -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_FLAG) $(ZSTREAM_FLAG)
$(BUMP_RELEASE); \
+ $(REDHAT)/scripts/new_release.sh; \
$(MAKE) dist-release-finish; \
fi
diff --git a/redhat/scripts/new_release.sh b/redhat/scripts/new_release.sh
index blahblah..blahblah 100755
--- a/redhat/scripts/new_release.sh
+++ b/redhat/scripts/new_release.sh
@@ -1,20 +1,10 @@
#!/bin/bash
-if [[ -z $1 || -z $2 ]]; then
- echo "$(basename "$0") <redhat path> <zstream?
no/yes/branch>" >&2;
- exit 1;
-fi
-
-RHPATH="$1";
-YSTREAM_FLAG="$2";
-ZSTREAM_FLAG="$3";
-BUMP_RELEASE="$4";
-
-if [ -s "$RHPATH/linux-kernel-test.patch" ]; then
+if [ -s "$REDHAT/linux-kernel-test.patch" ]; then
echo "linux-kernel-test.patch is not empty, aborting" >&2;
exit 1;
fi
-RELEASE=$(sed -n -e 's/^RHEL_RELEASE\ =\ \(.*\)/\1/p'
"$RHPATH"/../Makefile.rhelver)
+RELEASE=$(sed -n -e 's/^RHEL_RELEASE\ =\ \(.*\)/\1/p'
"$REDHAT"/../Makefile.rhelver)
YVER=$(echo "$RELEASE" | cut -d "." -f 1)
YVER=${YVER:="$RELEASE"}
@@ -29,15 +19,15 @@ elif [ "$ZSTREAM_FLAG" == "no" ]; then
if [ "$YSTREAM_FLAG" == "yes" ]; then
NEW_RELEASE="$((RELEASE + 1))";
else
- EARLY_YBUILD=$(sed -n -e 's/^EARLY_YBUILD:=\(.*\)/\1/p'
"$RHPATH"/../Makefile.rhelver);
- EARLY_YRELEASE=$(sed -n -e 's/^EARLY_YRELEASE:=\(.*\)/\1/p'
"$RHPATH"/../Makefile.rhelver);
+ EARLY_YBUILD=$(sed -n -e 's/^EARLY_YBUILD:=\(.*\)/\1/p'
"$REDHAT"/../Makefile.rhelver);
+ EARLY_YRELEASE=$(sed -n -e 's/^EARLY_YRELEASE:=\(.*\)/\1/p'
"$REDHAT"/../Makefile.rhelver);
if [ "$EARLY_YBUILD" != "$RELEASE" ]; then
NEW_EARLY_YRELEASE=1;
else
NEW_EARLY_YRELEASE="$((EARLY_YRELEASE + 1))";
fi
- sed -i -e "s/^EARLY_YBUILD:=$EARLY_YBUILD/EARLY_YBUILD:=$RELEASE/"
"$RHPATH"/../Makefile.rhelver;
- sed -i -e
"s/^EARLY_YRELEASE:=$EARLY_YRELEASE/EARLY_YRELEASE:=$NEW_EARLY_YRELEASE/"
"$RHPATH"/../Makefile.rhelver;
+ sed -i -e "s/^EARLY_YBUILD:=$EARLY_YBUILD/EARLY_YBUILD:=$RELEASE/"
"$REDHAT"/../Makefile.rhelver;
+ sed -i -e
"s/^EARLY_YRELEASE:=$EARLY_YRELEASE/EARLY_YRELEASE:=$NEW_EARLY_YRELEASE/"
"$REDHAT"/../Makefile.rhelver;
NEW_RELEASE=$RELEASE;
fi
elif [ "$ZSTREAM_FLAG" == "yes" ]; then
@@ -49,5 +39,5 @@ else
exit 1;
fi
-sed -i -e "s/RHEL_RELEASE\ =.*/RHEL_RELEASE\ =\ $NEW_RELEASE/"
"$RHPATH"/../Makefile.rhelver;
+sed -i -e "s/RHEL_RELEASE\ =.*/RHEL_RELEASE\ =\ $NEW_RELEASE/"
"$REDHAT"/../Makefile.rhelver;
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1757
6:28 p.m.
New subject: [OS-BUILD PATCH 13/17] redhat/Makefile: Reorganize MARKER code
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/Makefile: Reorganize MARKER code
Reorganize the MARKER code. MARKER is always UPSTREAM_TARBALL_NAME
prefixed with a 'v'.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -143,22 +143,22 @@ ifeq ("$(origin O)", "command line")
endif
# MARKER is the git tag which we base off of for exporting patches
-# Make sure MARKER uses SPECKVERSION, SPECKPATCHLEVEL and SPECKEXTRAVERSION
-# from makefile as opposed to any adjusted version for snapshotting.
+# Make sure MARKER uses SPECKPATCHLEVEL and SPECKEXTRAVERSION from the kernel
+# makefile as opposed to any adjusted version for snapshotting.
ifneq ($(SPECKEXTRAVERSION),)
- MARKER:=v$(SPECKVERSION).$(SPECKPATCHLEVEL)$(SPECKEXTRAVERSION)
PREBUILD:=0$(shell echo $(SPECKEXTRAVERSION) | sed -e s/-/./).
UPSTREAM_TARBALL_NAME:=$(SPECKVERSION).$(SPECKPATCHLEVEL)$(SPECKEXTRAVERSION)
+ MARKER=v$(UPSTREAM_TARBALL_NAME)
else
ifeq ($(SPECKSUBLEVEL),0)
- MARKER:=v$(SPECKVERSION).$(SPECKPATCHLEVEL)
UPSTREAM_TARBALL_NAME:=$(SPECKVERSION).$(SPECKPATCHLEVEL)
+ MARKER=v$(UPSTREAM_TARBALL_NAME)
else
# Make sure MARKER uses SPECKVERSION, SPECKPATCHLEVEL, and SPECKSUBLEVEL
# from the kernel makefile as opposed to any adjusted version for snapshotting.
# IOW, these variables are *NOT* equivalent to the SPECVERSION variable.
- MARKER:=v$(SPECKVERSION).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL)
UPSTREAM_TARBALL_NAME:=$(SPECKVERSION).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL)
+ MARKER=v$(UPSTREAM_TARBALL_NAME)
endif
PREBUILD:=
endif
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1757
6:28 p.m.
New subject: [OS-BUILD PATCH 14/17] redhat/Makefile: Fix dist-brew & distg-brew
targets
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/Makefile: Fix dist-brew & distg-brew targets
The dist-brew and distg-brew targets always require some variable
manipulation on the command line. Hardcode DIST, DISTRO, and
SCRATCH_TARGET to always create a "RHEL9" brew build.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -656,9 +656,11 @@ dist-vr-check:
exit 1; \
fi
+dist-brew: DIST=.el9 DISTRO=rhel BUILD_TARGET="-scratch
rhel-$(RHEL_MAJOR).1.0-test-pesign"
dist-brew dist-koji: dist-%: dist-vr-check dist-srpm
$* $(BUILD_PROFILE) build $(BUILD_FLAGS) $(BUILD_TARGET)
$(SRPMS)/$(RELEASETAG)$(DIST).src.rpm $(OUTPUT_FILE)
+distg-brew: DIST=.el9 DISTRO=rhel BUILD_TARGET="-scratch
rhel-$(RHEL_MAJOR).1.0-test-pesign"
distg-brew distg-koji: distg-%: dist-vr-check
$* $(BUILD_PROFILE) build $(BUILD_FLAGS) $(BUILD_TARGET)
"$(RHGITURL)?redhat/koji#$(RHGITCOMMIT)"
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1757
6:28 p.m.
New subject: [OS-BUILD PATCH 15/17] redhat/Makefile: Rename BUILDID to
LOCALVERSION
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/Makefile: Rename BUILDID to LOCALVERSION
BUILDID isn't a very descriptive name. Rename the variable to
LOCALVERSION.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -116,13 +116,13 @@ endif
LOCVERFILE:=../localversion
# create an empty localversion file if you don't want a local buildid
ifneq ($(wildcard $(LOCVERFILE)),)
- BUILDID:=$(shell cat $(LOCVERFILE))
- $(info BUILDID is "$(BUILDID)". Update '$(shell dirname
$(REDHAT))/localversion' to change.)
+ LOCALVERSION:=$(shell cat $(LOCVERFILE))
+ $(info LOCALVERSION is "$(LOCALVERSION)". Update '$(shell dirname
$(REDHAT))/localversion' to change.)
else
- ifeq ($(BUILDID),)
- BUILDID:=.test
+ ifeq ($(LOCALVERSION),)
+ LOCALVERSION:=.test
endif
- $(info BUILDID is "$(BUILDID)".)
+ $(info LOCALVERSION is "$(LOCALVERSION)".)
endif
# options for process_configs.sh script
@@ -220,7 +220,7 @@ endif
# The NVR looks like, for example, kernel-5.17.0-0.rc8.551acdc3c3d2.124.test.fc35.
# This string can be deconstructed as
#
-#
$(PACKAGE_NAME)-$(SPECKVERSION).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL)-$(PREBUILD)$(BUILD)$(BUILDID)$(DIST)
+#
$(PACKAGE_NAME)-$(SPECKVERSION).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL)-$(PREBUILD)$(BUILD)$(LOCALVERSION)$(DIST)
#
# This can be evaluated as
#
@@ -229,7 +229,7 @@ endif
# $(PACKAGE_NAME)-$(BASEVERSION)
$(DIST)
# $(RELEASETAG)
$(DIST)
#
-SPECBUILD:=$(PREBUILD)$(BUILD)$(BUILDID)
+SPECBUILD:=$(PREBUILD)$(BUILD)$(LOCALVERSION)
SPECVERSION:=$(SPECKVERSION).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL)
BASEVERSION:=$(SPECVERSION)-$(SPECBUILD)
RELEASETAG=$(PACKAGE_NAME)-$(BASEVERSION)
@@ -573,7 +573,7 @@ dist-all-rpms: dist-sources do-rpmbuild
dist-srpm: RPMBUILDOPTS=--nodeps -bs
dist-srpm: dist-sources do-rpmbuild
-dist-srpm-gcov: BUILDID=".gcov"
+dist-srpm-gcov: LOCALVERSION=".gcov"
dist-srpm-gcov: BUILDOPTS+="+gcov"
dist-srpm-gcov: dist-srpm
@@ -652,7 +652,7 @@ dist-vr-check:
@# version-release string with max 64 chars. The version-release for s390x+zfcpdump
@# is 29 characters, leaving a maximum of 35 characters for SPECBUILD.
@if [ $$(echo -n $(SPECBUILD) | wc -c) -gt 35 ]; then \
- echo "SPECBUILD ($(SPECBUILD)) is too long. Use a shorter localversion (currently
$(BUILDID))"; \
+ echo "SPECBUILD ($(SPECBUILD)) is too long. Use a shorter localversion (currently
$(LOCALVERSION))"; \
exit 1; \
fi
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1757
6:28 p.m.
New subject: [OS-BUILD PATCH 16/17] redhat/Makefile: Rename PREBUILD to
UPSTREAMBUILD
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/Makefile: Rename PREBUILD to UPSTREAMBUILD
PREBUILD isn't a good name for this variable. It is the portion of the
string that references upstream build information. Rename it to
UPSTREAMBUILD.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -25,6 +25,12 @@ ifdef SINGLE_TARBALL
$(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.)
+ UPSTREAMBUILD_GIT_ONLY:=$(PREBUILD_GIT_ONLY)
+endif
+
include Makefile.variables
# These entries are 'duplicates' of variables specified in Makefile.variables
# that are used in the SPEC file. Specifying these with a SPEC prefix indicates
@@ -146,7 +152,7 @@ endif
# Make sure MARKER uses SPECKPATCHLEVEL and SPECKEXTRAVERSION from the kernel
# makefile as opposed to any adjusted version for snapshotting.
ifneq ($(SPECKEXTRAVERSION),)
- PREBUILD:=0$(shell echo $(SPECKEXTRAVERSION) | sed -e s/-/./).
+ UPSTREAMBUILD:=0$(shell echo $(SPECKEXTRAVERSION) | sed -e s/-/./).
UPSTREAM_TARBALL_NAME:=$(SPECKVERSION).$(SPECKPATCHLEVEL)$(SPECKEXTRAVERSION)
MARKER=v$(UPSTREAM_TARBALL_NAME)
else
@@ -160,7 +166,7 @@ else
UPSTREAM_TARBALL_NAME:=$(SPECKVERSION).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL)
MARKER=v$(UPSTREAM_TARBALL_NAME)
endif
- PREBUILD:=
+ UPSTREAMBUILD:=
endif
# If VERSION_ON_UPSTREAM is set, the versioning of the rpm package is based
@@ -193,22 +199,22 @@ ifeq ($(VERSION_ON_UPSTREAM),1)
# packaging. Fix this by bumping the patch level and marking
# this as rc0
ifeq ($(SPECKEXTRAVERSION),)
- PREBUILD:=0.rc0.
+ UPSTREAMBUILD:=0.rc0.
SPECKPATCHLEVEL:=$(shell expr $(SPECKPATCHLEVEL) + 1)
endif
- ifndef PREBUILD_GIT_ONLY
+ ifndef UPSTREAMBUILD_GIT_ONLY
ifneq ($(filter $(MAKECMDGOALS),dist-git-test dist-git),)
- PREBUILD_GIT_ONLY:=0
+ UPSTREAMBUILD_GIT_ONLY:=0
else
- PREBUILD_GIT_ONLY:=1
+ UPSTREAMBUILD_GIT_ONLY:=1
endif
endif
- ifeq ($(PREBUILD_GIT_ONLY),1)
- PREBUILD:=$(PREBUILD)$(MARKER).
+ ifeq ($(UPSTREAMBUILD_GIT_ONLY),1)
+ UPSTREAMBUILD:=$(UPSTREAMBUILD)$(MARKER).
else
# Obtain the date that HEAD was committed (not the snapshot commit).
HEAD_DATE:=$(shell $(GIT) show -s --format=%cd --date=format:%Y%m%d $(HEAD))
- PREBUILD:=$(PREBUILD)$(HEAD_DATE)git$(MARKER).
+ UPSTREAMBUILD:=$(UPSTREAMBUILD)$(HEAD_DATE)git$(MARKER).
endif
UPSTREAM_TARBALL_NAME:=$(patsubst v%,%,$(_TAG))
endif
@@ -220,7 +226,7 @@ endif
# The NVR looks like, for example, kernel-5.17.0-0.rc8.551acdc3c3d2.124.test.fc35.
# This string can be deconstructed as
#
-#
$(PACKAGE_NAME)-$(SPECKVERSION).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL)-$(PREBUILD)$(BUILD)$(LOCALVERSION)$(DIST)
+#
$(PACKAGE_NAME)-$(SPECKVERSION).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL)-$(UPSTREAMBUILD)$(BUILD)$(LOCALVERSION)$(DIST)
#
# This can be evaluated as
#
@@ -229,7 +235,7 @@ endif
# $(PACKAGE_NAME)-$(BASEVERSION)
$(DIST)
# $(RELEASETAG)
$(DIST)
#
-SPECBUILD:=$(PREBUILD)$(BUILD)$(LOCALVERSION)
+SPECBUILD:=$(UPSTREAMBUILD)$(BUILD)$(LOCALVERSION)
SPECVERSION:=$(SPECKVERSION).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL)
BASEVERSION:=$(SPECVERSION)-$(SPECBUILD)
RELEASETAG=$(PACKAGE_NAME)-$(BASEVERSION)
diff --git a/redhat/Makefile.variables b/redhat/Makefile.variables
index blahblah..blahblah 100644
--- a/redhat/Makefile.variables
+++ b/redhat/Makefile.variables
@@ -102,7 +102,7 @@ BUILD ?=
# failing because the UTS_RELEASE field exceeded 64 chars. This variable can
# be set to 1 to decrease the kernel UTS_RELEASE and SPECBUILD by 11 characters
# (YYYYMMDDgit).
-PREBUILD_GIT_ONLY ?=
+UPSTREAMBUILD_GIT_ONLY ?=
# This overrides the default git repository for the distg-* targets. See
# the 'make dist-full-help' entry for distg-brew for information on setting
diff --git a/redhat/genspec.sh b/redhat/genspec.sh
index blahblah..blahblah 100755
--- a/redhat/genspec.sh
+++ b/redhat/genspec.sh
@@ -50,7 +50,7 @@ if [ "$PATCHLIST_URL" != "none" ]; then
SPECPATCHLIST_CHANGELOG=1
fi
-SPECRELEASE="${PREBUILD}""${BUILD}""%{?buildid}%{?dist}"
+SPECRELEASE="${UPSTREAMBUILD}""${BUILD}""%{?buildid}%{?dist}"
# self-test begin
test -f "$SOURCES/$SPECFILE" &&
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
@@ -32,7 +32,6 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver
Makefile.rhpkg Mak
MAKEFLAGS=w -- HEAD=2585cf9dfaad DISTRO=centos DIST=.el7 RHSELFTESTDATA=1
MARKER=v5.16-rc5
MERGE_BASE=2585cf9dfaaddf00b069673f27bb3f8530e2039c
-PREBUILD=0.rc5.
PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
@@ -70,6 +69,7 @@ TARBALL=../redhat/linux-5.16.0-0.rc5.6.test.tar.xz
TARFILE=linux-5.16.0-0.rc5.6.test.tar.xz
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
+UPSTREAMBUILD=0.rc5.
UPSTREAM_TARBALL_NAME=5.16-rc5
VERSION_ON_UPSTREAM=1
YSTREAM_FLAG=yes
@@ -93,7 +93,7 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
BUILD_TARGET=--scratch temp-ark-rhel-8-test
BUILD_PROFILE=
BUILD_FLAGS=
-PREBUILD_GIT_ONLY=1
+UPSTREAMBUILD_GIT_ONLY=
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
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
@@ -32,7 +32,6 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver
Makefile.rhpkg Mak
MAKEFLAGS=w -- HEAD=2585cf9dfaad DISTRO=centos DIST=.fc25 RHSELFTESTDATA=1
MARKER=v5.16-rc5
MERGE_BASE=2585cf9dfaaddf00b069673f27bb3f8530e2039c
-PREBUILD=0.rc5.
PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
@@ -70,6 +69,7 @@ TARBALL=../redhat/linux-5.16.0-0.rc5.6.test.tar.xz
TARFILE=linux-5.16.0-0.rc5.6.test.tar.xz
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
+UPSTREAMBUILD=0.rc5.
UPSTREAM_TARBALL_NAME=5.16-rc5
VERSION_ON_UPSTREAM=1
YSTREAM_FLAG=yes
@@ -93,7 +93,7 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
BUILD_TARGET=--scratch temp-ark-rhel-8-test
BUILD_PROFILE=
BUILD_FLAGS=
-PREBUILD_GIT_ONLY=1
+UPSTREAMBUILD_GIT_ONLY=
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
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
@@ -32,7 +32,6 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver
Makefile.rhpkg Mak
MAKEFLAGS=w -- HEAD=78e36f3b0dae DISTRO=centos DIST=.el7 RHSELFTESTDATA=1
MARKER=78e36f3b0dae586
MERGE_BASE=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1
-PREBUILD=0.rc0.78e36f3b0dae586.
PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
@@ -70,6 +69,8 @@ TARBALL=../redhat/linux-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.xz
TARFILE=linux-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.xz
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
+UPSTREAMBUILD=0.rc0.78e36f3b0dae586.
+UPSTREAMBUILD_GIT_ONLY=1
UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae586
VERSION_ON_UPSTREAM=1
YSTREAM_FLAG=yes
@@ -93,7 +94,7 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
BUILD_TARGET=--scratch temp-ark-rhel-8-test
BUILD_PROFILE=
BUILD_FLAGS=
-PREBUILD_GIT_ONLY=1
+UPSTREAMBUILD_GIT_ONLY=
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
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
@@ -32,7 +32,6 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver
Makefile.rhpkg Mak
MAKEFLAGS=w -- HEAD=78e36f3b0dae DISTRO=centos DIST=.fc25 RHSELFTESTDATA=1
MARKER=78e36f3b0dae586
MERGE_BASE=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1
-PREBUILD=0.rc0.78e36f3b0dae586.
PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
@@ -70,6 +69,8 @@ TARBALL=../redhat/linux-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.xz
TARFILE=linux-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.xz
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
+UPSTREAMBUILD=0.rc0.78e36f3b0dae586.
+UPSTREAMBUILD_GIT_ONLY=1
UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae586
VERSION_ON_UPSTREAM=1
YSTREAM_FLAG=yes
@@ -93,7 +94,7 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
BUILD_TARGET=--scratch temp-ark-rhel-8-test
BUILD_PROFILE=
BUILD_FLAGS=
-PREBUILD_GIT_ONLY=1
+UPSTREAMBUILD_GIT_ONLY=
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
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
@@ -32,7 +32,6 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver
Makefile.rhpkg Mak
MAKEFLAGS=w -- HEAD=df0cc57e057f DISTRO=centos DIST=.el7 RHSELFTESTDATA=1
MARKER=v5.16
MERGE_BASE=df0cc57e057f18e44dac8e6c18aba47ab53202f9
-PREBUILD=
PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
@@ -70,6 +69,7 @@ TARBALL=../redhat/linux-5.16.0-6.test.tar.xz
TARFILE=linux-5.16.0-6.test.tar.xz
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
+UPSTREAMBUILD=
UPSTREAM_TARBALL_NAME=5.16
VERSION_ON_UPSTREAM=1
YSTREAM_FLAG=yes
@@ -93,7 +93,7 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
BUILD_TARGET=--scratch temp-ark-rhel-8-test
BUILD_PROFILE=
BUILD_FLAGS=
-PREBUILD_GIT_ONLY=1
+UPSTREAMBUILD_GIT_ONLY=
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
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
@@ -32,7 +32,6 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver
Makefile.rhpkg Mak
MAKEFLAGS=w -- HEAD=df0cc57e057f DISTRO=centos DIST=.fc25 RHSELFTESTDATA=1
MARKER=v5.16
MERGE_BASE=df0cc57e057f18e44dac8e6c18aba47ab53202f9
-PREBUILD=
PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
@@ -70,6 +69,7 @@ TARBALL=../redhat/linux-5.16.0-6.test.tar.xz
TARFILE=linux-5.16.0-6.test.tar.xz
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
+UPSTREAMBUILD=
UPSTREAM_TARBALL_NAME=5.16
VERSION_ON_UPSTREAM=1
YSTREAM_FLAG=yes
@@ -93,7 +93,7 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
BUILD_TARGET=--scratch temp-ark-rhel-8-test
BUILD_PROFILE=
BUILD_FLAGS=
-PREBUILD_GIT_ONLY=1
+UPSTREAMBUILD_GIT_ONLY=
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
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
@@ -32,7 +32,6 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver
Makefile.rhpkg Mak
MAKEFLAGS=w -- HEAD=fce15c45d3fb DISTRO=centos DIST=.el7 RHSELFTESTDATA=1
MARKER=fce15c45d3fbd9f
MERGE_BASE=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a
-PREBUILD=0.rc5.fce15c45d3fbd9f.
PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
@@ -70,6 +69,8 @@ TARBALL=../redhat/linux-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.xz
TARFILE=linux-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.xz
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
+UPSTREAMBUILD=0.rc5.fce15c45d3fbd9f.
+UPSTREAMBUILD_GIT_ONLY=1
UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fbd9f
VERSION_ON_UPSTREAM=1
YSTREAM_FLAG=yes
@@ -93,7 +94,7 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
BUILD_TARGET=--scratch temp-ark-rhel-8-test
BUILD_PROFILE=
BUILD_FLAGS=
-PREBUILD_GIT_ONLY=1
+UPSTREAMBUILD_GIT_ONLY=
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
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
@@ -32,7 +32,6 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver
Makefile.rhpkg Mak
MAKEFLAGS=w -- HEAD=fce15c45d3fb DISTRO=centos DIST=.fc25 RHSELFTESTDATA=1
MARKER=fce15c45d3fbd9f
MERGE_BASE=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a
-PREBUILD=0.rc5.fce15c45d3fbd9f.
PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
@@ -70,6 +69,8 @@ TARBALL=../redhat/linux-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.xz
TARFILE=linux-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.xz
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
+UPSTREAMBUILD=0.rc5.fce15c45d3fbd9f.
+UPSTREAMBUILD_GIT_ONLY=1
UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fbd9f
VERSION_ON_UPSTREAM=1
YSTREAM_FLAG=yes
@@ -93,7 +94,7 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
BUILD_TARGET=--scratch temp-ark-rhel-8-test
BUILD_PROFILE=
BUILD_FLAGS=
-PREBUILD_GIT_ONLY=1
+UPSTREAMBUILD_GIT_ONLY=
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
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
@@ -30,7 +30,6 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver
Makefile.rhpkg Mak
MAKEFLAGS=w -- HEAD=2585cf9dfaad DISTRO=fedora DIST=.el7 RHSELFTESTDATA=1
MARKER=v5.16-rc5
MERGE_BASE=2585cf9dfaaddf00b069673f27bb3f8530e2039c
-PREBUILD=0.rc5.
PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
@@ -68,6 +67,7 @@ TARBALL=../redhat/linux-5.16-rc5.tar.xz
TARFILE=linux-5.16-rc5.tar.xz
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
+UPSTREAMBUILD=0.rc5.
UPSTREAM_TARBALL_NAME=5.16-rc5
VERSION_ON_UPSTREAM=1
YSTREAM_FLAG=yes
@@ -91,7 +91,7 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
BUILD_TARGET=--scratch temp-ark-rhel-8-test
BUILD_PROFILE=
BUILD_FLAGS=
-PREBUILD_GIT_ONLY=1
+UPSTREAMBUILD_GIT_ONLY=
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
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
@@ -30,7 +30,6 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver
Makefile.rhpkg Mak
MAKEFLAGS=w -- HEAD=2585cf9dfaad DISTRO=fedora DIST=.fc25 RHSELFTESTDATA=1
MARKER=v5.16-rc5
MERGE_BASE=2585cf9dfaaddf00b069673f27bb3f8530e2039c
-PREBUILD=0.rc5.
PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
@@ -68,6 +67,7 @@ TARBALL=../redhat/linux-5.16-rc5.tar.xz
TARFILE=linux-5.16-rc5.tar.xz
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
+UPSTREAMBUILD=0.rc5.
UPSTREAM_TARBALL_NAME=5.16-rc5
VERSION_ON_UPSTREAM=1
YSTREAM_FLAG=yes
@@ -91,7 +91,7 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
BUILD_TARGET=--scratch temp-ark-rhel-8-test
BUILD_PROFILE=
BUILD_FLAGS=
-PREBUILD_GIT_ONLY=1
+UPSTREAMBUILD_GIT_ONLY=
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
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
@@ -30,7 +30,6 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver
Makefile.rhpkg Mak
MAKEFLAGS=w -- HEAD=78e36f3b0dae DISTRO=fedora DIST=.el7 RHSELFTESTDATA=1
MARKER=78e36f3b0dae586
MERGE_BASE=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1
-PREBUILD=0.rc0.78e36f3b0dae586.
PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
@@ -68,6 +67,8 @@ TARBALL=../redhat/linux-5.16-11523-g78e36f3b0dae586.tar.xz
TARFILE=linux-5.16-11523-g78e36f3b0dae586.tar.xz
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
+UPSTREAMBUILD=0.rc0.78e36f3b0dae586.
+UPSTREAMBUILD_GIT_ONLY=1
UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae586
VERSION_ON_UPSTREAM=1
YSTREAM_FLAG=yes
@@ -91,7 +92,7 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
BUILD_TARGET=--scratch temp-ark-rhel-8-test
BUILD_PROFILE=
BUILD_FLAGS=
-PREBUILD_GIT_ONLY=1
+UPSTREAMBUILD_GIT_ONLY=
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
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
@@ -30,7 +30,6 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver
Makefile.rhpkg Mak
MAKEFLAGS=w -- HEAD=78e36f3b0dae DISTRO=fedora DIST=.fc25 RHSELFTESTDATA=1
MARKER=78e36f3b0dae586
MERGE_BASE=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1
-PREBUILD=0.rc0.78e36f3b0dae586.
PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
@@ -68,6 +67,8 @@ TARBALL=../redhat/linux-5.16-11523-g78e36f3b0dae586.tar.xz
TARFILE=linux-5.16-11523-g78e36f3b0dae586.tar.xz
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
+UPSTREAMBUILD=0.rc0.78e36f3b0dae586.
+UPSTREAMBUILD_GIT_ONLY=1
UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae586
VERSION_ON_UPSTREAM=1
YSTREAM_FLAG=yes
@@ -91,7 +92,7 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
BUILD_TARGET=--scratch temp-ark-rhel-8-test
BUILD_PROFILE=
BUILD_FLAGS=
-PREBUILD_GIT_ONLY=1
+UPSTREAMBUILD_GIT_ONLY=
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
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
@@ -30,7 +30,6 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver
Makefile.rhpkg Mak
MAKEFLAGS=w -- HEAD=df0cc57e057f DISTRO=fedora DIST=.el7 RHSELFTESTDATA=1
MARKER=v5.16
MERGE_BASE=df0cc57e057f18e44dac8e6c18aba47ab53202f9
-PREBUILD=
PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
@@ -68,6 +67,7 @@ TARBALL=../redhat/linux-5.16.tar.xz
TARFILE=linux-5.16.tar.xz
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
+UPSTREAMBUILD=
UPSTREAM_TARBALL_NAME=5.16
VERSION_ON_UPSTREAM=1
YSTREAM_FLAG=yes
@@ -91,7 +91,7 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
BUILD_TARGET=--scratch temp-ark-rhel-8-test
BUILD_PROFILE=
BUILD_FLAGS=
-PREBUILD_GIT_ONLY=1
+UPSTREAMBUILD_GIT_ONLY=
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
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
@@ -30,7 +30,6 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver
Makefile.rhpkg Mak
MAKEFLAGS=w -- HEAD=df0cc57e057f DISTRO=fedora DIST=.fc25 RHSELFTESTDATA=1
MARKER=v5.16
MERGE_BASE=df0cc57e057f18e44dac8e6c18aba47ab53202f9
-PREBUILD=
PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
@@ -68,6 +67,7 @@ TARBALL=../redhat/linux-5.16.tar.xz
TARFILE=linux-5.16.tar.xz
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
+UPSTREAMBUILD=
UPSTREAM_TARBALL_NAME=5.16
VERSION_ON_UPSTREAM=1
YSTREAM_FLAG=yes
@@ -91,7 +91,7 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
BUILD_TARGET=--scratch temp-ark-rhel-8-test
BUILD_PROFILE=
BUILD_FLAGS=
-PREBUILD_GIT_ONLY=1
+UPSTREAMBUILD_GIT_ONLY=
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
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
@@ -30,7 +30,6 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver
Makefile.rhpkg Mak
MAKEFLAGS=w -- HEAD=fce15c45d3fb DISTRO=fedora DIST=.el7 RHSELFTESTDATA=1
MARKER=fce15c45d3fbd9f
MERGE_BASE=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a
-PREBUILD=0.rc5.fce15c45d3fbd9f.
PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
@@ -68,6 +67,8 @@ TARBALL=../redhat/linux-5.16-rc5-1-gfce15c45d3fbd9f.tar.xz
TARFILE=linux-5.16-rc5-1-gfce15c45d3fbd9f.tar.xz
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
+UPSTREAMBUILD=0.rc5.fce15c45d3fbd9f.
+UPSTREAMBUILD_GIT_ONLY=1
UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fbd9f
VERSION_ON_UPSTREAM=1
YSTREAM_FLAG=yes
@@ -91,7 +92,7 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
BUILD_TARGET=--scratch temp-ark-rhel-8-test
BUILD_PROFILE=
BUILD_FLAGS=
-PREBUILD_GIT_ONLY=1
+UPSTREAMBUILD_GIT_ONLY=
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
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
@@ -30,7 +30,6 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver
Makefile.rhpkg Mak
MAKEFLAGS=w -- HEAD=fce15c45d3fb DISTRO=fedora DIST=.fc25 RHSELFTESTDATA=1
MARKER=fce15c45d3fbd9f
MERGE_BASE=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a
-PREBUILD=0.rc5.fce15c45d3fbd9f.
PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
@@ -68,6 +67,8 @@ TARBALL=../redhat/linux-5.16-rc5-1-gfce15c45d3fbd9f.tar.xz
TARFILE=linux-5.16-rc5-1-gfce15c45d3fbd9f.tar.xz
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
+UPSTREAMBUILD=0.rc5.fce15c45d3fbd9f.
+UPSTREAMBUILD_GIT_ONLY=1
UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fbd9f
VERSION_ON_UPSTREAM=1
YSTREAM_FLAG=yes
@@ -91,7 +92,7 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
BUILD_TARGET=--scratch temp-ark-rhel-8-test
BUILD_PROFILE=
BUILD_FLAGS=
-PREBUILD_GIT_ONLY=1
+UPSTREAMBUILD_GIT_ONLY=
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
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
@@ -30,7 +30,6 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver
Makefile.rhpkg Mak
MAKEFLAGS=w -- HEAD=2585cf9dfaad DISTRO=rhel DIST=.el7 RHSELFTESTDATA=1
MARKER=v5.16-rc5
MERGE_BASE=2585cf9dfaaddf00b069673f27bb3f8530e2039c
-PREBUILD=0.rc5.
PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
@@ -68,6 +67,7 @@ TARBALL=../redhat/linux-5.16.0-0.rc5.6.test.tar.xz
TARFILE=linux-5.16.0-0.rc5.6.test.tar.xz
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
+UPSTREAMBUILD=0.rc5.
UPSTREAM_TARBALL_NAME=5.16-rc5
VERSION_ON_UPSTREAM=1
YSTREAM_FLAG=yes
@@ -91,7 +91,7 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
BUILD_TARGET=--scratch temp-ark-rhel-8-test
BUILD_PROFILE=
BUILD_FLAGS=
-PREBUILD_GIT_ONLY=1
+UPSTREAMBUILD_GIT_ONLY=
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1757
6:28 p.m.
New subject: [OS-BUILD PATCH 17/17] self-test/data/create-data.sh: Avoid
SINGLE_TARBALL
warning
From: Prarit Bhargava <prarit(a)redhat.com>
self-test/data/create-data.sh: Avoid SINGLE_TARBALL warning
'make dist-self-test-data' outputs the warning "Makefile:25: WARNING:
SINGLE_TARBALL will be deprecated in a later release."
Unset the parameter before the make calls.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
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
@@ -98,4 +98,4 @@ RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
RHSELFTESTDATA=
-SINGLE_TARBALL=0
+SINGLE_TARBALL=
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
@@ -98,4 +98,4 @@ RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
RHSELFTESTDATA=
-SINGLE_TARBALL=0
+SINGLE_TARBALL=
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
@@ -99,4 +99,4 @@ RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
RHSELFTESTDATA=
-SINGLE_TARBALL=0
+SINGLE_TARBALL=
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
@@ -99,4 +99,4 @@ RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
RHSELFTESTDATA=
-SINGLE_TARBALL=0
+SINGLE_TARBALL=
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
@@ -98,4 +98,4 @@ RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
RHSELFTESTDATA=
-SINGLE_TARBALL=0
+SINGLE_TARBALL=
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
@@ -98,4 +98,4 @@ RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
RHSELFTESTDATA=
-SINGLE_TARBALL=0
+SINGLE_TARBALL=
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
@@ -99,4 +99,4 @@ RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
RHSELFTESTDATA=
-SINGLE_TARBALL=0
+SINGLE_TARBALL=
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
@@ -99,4 +99,4 @@ RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
RHSELFTESTDATA=
-SINGLE_TARBALL=0
+SINGLE_TARBALL=
diff --git a/redhat/self-test/data/create-data.sh b/redhat/self-test/data/create-data.sh
index blahblah..blahblah 100755
--- a/redhat/self-test/data/create-data.sh
+++ b/redhat/self-test/data/create-data.sh
@@ -29,6 +29,7 @@ do
# UPSTREAM is the base merge commit and can change from day-to-day as
# the tree is changed. Omit UPSTREAM from the output.
# RHEL_RELEASE can change build-to-build.
+ unset SINGLE_TARBALL
make RHSELFTESTDATA=1 DIST="${DIST}" DISTRO="${DISTRO}"
HEAD=${commit} dist-dump-variables | grep "=" | grep -v CURDIR | grep -v -w
UPSTREAM | grep -v -w RHEL_RELEASE >& "${varfilename}"
# When executed from a script, the variables in Makefile.variables are
@@ -47,6 +48,7 @@ do
done >> "${varfilename}"
echo "building ${varfilename}.spec"
+ unset SINGLE_TARBALL
make RHSELFTESTDATA=1 DIST="${DIST}" DISTRO="${DISTRO}"
HEAD=${commit} setup-source
cp "${SOURCES}"/kernel.spec "${varfilename}".spec
done
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
@@ -96,4 +96,4 @@ RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
RHSELFTESTDATA=
-SINGLE_TARBALL=0
+SINGLE_TARBALL=
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
@@ -96,4 +96,4 @@ RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
RHSELFTESTDATA=
-SINGLE_TARBALL=0
+SINGLE_TARBALL=
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
@@ -97,4 +97,4 @@ RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
RHSELFTESTDATA=
-SINGLE_TARBALL=0
+SINGLE_TARBALL=
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
@@ -97,4 +97,4 @@ RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
RHSELFTESTDATA=
-SINGLE_TARBALL=0
+SINGLE_TARBALL=
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
@@ -96,4 +96,4 @@ RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
RHSELFTESTDATA=
-SINGLE_TARBALL=0
+SINGLE_TARBALL=
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
@@ -96,4 +96,4 @@ RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
RHSELFTESTDATA=
-SINGLE_TARBALL=0
+SINGLE_TARBALL=
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
@@ -97,4 +97,4 @@ RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
RHSELFTESTDATA=
-SINGLE_TARBALL=0
+SINGLE_TARBALL=
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
@@ -97,4 +97,4 @@ RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
RHSELFTESTDATA=
-SINGLE_TARBALL=0
+SINGLE_TARBALL=
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
@@ -96,4 +96,4 @@ RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
RHSELFTESTDATA=
-SINGLE_TARBALL=0
+SINGLE_TARBALL=
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
@@ -96,4 +96,4 @@ RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
RHSELFTESTDATA=
-SINGLE_TARBALL=0
+SINGLE_TARBALL=
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
@@ -97,4 +97,4 @@ RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
RHSELFTESTDATA=
-SINGLE_TARBALL=0
+SINGLE_TARBALL=
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1757
3:01 p.m.
New subject: [OS-BUILD PATCH 0/17] redhat/Makefile: General improvements and
fixes
From: Herton R. Krzesinski on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1757#note_9418...
- [3/17] `030f50682c27` ("redhat/Makefile: Add kernel-NVR comment")
Is there any reason to make RELEASETAG variable a recursively expanded
variable instead of simply expanded variables, that is, using ```=```
assignment instead of ```:=```? (See eg. https://ftp.gnu.org/old-
gnu/Manuals/make-3.79.1/html_chapter/make_toc.html#TOC59). Mostly curious
because it should work either way.
- [6/17] `df36fcdd089d` ("redhat/Makefile: Rename RPMVERSION to BASEVERSION")
You also need to change rh-dist-git.sh script to use BASEVERSION:
```
redhat/scripts/rh-dist-git.sh:echo -e "${PACKAGE_NAME}-${RPMVERSION}\n" >
"$tmpdir"/changelog
```
- [7/17] `34fe4a6a439c` ("redhat/Makefile: General cleanup")
Probably you want the changelog here to be something like "Add comment about
the SPECTARFILE_RELEASE variable", instead of "General cleanup", because
it
doesn't look a cleanup.
- [9/17] `54a3fefd5b39` ("redhat/kernel.spec.template: Move genspec variables
into one section")
May add to the changelog here that you're also adding back the kversion
variable that maps to SPECKVERSION
- [10/17] `357ddd348f6c` ("redhat/genspec.sh: Remove SPECBUILDID")
I think you need to drop this change, it is not true that SPECBUILD is not
used. It is used in the SPECRELEASE variable:
```
redhat/genspec.sh:SPECRELEASE="${UPSTREAMBUILD}""${BUILD}""%{?buildid}%{?dis
t}"
```
This is replaced/used in the spec file.
I remember buildid could be edited when building/patching directly in dist-
git,
support folks from CEE used to do test kernel builds for customers using the
buildid variable in the spec.
- [13/17] `274beb50dfe2` ("redhat/Makefile: Reorganize MARKER code")
I think you could go further here and do the assignment of MARKER once at
the end of if/endif condition and do ```MARKER:=v$(UPSTREAM_TARBALL_NAME)```
once. Also any reason of using ```=``` instead of ```:=``` as assignment
operator? (see my other comment about the difference of it in variable
expansion in make)
- [14/17] `5fcbbc8fe262` ("redhat/Makefile: Fix dist-brew & distg-brew
targets")
I think you missed a ```-``` here, ```--scratch``` instead of
```-scratch```, in both targets.
- [15/17] `7b1de039af6d` ("redhat/Makefile: Rename BUILDID to LOCALVERSION")
Should we also change redhat/koji/Makefile and rename BUILDID there too?
3:02 p.m.
New subject: [OS-BUILD PATCH 0/17] redhat/Makefile: General improvements and
fixes
From: Herton R. Krzesinski on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1757#note_9418...
making this a blocking thread
11:03 a.m.
New subject: [OS-BUILD PATCH 0/17] redhat/Makefile: General improvements and
fixes
From: Prarit Bhargava on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1757#note_9448...
No reason. For consistency I've changed this to ":=".
>- [6/17] `df36fcdd089d` ("redhat/Makefile: Rename RPMVERSION to
BASEVERSION")
> You also need to change rh-dist-git.sh script to use
BASEVERSION:
"$tmpdir"/changelog
>- [7/17] `34fe4a6a439c` ("redhat/Makefile: General
cleanup")
> Probably you want the changelog here to be something like
"Add comment
about the SPECTARFILE_RELEASE variable", instead of "General cleanup",
because
it doesn't look a cleanup.
Fixed.
>- [9/17] `54a3fefd5b39` ("redhat/kernel.spec.template:
Move genspec variables
into one section")
> May add to the changelog here that you're also adding
back the kversion
variable that maps to SPECKVERSION
Fixed.
>- [10/17] `357ddd348f6c` ("redhat/genspec.sh: Remove
SPECBUILDID")
> I think you need to drop this change, it is not true that
SPECBUILD is not
used. It is used in the SPECRELEASE variable:
> This is replaced/used in the
spec file.
I've changed this commit to add a comment about SPECBUILDID usage.
> I remember buildid could be edited when building/patching
directly in dist-
git,
>- [13/17] `274beb50dfe2` ("redhat/Makefile: Reorganize
MARKER code")
> I think you could go further here and do the assignment
of MARKER once at
the end of if/endif condition and do ```MARKER:=v$(UPSTREAM_TARBALL_NAME)```
once. Also any reason of using ```=``` instead of ```:=``` as assignment
operator? (see my other comment about the difference of it in variable
expansion in make)
Y'know, I thought about doing this but wasn't sure if the end result was
too messy. I've changed it to do what you are suggesting. Hopefully it makes
sense.
> I think you missed a ```-``` here, ```--scratch```
instead of
```-scratch```, in both targets.
Fixed.
>- [15/17] `7b1de039af6d` ("redhat/Makefile: Rename
BUILDID to LOCALVERSION")
> Should we also change redhat/koji/Makefile and rename
BUILDID there too?
I thought about this and decided not to make this change. The reason is
that the BUILDID in that Makefile really references the 'buildid' variable
set with 'git notes --ref buildid -m ".buildid" HEAD'. IOW, this
isn't
really a LOCALVERSION.
- [3/17] `030f50682c27` ("redhat/Makefile: Add kernel-NVR
comment")
Is there any reason to make RELEASETAG variable a recursively expanded
variable
instead of simply expanded variables, that is, using ```=```
assignment instead of ```:=```? (See eg. https://ftp.gnu.org/old-
gnu/Manuals/make-3.79.1/html_chapter/make_toc.html#TOC59). Mostly curious
because it should work either way.
```
>
redhat/scripts/rh-dist-git.sh:echo -e "${PACKAGE_NAME}-${RPMVERSION}\n" ```
Fixed.
```
>
redhat/genspec.sh:SPECRELEASE="${UPSTREAMBUILD}""${BUILD}""%{?buildid}%{?di
st}"
```
support folks from CEE used to do test kernel builds for customers
using
the
> buildid variable in the spec.
- [14/17] `5fcbbc8fe262` ("redhat/Makefile: Fix dist-brew &
distg-brew
targets")
715
days inactive
718
days old
kernel@lists.fedoraproject.org
20 comments
2 participants
participants (2)
-
Herton R. Krzesinski (via Email Bridge) -
Prarit Bhargava (via Email Bridge)