[OS-BUILD PATCHv2 0/24] redhat/Makefile: Cleanup variables

[Prarit Bhargava (via Email Bridge)]

From: Prarit Bhargava on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1641

For a long time we have complained about disorganization in the
redhat/Makefile.  This was because the code was separated into several
Makefiles (Makefile.cross, Makefile.rhpkg, Makefile.variables,
Makefile.common, and Makefile).

The first part of this changeset drops the dependency on Makefile.common
in redhat/koji/Makefile.  The second part of this changeset recombines
redhat/Makefile.common and redhat/Makefile [1].  The remainder of the
patchset  are some general cleanups and reorganization of the Makefile
variables.

As a result, the only variables that can be set by users are in
Makefile.variables, and the Makefile now contains a 'fedora', 'centos',
and
'other' (aka RHEL) section Makefile variables.  The Makefile is now
separated into 3 sections: Deprecated variables, Variables, and
Targets.

This changeset introduces no changes in existing target behavior.

Signed-off-by: Prarit Bhargava <prarit(a)redhat.com&gt;

---
 redhat/koji/Makefile             |    2 +-
 redhat/scripts/create-tarball.sh |    3 +-
 redhat/Makefile                  |  282 ++++++++++++++++++++++++++++++++++----
 redhat/Makefile.common           |  169 -----------------------
 redhat/Makefile.rhpkg            |    2 -
 redhat/Makefile.variables        |   68 +++++++++
 redhat/genspec.sh                |   12 +-
 7 files changed, 326 insertions(+), 212 deletions(-)

[OS-BUILD PATCHv2 1/24] redhat/koji/Makefile: Decouple koji Makefile from Makefile.common

[Prarit Bhargava (via Email Bridge)]

From: Prarit Bhargava <prarit(a)redhat.com&gt;

redhat/koji/Makefile: Decouple koji Makefile from Makefile.common

The koji Makefile uses the GIT and PACKAGE_NAME variables which are
currently defined in Makefile.common.  Since these are configurable by a
user they should actually be defined in Makefile.variables.

Move GIT and PACKAGE_NAME to Makefile.variables, and decouple
Makefile.common from the koji Makefile.

Signed-off-by: Prarit Bhargava <prarit(a)redhat.com&gt;

diff --git a/redhat/Makefile.common b/redhat/Makefile.common
index blahblah..blahblah 100644
--- a/redhat/Makefile.common
+++ b/redhat/Makefile.common
@@ -1,8 +1,7 @@
-GIT ?= git
+include Makefile.variables
 TOPDIR:=$(shell $(GIT) rev-parse --show-toplevel)
 REDHAT:=$(TOPDIR)/redhat
 include $(TOPDIR)/Makefile.rhelver
-include $(REDHAT)/Makefile.variables
 
 RPMBUILD := $(shell if [ -x "/usr/bin/rpmbuild" ]; then echo rpmbuild; \
                    else echo rpm; fi)
@@ -100,7 +99,6 @@ KVERSION:=$(RPMKVERSION).$(RPMKPATCHLEVEL).$(RPMKSUBLEVEL)
 RPMVERSION:=$(KVERSION)
 
 BUILD:=$(RHEL_RELEASE)
-PACKAGE_NAME:=kernel
 SPECFILE:=$(PACKAGE_NAME).spec
 RPM:=$(REDHAT)/rpm
 SRPMS:=$(RPM)/SRPMS
diff --git a/redhat/Makefile.variables b/redhat/Makefile.variables
index blahblah..blahblah 100644
--- a/redhat/Makefile.variables
+++ b/redhat/Makefile.variables
@@ -51,3 +51,12 @@ INCLUDE_RHEL_FILES:=1
 # value of PATCHLIST_URL in this case should point to the git repository where
 # the commits are located, and will be added as a prefix to the shas listed.
 PATCHLIST_URL ?= "https://gitlab.com/cki-project/kernel-ark/-/commit"
+
+# This can be used to change the filename of the specfile.  For example, it can
+# be set to "kernel" for kernel.spec or "kernel-rt" for
kernel-rt.spec.  This
+# is useful for other projects with different specfile names.
+PACKAGE_NAME ?= kernel
+
+# This is the executable for 'git' commands.  It is used by the redhat/self-test
+# tests to provide testing information on git hashes (see redhat/self-test/egit.sh)
+GIT ?= git
diff --git a/redhat/koji/Makefile b/redhat/koji/Makefile
index blahblah..blahblah 100644
--- a/redhat/koji/Makefile
+++ b/redhat/koji/Makefile
@@ -17,7 +17,7 @@
 #	  set it with - git notes --ref buildid -m ".buildid" HEAD
 ######################################################################
 
-include ../Makefile.common
+include ../Makefile.variables
 
 notes:
 	$(GIT) fetch --force origin refs/notes/*:refs/notes/*

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1641

[OS-BUILD PATCHv2 2/24] redhat: Combine Makefile and Makefile.common

[Prarit Bhargava (via Email Bridge)]

From: Prarit Bhargava <prarit(a)redhat.com&gt;

redhat: Combine Makefile and Makefile.common

The only include of Makefile.common is the Makefile.  Combine the two
files in Makefile.

Signed-off-by: Prarit Bhargava <prarit(a)redhat.com&gt;

diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -1,7 +1,174 @@
-include Makefile.common
-include Makefile.rhpkg
+include Makefile.variables
 
 LANG=C
+TOPDIR:=$(shell $(GIT) rev-parse --show-toplevel)
+REDHAT:=$(TOPDIR)/redhat
+include $(TOPDIR)/Makefile.rhelver
+
+RPMBUILD := $(shell if [ -x "/usr/bin/rpmbuild" ]; then echo rpmbuild; \
+                   else echo rpm; fi)
+
+MACH :=  $(shell uname -m)
+HEAD ?= HEAD
+RPMKVERSION:=$(shell $(GIT) show $(HEAD):Makefile | sed -ne '/^VERSION\ =\
/{s///;p;q}')
+RPMKPATCHLEVEL:=$(shell $(GIT) show $(HEAD):Makefile | sed -ne '/^PATCHLEVEL\ =\
/{s///;p;q}')
+RPMKSUBLEVEL:=$(shell $(GIT) show $(HEAD):Makefile | sed -ne '/^SUBLEVEL\ =\
/{s///;p;q}')
+RPMKEXTRAVERSION:=$(shell $(GIT) show $(HEAD):Makefile | sed -ne '/^EXTRAVERSION\ =\
/{s///;p;q}')
+GITID:= $(shell $(GIT) log --max-count=1 --pretty=format:%H $(HEAD))
+# marker is git tag which we base off of for exporting patches
+# Make sure marker uses RPMKPATCHLEVEL and RPMKEXTRAVERSION from the kernel
+# makefile as opposed to any adjusted version for snapshotting.
+ifneq ($(RPMKEXTRAVERSION),)
+  MARKER:=v$(RPMKVERSION).$(RPMKPATCHLEVEL)$(RPMKEXTRAVERSION)
+  KEXTRAVERSION:=$(shell echo $(RPMKEXTRAVERSION) | sed -e s/-/./)
+  PREBUILD:=0$(KEXTRAVERSION).
+  UPSTREAM_TARBALL_NAME:=$(RPMKVERSION).$(RPMKPATCHLEVEL)$(RPMKEXTRAVERSION)
+else
+  KEXTRAVERSION:=
+  ifeq ($(RPMKSUBLEVEL),0)
+    MARKER:=v$(RPMKVERSION).$(RPMKPATCHLEVEL)
+    UPSTREAM_TARBALL_NAME:=$(RPMKVERSION).$(RPMKPATCHLEVEL)
+  else
+    MARKER:=v$(RPMKVERSION).$(RPMKPATCHLEVEL).$(RPMKSUBLEVEL)
+    UPSTREAM_TARBALL_NAME:=$(RPMKVERSION).$(RPMKPATCHLEVEL).$(RPMKSUBLEVEL)
+  endif
+  PREBUILD:=
+endif
+
+ifneq ($(findstring .fc,$(DIST)),)
+  DISTRO ?= fedora
+else
+  DISTRO ?= rhel
+endif
+
+# If VERSION_ON_UPSTREAM is set, the versioning of the rpm package is based
+# on a branch tracking upstream. This allows for generating rpms
+# based on untagged releases.
+ifndef VERSION_ON_UPSTREAM
+  ifeq ("$(DISTRO)", "fedora")
+    VERSION_ON_UPSTREAM:=1
+  else
+    VERSION_ON_UPSTREAM:=0
+  endif
+endif
+ifeq ($(VERSION_ON_UPSTREAM),1)
+  # UPSTREAM_BRANCH is expected to track mainline.
+  UPSTREAM:=$(shell $(GIT) rev-parse -q --verify origin/$(UPSTREAM_BRANCH) || \
+                  $(GIT) rev-parse -q --verify $(UPSTREAM_BRANCH))
+  ifeq ($(UPSTREAM),)
+      $(error "Missing an $(UPSTREAM_BRANCH) branch")
+  endif
+  MERGE_BASE:=$(shell $(GIT) merge-base $(HEAD) $(UPSTREAM))
+  _TAG:=$(shell $(GIT) describe $(MERGE_BASE))
+  # a snapshot off of a tagged git is of the form [tag]-[cnt]-g[hash]
+  SNAPSHOT:=$(shell echo $(_TAG) | grep -c '\-g')
+else
+  SNAPSHOT:=0
+endif
+
+ifeq ($(SNAPSHOT),1)
+  # The base for generating tags is the snapshot commit
+  MARKER:=$(shell echo $(_TAG) | awk -F "-g" '{ print $$2 }')
+  # The merge window is weird because the actual versioning hasn't
+  # been updated but we still need something that works for
+  # packaging. Fix this by bumping the patch level and marking
+  # this as rc0
+  ifeq ($(RPMKEXTRAVERSION),)
+    KEXTRAVERSION:=.rc0
+    PREBUILD:=0$(KEXTRAVERSION).
+    RPMKPATCHLEVEL:=$(shell expr $(RPMKPATCHLEVEL) + 1)
+  endif
+  ifneq ($(filter $(MAKECMDGOALS),dist-git-test dist-git),)
+    PREBUILD_GIT_ONLY ?= 0
+  else
+    PREBUILD_GIT_ONLY ?= 1
+  endif
+  ifeq ($(PREBUILD_GIT_ONLY),1)
+    PREBUILD:=$(PREBUILD)$(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).
+  endif
+  UPSTREAM_TARBALL_NAME:=$(patsubst v%,%,$(_TAG))
+endif
+
+
+# RPMKPATCHVERSION may get adjusted if we're snapshotting
+# during the merge window so ensure this gets set after
+# we've checked for snapshots
+KVERSION:=$(RPMKVERSION).$(RPMKPATCHLEVEL).$(RPMKSUBLEVEL)
+RPMVERSION:=$(KVERSION)
+
+BUILD:=$(RHEL_RELEASE)
+SPECFILE:=$(PACKAGE_NAME).spec
+RPM:=$(REDHAT)/rpm
+SRPMS:=$(RPM)/SRPMS
+SOURCES:=$(RPM)/SOURCES
+TESTPATCH:=$(REDHAT)/linux-kernel-test.patch
+ARCH_LIST=aarch64 ppc64le s390x x86_64
+# Make can't match on a regex to match fc31, fc32 so add another check here
+# A unified tarball means that the tarball in the srpm contains both the
+# upstream sources and redhat patches. A non-unified tarball means that
+# the tarball is only upstream sources and the patches get applied as
+# a diff in the spec file
+ifeq ("$(DISTRO)", "fedora")
+  SINGLE_TARBALL:=0
+else
+  SINGLE_TARBALL:=1
+endif
+
+STAMP_VERSION:=$(KVERSION)
+
+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.)
+else
+  ifeq ($(BUILDID),)
+    BUILDID:=.test
+  endif
+  $(info BUILDID is "$(BUILDID)".)
+endif
+
+PKGRELEASE:=$(PREBUILD)$(BUILD)$(BUILDID)
+SPECRELEASE:=$(PREBUILD)$(BUILD)%{?buildid}%{?dist}
+
+ifeq ("$(SINGLE_TARBALL)", "0")
+  TARFILE_RELEASE:=$(UPSTREAM_TARBALL_NAME)
+else
+  TARFILE_RELEASE:=$(KVERSION)-$(PKGRELEASE)
+endif
+TARFILE:=linux-$(TARFILE_RELEASE).tar.xz
+TARBALL:=$(REDHAT)/$(TARFILE)
+DISTRO_BUILD:=$(PREBUILD)$(shell echo $(BUILD) | sed -e
's|\(^[0-9]\{1,4\}\)\..*|\1|')
+KABI_TARFILE:=kernel-abi-stablelists-$(KVERSION)-$(DISTRO_BUILD).tar.bz2
+KABI_TARBALL:=$(REDHAT)/rpm/SOURCES/$(KABI_TARFILE)
+KABIDW_TARFILE:=kernel-kabi-dw-$(KVERSION)-$(DISTRO_BUILD).tar.bz2
+KABIDW_TARBALL:=$(REDHAT)/rpm/SOURCES/$(KABIDW_TARFILE)
+
+CHANGELOG:=$(PACKAGE_NAME).changelog-$(RHEL_MAJOR).$(RHEL_MINOR)
+CHANGELOG_PREV:=$(PACKAGE_NAME).changelog-$(RHEL_MAJOR).$(shell expr $(RHEL_MINOR) - 1)
+
+ifeq ("$(DISTRO)", "fedora")
+  RHPRODUCT:=rawhide
+else ifeq ("$(DISTRO)", "centos")
+  RHPRODUCT:=c$(RHEL_MAJOR)s
+else
+  RHPRODUCT:=rhel-$(RHEL_MAJOR).$(RHEL_MINOR).0
+endif
+
+ifeq ("$(DISTRO)", "fedora")
+  BUILD_SCRATCH_TARGET ?= temp-ark-rhel-8-test
+else ifeq ("$(DISTRO)", "centos")
+  BUILD_PROFILE ?= -p stream
+  BUILD_SCRATCH_TARGET ?= c$(RHEL_MAJOR)s-candidate
+else
+  BUILD_SCRATCH_TARGET ?= rhel-$(RHEL_MAJOR).$(RHEL_MINOR).0-test-pesign
+endif
+
+include Makefile.rhpkg
 
 ifeq ("$(ZSTREAM)", "yes")
   __YSTREAM = no
diff --git a/redhat/Makefile.common b/redhat/Makefile.common
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/Makefile.common
+++ /dev/null
@@ -1,167 +0,0 @@
-include Makefile.variables
-TOPDIR:=$(shell $(GIT) rev-parse --show-toplevel)
-REDHAT:=$(TOPDIR)/redhat
-include $(TOPDIR)/Makefile.rhelver
-
-RPMBUILD := $(shell if [ -x "/usr/bin/rpmbuild" ]; then echo rpmbuild; \
-                   else echo rpm; fi)
-
-MACH :=  $(shell uname -m)
-HEAD ?= HEAD
-RPMKVERSION:=$(shell $(GIT) show $(HEAD):Makefile | sed -ne '/^VERSION\ =\
/{s///;p;q}')
-RPMKPATCHLEVEL:=$(shell $(GIT) show $(HEAD):Makefile | sed -ne '/^PATCHLEVEL\ =\
/{s///;p;q}')
-RPMKSUBLEVEL:=$(shell $(GIT) show $(HEAD):Makefile | sed -ne '/^SUBLEVEL\ =\
/{s///;p;q}')
-RPMKEXTRAVERSION:=$(shell $(GIT) show $(HEAD):Makefile | sed -ne '/^EXTRAVERSION\ =\
/{s///;p;q}')
-GITID:= $(shell $(GIT) log --max-count=1 --pretty=format:%H $(HEAD))
-# marker is git tag which we base off of for exporting patches
-# Make sure marker uses RPMKPATCHLEVEL and RPMKEXTRAVERSION from the kernel
-# makefile as opposed to any adjusted version for snapshotting.
-ifneq ($(RPMKEXTRAVERSION),)
-  MARKER:=v$(RPMKVERSION).$(RPMKPATCHLEVEL)$(RPMKEXTRAVERSION)
-  KEXTRAVERSION:=$(shell echo $(RPMKEXTRAVERSION) | sed -e s/-/./)
-  PREBUILD:=0$(KEXTRAVERSION).
-  UPSTREAM_TARBALL_NAME:=$(RPMKVERSION).$(RPMKPATCHLEVEL)$(RPMKEXTRAVERSION)
-else
-  KEXTRAVERSION:=
-  ifeq ($(RPMKSUBLEVEL),0)
-    MARKER:=v$(RPMKVERSION).$(RPMKPATCHLEVEL)
-    UPSTREAM_TARBALL_NAME:=$(RPMKVERSION).$(RPMKPATCHLEVEL)
-  else
-    MARKER:=v$(RPMKVERSION).$(RPMKPATCHLEVEL).$(RPMKSUBLEVEL)
-    UPSTREAM_TARBALL_NAME:=$(RPMKVERSION).$(RPMKPATCHLEVEL).$(RPMKSUBLEVEL)
-  endif
-  PREBUILD:=
-endif
-
-ifneq ($(findstring .fc,$(DIST)),)
-  DISTRO ?= fedora
-else
-  DISTRO ?= rhel
-endif
-
-# If VERSION_ON_UPSTREAM is set, the versioning of the rpm package is based
-# on a branch tracking upstream. This allows for generating rpms
-# based on untagged releases.
-ifndef VERSION_ON_UPSTREAM
-  ifeq ("$(DISTRO)", "fedora")
-    VERSION_ON_UPSTREAM:=1
-  else
-    VERSION_ON_UPSTREAM:=0
-  endif
-endif
-ifeq ($(VERSION_ON_UPSTREAM),1)
-  # UPSTREAM_BRANCH is expected to track mainline.
-  UPSTREAM:=$(shell $(GIT) rev-parse -q --verify origin/$(UPSTREAM_BRANCH) || \
-                  $(GIT) rev-parse -q --verify $(UPSTREAM_BRANCH))
-  ifeq ($(UPSTREAM),)
-      $(error "Missing an $(UPSTREAM_BRANCH) branch")
-  endif
-  MERGE_BASE:=$(shell $(GIT) merge-base $(HEAD) $(UPSTREAM))
-  _TAG:=$(shell $(GIT) describe $(MERGE_BASE))
-  # a snapshot off of a tagged git is of the form [tag]-[cnt]-g[hash]
-  SNAPSHOT:=$(shell echo $(_TAG) | grep -c '\-g')
-else
-  SNAPSHOT:=0
-endif
-
-ifeq ($(SNAPSHOT),1)
-  # The base for generating tags is the snapshot commit
-  MARKER:=$(shell echo $(_TAG) | awk -F "-g" '{ print $$2 }')
-  # The merge window is weird because the actual versioning hasn't
-  # been updated but we still need something that works for
-  # packaging. Fix this by bumping the patch level and marking
-  # this as rc0
-  ifeq ($(RPMKEXTRAVERSION),)
-    KEXTRAVERSION:=.rc0
-    PREBUILD:=0$(KEXTRAVERSION).
-    RPMKPATCHLEVEL:=$(shell expr $(RPMKPATCHLEVEL) + 1)
-  endif
-  ifneq ($(filter $(MAKECMDGOALS),dist-git-test dist-git),)
-    PREBUILD_GIT_ONLY ?= 0
-  else
-    PREBUILD_GIT_ONLY ?= 1
-  endif
-  ifeq ($(PREBUILD_GIT_ONLY),1)
-    PREBUILD:=$(PREBUILD)$(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).
-  endif
-  UPSTREAM_TARBALL_NAME:=$(patsubst v%,%,$(_TAG))
-endif
-
-
-# RPMKPATCHVERSION may get adjusted if we're snapshotting
-# during the merge window so ensure this gets set after
-# we've checked for snapshots
-KVERSION:=$(RPMKVERSION).$(RPMKPATCHLEVEL).$(RPMKSUBLEVEL)
-RPMVERSION:=$(KVERSION)
-
-BUILD:=$(RHEL_RELEASE)
-SPECFILE:=$(PACKAGE_NAME).spec
-RPM:=$(REDHAT)/rpm
-SRPMS:=$(RPM)/SRPMS
-SOURCES:=$(RPM)/SOURCES
-TESTPATCH:=$(REDHAT)/linux-kernel-test.patch
-ARCH_LIST=aarch64 ppc64le s390x x86_64
-# Make can't match on a regex to match fc31, fc32 so add another check here
-# A unified tarball means that the tarball in the srpm contains both the
-# upstream sources and redhat patches. A non-unified tarball means that
-# the tarball is only upstream sources and the patches get applied as
-# a diff in the spec file
-ifeq ("$(DISTRO)", "fedora")
-  SINGLE_TARBALL:=0
-else
-  SINGLE_TARBALL:=1
-endif
-
-STAMP_VERSION:=$(KVERSION)
-
-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.)
-else
-  ifeq ($(BUILDID),)
-    BUILDID:=.test
-  endif
-  $(info BUILDID is "$(BUILDID)".)
-endif
-
-PKGRELEASE:=$(PREBUILD)$(BUILD)$(BUILDID)
-SPECRELEASE:=$(PREBUILD)$(BUILD)%{?buildid}%{?dist}
-
-ifeq ("$(SINGLE_TARBALL)", "0")
-  TARFILE_RELEASE:=$(UPSTREAM_TARBALL_NAME)
-else
-  TARFILE_RELEASE:=$(KVERSION)-$(PKGRELEASE)
-endif
-TARFILE:=linux-$(TARFILE_RELEASE).tar.xz
-TARBALL:=$(REDHAT)/$(TARFILE)
-DISTRO_BUILD:=$(PREBUILD)$(shell echo $(BUILD) | sed -e
's|\(^[0-9]\{1,4\}\)\..*|\1|')
-KABI_TARFILE:=kernel-abi-stablelists-$(KVERSION)-$(DISTRO_BUILD).tar.bz2
-KABI_TARBALL:=$(REDHAT)/rpm/SOURCES/$(KABI_TARFILE)
-KABIDW_TARFILE:=kernel-kabi-dw-$(KVERSION)-$(DISTRO_BUILD).tar.bz2
-KABIDW_TARBALL:=$(REDHAT)/rpm/SOURCES/$(KABIDW_TARFILE)
-
-CHANGELOG:=$(PACKAGE_NAME).changelog-$(RHEL_MAJOR).$(RHEL_MINOR)
-CHANGELOG_PREV:=$(PACKAGE_NAME).changelog-$(RHEL_MAJOR).$(shell expr $(RHEL_MINOR) - 1)
-
-ifeq ("$(DISTRO)", "fedora")
-  RHPRODUCT:=rawhide
-else ifeq ("$(DISTRO)", "centos")
-  RHPRODUCT:=c$(RHEL_MAJOR)s
-else
-  RHPRODUCT:=rhel-$(RHEL_MAJOR).$(RHEL_MINOR).0
-endif
-
-ifeq ("$(DISTRO)", "fedora")
-  BUILD_SCRATCH_TARGET ?= temp-ark-rhel-8-test
-else ifeq ("$(DISTRO)", "centos")
-  BUILD_PROFILE ?= -p stream
-  BUILD_SCRATCH_TARGET ?= c$(RHEL_MAJOR)s-candidate
-else
-  BUILD_SCRATCH_TARGET ?= rhel-$(RHEL_MAJOR).$(RHEL_MINOR).0-test-pesign
-endif

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1641

[OS-BUILD PATCHv2 3/24] redhat/Makefile: Move HEAD to Makefile.variables.

[Prarit Bhargava (via Email Bridge)]

From: Prarit Bhargava <prarit(a)redhat.com&gt;

redhat/Makefile: Move HEAD to Makefile.variables.

Move HEAD to Makefile.variables.

Signed-off-by: Prarit Bhargava <prarit(a)redhat.com&gt;

diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -9,7 +9,6 @@ RPMBUILD := $(shell if [ -x "/usr/bin/rpmbuild" ]; then echo
rpmbuild; \
                    else echo rpm; fi)
 
 MACH :=  $(shell uname -m)
-HEAD ?= HEAD
 RPMKVERSION:=$(shell $(GIT) show $(HEAD):Makefile | sed -ne '/^VERSION\ =\
/{s///;p;q}')
 RPMKPATCHLEVEL:=$(shell $(GIT) show $(HEAD):Makefile | sed -ne '/^PATCHLEVEL\ =\
/{s///;p;q}')
 RPMKSUBLEVEL:=$(shell $(GIT) show $(HEAD):Makefile | sed -ne '/^SUBLEVEL\ =\
/{s///;p;q}')
diff --git a/redhat/Makefile.variables b/redhat/Makefile.variables
index blahblah..blahblah 100644
--- a/redhat/Makefile.variables
+++ b/redhat/Makefile.variables
@@ -60,3 +60,8 @@ PACKAGE_NAME ?= kernel
 # This is the executable for 'git' commands.  It is used by the redhat/self-test
 # tests to provide testing information on git hashes (see redhat/self-test/egit.sh)
 GIT ?= git
+
+# This is the referenced HEAD commit for git commands and can be used to change
+# the "top of tree" commit ID.  This is useful in cases where users want to
+# build against an older commit but do not want to check out the tree.
+HEAD ?= HEAD

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1641

[OS-BUILD PATCHv2 4/24] redhat/Makefile: Cleanup DISTRO variable

[Prarit Bhargava (via Email Bridge)]

From: Prarit Bhargava <prarit(a)redhat.com&gt;

redhat/Makefile: Cleanup DISTRO variable

Move the DISTRO variable to Makefile.variables and clean up its usage in
the Makfile.  This creates separate fedora-specific, centos-specific, and
'other'-specific variable sections.

Signed-off-by: Prarit Bhargava <prarit(a)redhat.com&gt;

diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -34,10 +34,12 @@ else
   PREBUILD:=
 endif
 
-ifneq ($(findstring .fc,$(DIST)),)
-  DISTRO ?= fedora
-else
-  DISTRO ?= rhel
+ifndef DISTRO
+  ifneq ($(findstring .fc,$(DIST)),)
+    DISTRO := fedora
+  else
+    DISTRO := rhel
+  endif
 endif
 
 # If VERSION_ON_UPSTREAM is set, the versioning of the rpm package is based
@@ -106,16 +108,6 @@ SRPMS:=$(RPM)/SRPMS
 SOURCES:=$(RPM)/SOURCES
 TESTPATCH:=$(REDHAT)/linux-kernel-test.patch
 ARCH_LIST=aarch64 ppc64le s390x x86_64
-# Make can't match on a regex to match fc31, fc32 so add another check here
-# A unified tarball means that the tarball in the srpm contains both the
-# upstream sources and redhat patches. A non-unified tarball means that
-# the tarball is only upstream sources and the patches get applied as
-# a diff in the spec file
-ifeq ("$(DISTRO)", "fedora")
-  SINGLE_TARBALL:=0
-else
-  SINGLE_TARBALL:=1
-endif
 
 STAMP_VERSION:=$(KVERSION)
 
@@ -134,11 +126,30 @@ endif
 PKGRELEASE:=$(PREBUILD)$(BUILD)$(BUILDID)
 SPECRELEASE:=$(PREBUILD)$(BUILD)%{?buildid}%{?dist}
 
-ifeq ("$(SINGLE_TARBALL)", "0")
+ifeq ("$(DISTRO)", "fedora")
+  # A non-unified tarball means that the tarball is only upstream sources
+  # and the patches get applied as a diff in the spec file
+  SINGLE_TARBALL:=0
   TARFILE_RELEASE:=$(UPSTREAM_TARBALL_NAME)
+  RHPRODUCT:=rawhide
+  BUILD_SCRATCH_TARGET ?= temp-ark-rhel-8-test
+else ifeq ("$(DISTRO)", "centos")
+  # A unified tarball means that the tarball in the srpm contains both the
+  # upstream sources and RHEL specific patches.
+  SINGLE_TARBALL:=1
+  RHPRODUCT:=c$(RHEL_MAJOR)s
+  BUILD_PROFILE ?= -p stream
+  BUILD_SCRATCH_TARGET ?= c$(RHEL_MAJOR)s-candidate
+  TARFILE_RELEASE:=$(KVERSION)-$(PKGRELEASE)
 else
+  # A unified tarball means that the tarball in the srpm contains both the
+  # upstream sources and RHEL specific patches.
+  SINGLE_TARBALL:=1
+  RHPRODUCT:=rhel-$(RHEL_MAJOR).$(RHEL_MINOR).0
+  BUILD_SCRATCH_TARGET ?= rhel-$(RHEL_MAJOR).$(RHEL_MINOR).0-test-pesign
   TARFILE_RELEASE:=$(KVERSION)-$(PKGRELEASE)
 endif
+
 TARFILE:=linux-$(TARFILE_RELEASE).tar.xz
 TARBALL:=$(REDHAT)/$(TARFILE)
 DISTRO_BUILD:=$(PREBUILD)$(shell echo $(BUILD) | sed -e
's|\(^[0-9]\{1,4\}\)\..*|\1|')
@@ -150,23 +161,6 @@ KABIDW_TARBALL:=$(REDHAT)/rpm/SOURCES/$(KABIDW_TARFILE)
 CHANGELOG:=$(PACKAGE_NAME).changelog-$(RHEL_MAJOR).$(RHEL_MINOR)
 CHANGELOG_PREV:=$(PACKAGE_NAME).changelog-$(RHEL_MAJOR).$(shell expr $(RHEL_MINOR) - 1)
 
-ifeq ("$(DISTRO)", "fedora")
-  RHPRODUCT:=rawhide
-else ifeq ("$(DISTRO)", "centos")
-  RHPRODUCT:=c$(RHEL_MAJOR)s
-else
-  RHPRODUCT:=rhel-$(RHEL_MAJOR).$(RHEL_MINOR).0
-endif
-
-ifeq ("$(DISTRO)", "fedora")
-  BUILD_SCRATCH_TARGET ?= temp-ark-rhel-8-test
-else ifeq ("$(DISTRO)", "centos")
-  BUILD_PROFILE ?= -p stream
-  BUILD_SCRATCH_TARGET ?= c$(RHEL_MAJOR)s-candidate
-else
-  BUILD_SCRATCH_TARGET ?= rhel-$(RHEL_MAJOR).$(RHEL_MINOR).0-test-pesign
-endif
-
 include Makefile.rhpkg
 
 ifeq ("$(ZSTREAM)", "yes")
diff --git a/redhat/Makefile.variables b/redhat/Makefile.variables
index blahblah..blahblah 100644
--- a/redhat/Makefile.variables
+++ b/redhat/Makefile.variables
@@ -12,6 +12,10 @@ DIST_BRANCH ?= "os-build"
 # .el8 etc. In a different branch this may be set to a fixed value.
 DIST ?= $(shell $(RPMBUILD) --eval '%{?dist}')
 
+# This is a human readable distribution variable that is used to determine the
+# OS version (fedora, centos, or rhel).
+DISTRO ?=
+
 # The branch used as upstream. This is what the upstream tarball is it
 # should be tracked in a local branch. This would be "master" for the
 # Linus master branch or linux-5.x.y for a stable branch. It can also be

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1641

[OS-BUILD PATCHv2 5/24] redhat/Makefile: Remove RHPRODUCT variable

[Prarit Bhargava (via Email Bridge)]

From: Prarit Bhargava <prarit(a)redhat.com&gt;

redhat/Makefile: Remove RHPRODUCT variable

The only use of RHPRODUCT is to set the RHDISTGIT_BRANCH variable.

Remove the RHPRODUCT variable and just use RHDISTGIT_BRANCH.  This will
make future change easier.

Signed-off-by: Prarit Bhargava <prarit(a)redhat.com&gt;

diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -131,13 +131,13 @@ ifeq ("$(DISTRO)", "fedora")
   # and the patches get applied as a diff in the spec file
   SINGLE_TARBALL:=0
   TARFILE_RELEASE:=$(UPSTREAM_TARBALL_NAME)
-  RHPRODUCT:=rawhide
+  RHDISTGIT_BRANCH:=rawhide
   BUILD_SCRATCH_TARGET ?= temp-ark-rhel-8-test
 else ifeq ("$(DISTRO)", "centos")
   # A unified tarball means that the tarball in the srpm contains both the
   # upstream sources and RHEL specific patches.
   SINGLE_TARBALL:=1
-  RHPRODUCT:=c$(RHEL_MAJOR)s
+  RHDISTGIT_BRANCH:=c$(RHEL_MAJOR)s
   BUILD_PROFILE ?= -p stream
   BUILD_SCRATCH_TARGET ?= c$(RHEL_MAJOR)s-candidate
   TARFILE_RELEASE:=$(KVERSION)-$(PKGRELEASE)
@@ -145,7 +145,7 @@ else
   # A unified tarball means that the tarball in the srpm contains both the
   # upstream sources and RHEL specific patches.
   SINGLE_TARBALL:=1
-  RHPRODUCT:=rhel-$(RHEL_MAJOR).$(RHEL_MINOR).0
+  RHDISTGIT_BRANCH:=rhel-$(RHEL_MAJOR).$(RHEL_MINOR).0
   BUILD_SCRATCH_TARGET ?= rhel-$(RHEL_MAJOR).$(RHEL_MINOR).0-test-pesign
   TARFILE_RELEASE:=$(KVERSION)-$(PKGRELEASE)
 endif
diff --git a/redhat/Makefile.rhpkg b/redhat/Makefile.rhpkg
index blahblah..blahblah 100644
--- a/redhat/Makefile.rhpkg
+++ b/redhat/Makefile.rhpkg
@@ -16,8 +16,6 @@ RHDISTGIT_USER:="$(shell whoami)"
 # Temporary directory to clone the dist-git repo to. Change this if you
 # have a faster storage
 RHDISTGIT_TMP:=/tmp
-# Branch it should be switched into
-RHDISTGIT_BRANCH:=${RHPRODUCT}
 
 # load configuration, starting with home directory then local
 ifeq ("$(RHDISTGIT_CACHE)", "")

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1641

[OS-BUILD PATCHv2 6/24] redhat/Makefile: Move BUILD_TARGET and BUILD_SCRATCH_TARGET to Makefile.variables

[Prarit Bhargava (via Email Bridge)]

From: Prarit Bhargava <prarit(a)redhat.com&gt;

redhat/Makefile: Move BUILD_TARGET and BUILD_SCRATCH_TARGET to Makefile.variables

Move BUILD_TARGET and BUILD_SCRATCH_TARGET to Makefile.variables.

Signed-off-by: Prarit Bhargava <prarit(a)redhat.com&gt;

diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -132,24 +132,34 @@ ifeq ("$(DISTRO)", "fedora")
   SINGLE_TARBALL:=0
   TARFILE_RELEASE:=$(UPSTREAM_TARBALL_NAME)
   RHDISTGIT_BRANCH:=rawhide
-  BUILD_SCRATCH_TARGET ?= temp-ark-rhel-8-test
+  ifndef BUILD_SCRATCH_TARGET
+    BUILD_SCRATCH_TARGET:=temp-ark-rhel-8-test
+  endif
 else ifeq ("$(DISTRO)", "centos")
   # A unified tarball means that the tarball in the srpm contains both the
   # upstream sources and RHEL specific patches.
   SINGLE_TARBALL:=1
   RHDISTGIT_BRANCH:=c$(RHEL_MAJOR)s
   BUILD_PROFILE ?= -p stream
-  BUILD_SCRATCH_TARGET ?= c$(RHEL_MAJOR)s-candidate
+  ifndef BUILD_SCRATCH_TARGET
+    BUILD_SCRATCH_TARGET:=c$(RHEL_MAJOR)s-candidate
+  endif
   TARFILE_RELEASE:=$(KVERSION)-$(PKGRELEASE)
 else
   # A unified tarball means that the tarball in the srpm contains both the
   # upstream sources and RHEL specific patches.
   SINGLE_TARBALL:=1
   RHDISTGIT_BRANCH:=rhel-$(RHEL_MAJOR).$(RHEL_MINOR).0
-  BUILD_SCRATCH_TARGET ?= rhel-$(RHEL_MAJOR).$(RHEL_MINOR).0-test-pesign
+  ifndef BUILD_SCRATCH_TARGET
+    BUILD_SCRATCH_TARGET:=rhel-$(RHEL_MAJOR).$(RHEL_MINOR).0-test-pesign
+  endif
   TARFILE_RELEASE:=$(KVERSION)-$(PKGRELEASE)
 endif
 
+ifndef BUILD_TARGET
+  BUILD_TARGET:=--scratch $(BUILD_SCRATCH_TARGET)
+endif
+
 TARFILE:=linux-$(TARFILE_RELEASE).tar.xz
 TARBALL:=$(REDHAT)/$(TARFILE)
 DISTRO_BUILD:=$(PREBUILD)$(shell echo $(BUILD) | sed -e
's|\(^[0-9]\{1,4\}\)\..*|\1|')
@@ -189,7 +199,6 @@ else
    PROCESS_CONFIGS_OPTS=-n -w -c
 endif
 
-BUILD_TARGET ?= --scratch $(BUILD_SCRATCH_TARGET)
 FLAVOR =
 
 RHGITURL?=$(shell $(GIT) config rhg.url || $(GIT) config remote.origin.url)
diff --git a/redhat/Makefile.variables b/redhat/Makefile.variables
index blahblah..blahblah 100644
--- a/redhat/Makefile.variables
+++ b/redhat/Makefile.variables
@@ -69,3 +69,13 @@ GIT ?= git
 # the "top of tree" commit ID.  This is useful in cases where users want to
 # build against an older commit but do not want to check out the tree.
 HEAD ?= HEAD
+
+# This is the brew/koji scratch build target.  A list of targets can be found
+# by executing the 'brew list-targets' or 'koji list-targets' command. 
The
+# default values can be found in redhat/Makefile and are dependent on the
+# target OS.  The target OS can be changed by setting the DIST or DISTRO
+# variables.
+BUILD_SCRATCH_TARGET ?=
+
+# This is the brew/koji command scratch build options.
+BUILD_TARGET ?=

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1641

[OS-BUILD PATCHv2 7/24] redhat/Makefile: Move BUILD_PROFILE to Makefile.variables

[Prarit Bhargava (via Email Bridge)]

From: Prarit Bhargava <prarit(a)redhat.com&gt;

redhat/Makefile: Move BUILD_PROFILE to Makefile.variables

Move BUILD_PROFILE to Makefile.variables.

Signed-off-by: Prarit Bhargava <prarit(a)redhat.com&gt;

diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -140,7 +140,9 @@ else ifeq ("$(DISTRO)", "centos")
   # upstream sources and RHEL specific patches.
   SINGLE_TARBALL:=1
   RHDISTGIT_BRANCH:=c$(RHEL_MAJOR)s
-  BUILD_PROFILE ?= -p stream
+  ifndef BUILD_PROFILE
+    BUILD_PROFILE:= -p stream
+  endif
   ifndef BUILD_SCRATCH_TARGET
     BUILD_SCRATCH_TARGET:=c$(RHEL_MAJOR)s-candidate
   endif
diff --git a/redhat/Makefile.variables b/redhat/Makefile.variables
index blahblah..blahblah 100644
--- a/redhat/Makefile.variables
+++ b/redhat/Makefile.variables
@@ -79,3 +79,6 @@ BUILD_SCRATCH_TARGET ?=
 
 # This is the brew/koji command scratch build options.
 BUILD_TARGET ?=
+
+# This sets the koji/brew configuration profile variable.
+BUILD_PROFILE ?=

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1641

[OS-BUILD PATCHv2 8/24] redhat/Makefile: Move BUILD_FLAGS to Makefile.variables.

[Prarit Bhargava (via Email Bridge)]

From: Prarit Bhargava <prarit(a)redhat.com&gt;

redhat/Makefile: Move BUILD_FLAGS to Makefile.variables.

Move BUILD_FLAGS to Makefile.variables.

Signed-off-by: Prarit Bhargava <prarit(a)redhat.com&gt;

diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -229,6 +229,16 @@ RHJOBS?=$(shell j=$$(echo $(MAKEFLAGS) | grep -Eo "\
-j[0-9]*" | xargs ); \
 		[ -z "$${j}" ] && nproc --all || echo $${j}; \
 	fi)
 
+ifndef BUILD_FLAGS
+  ifeq ($(filter $(MAKECMDGOALS),dist-brew distg-brew),)
+	BUILD_FLAGS := $(BREW_FLAGS)
+  endif
+  ifeq ($(filter $(MAKECMDGOALS),dist-koji distg-koji),)
+	BUILD_FLAGS := $(KOJI_FLAGS)
+  endif
+  BUILD_FLAGS += $(TEST_FLAGS)
+endif
+
 default: dist-help
 
 dist-python-check:
@@ -559,12 +569,6 @@ dist-fedora-release: git-tree-check
 dist-fedora-release-push: export DIST_PUSH="1"
 dist-fedora-release-push: dist-fedora-release
 
-.PHONY: dist-brew dist-koji
-dist-brew : BUILD_FLAGS ?= $(BREW_FLAGS) $(TEST_FLAGS)
-dist-koji : BUILD_FLAGS ?= $(KOJI_FLAGS) $(TEST_FLAGS)
-distg-brew: BUILD_FLAGS ?= $(BREW_FLAGS) $(TEST_FLAGS)
-distg-koji: BUILD_FLAGS ?= $(KOJI_FLAGS) $(TEST_FLAGS)
-
 dist-vr-check:
 	@# builds may include a s390x+zfcpdump arch build.  UTS_RELEASE can only have a
 	@# version-release string with max 64 chars.  The version-release for s390x+zfcpdump
diff --git a/redhat/Makefile.variables b/redhat/Makefile.variables
index blahblah..blahblah 100644
--- a/redhat/Makefile.variables
+++ b/redhat/Makefile.variables
@@ -82,3 +82,7 @@ BUILD_TARGET ?=
 
 # This sets the koji/brew configuration profile variable.
 BUILD_PROFILE ?=
+
+# This sets the koji|brew build flags for the dist[g]-koji|brew targets.  These
+# options are passed directly to the brew and koji commands in those targets.
+BUILD_FLAGS ?=

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1641

[OS-BUILD PATCHv2 9/24] redhat/Makefile: Move BUILD to Makefile.variables

[Prarit Bhargava (via Email Bridge)]

From: Prarit Bhargava <prarit(a)redhat.com&gt;

redhat/Makefile: Move BUILD to Makefile.variables

Move BUILD to Makefile.variables.

Signed-off-by: Prarit Bhargava <prarit(a)redhat.com&gt;

diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -101,7 +101,9 @@ endif
 KVERSION:=$(RPMKVERSION).$(RPMKPATCHLEVEL).$(RPMKSUBLEVEL)
 RPMVERSION:=$(KVERSION)
 
-BUILD:=$(RHEL_RELEASE)
+ifndef BUILD
+  BUILD:=$(RHEL_RELEASE)
+endif
 SPECFILE:=$(PACKAGE_NAME).spec
 RPM:=$(REDHAT)/rpm
 SRPMS:=$(RPM)/SRPMS
diff --git a/redhat/Makefile.variables b/redhat/Makefile.variables
index blahblah..blahblah 100644
--- a/redhat/Makefile.variables
+++ b/redhat/Makefile.variables
@@ -86,3 +86,7 @@ BUILD_PROFILE ?=
 # This sets the koji|brew build flags for the dist[g]-koji|brew targets.  These
 # options are passed directly to the brew and koji commands in those targets.
 BUILD_FLAGS ?=
+
+# This sets the incremental build version value in the rpm NVR.  If unset, this
+# defaults to RHEL_RELEASE from Makefile.rhelver
+BUILD ?=

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1641

[OS-BUILD PATCHv2 10/24] redhat/Makefile: Move PREBUILD_GIT_ONLY to Makefile.variables

[Prarit Bhargava (via Email Bridge)]

From: Prarit Bhargava <prarit(a)redhat.com&gt;

redhat/Makefile: Move PREBUILD_GIT_ONLY to Makefile.variables

Move PREBUILD_GIT_ONLY to Makefile.variables.

Signed-off-by: Prarit Bhargava <prarit(a)redhat.com&gt;

diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -79,10 +79,12 @@ ifeq ($(SNAPSHOT),1)
     PREBUILD:=0$(KEXTRAVERSION).
     RPMKPATCHLEVEL:=$(shell expr $(RPMKPATCHLEVEL) + 1)
   endif
-  ifneq ($(filter $(MAKECMDGOALS),dist-git-test dist-git),)
-    PREBUILD_GIT_ONLY ?= 0
-  else
-    PREBUILD_GIT_ONLY ?= 1
+  ifndef PREBUILD_GIT_ONLY
+    ifneq ($(filter $(MAKECMDGOALS),dist-git-test dist-git),)
+      PREBUILD_GIT_ONLY:=0
+    else
+      PREBUILD_GIT_ONLY:=1
+    endif
   endif
   ifeq ($(PREBUILD_GIT_ONLY),1)
     PREBUILD:=$(PREBUILD)$(MARKER).
diff --git a/redhat/Makefile.variables b/redhat/Makefile.variables
index blahblah..blahblah 100644
--- a/redhat/Makefile.variables
+++ b/redhat/Makefile.variables
@@ -90,3 +90,9 @@ BUILD_FLAGS ?=
 # This sets the incremental build version value in the rpm NVR.  If unset, this
 # defaults to RHEL_RELEASE from Makefile.rhelver
 BUILD ?=
+
+# Builds may include a s390x+zfcpdump arch build, which results in the build
+# failing because the UTS_RELEASE field exceeded 64 chars.  This variable can
+# be set to 1 to decrease the kernel UTS_RELEASE and PKGRELEASE by 11 characters
+# (YYYYMMDDgit).
+PREBUILD_GIT_ONLY ?=

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1641

[OS-BUILD PATCHv2 11/24] redhat/Makefile: Move RHGIT* variables to Makefile.variables

[Prarit Bhargava (via Email Bridge)]

From: Prarit Bhargava <prarit(a)redhat.com&gt;

redhat/Makefile: Move RHGIT* variables to Makefile.variables

Mmove the RHGITURL and RHGITCOMMIT variables to Makefile.variables.

Signed-off-by: Prarit Bhargava <prarit(a)redhat.com&gt;

diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -207,9 +207,6 @@ endif
 
 FLAVOR =
 
-RHGITURL?=$(shell $(GIT) config rhg.url || $(GIT) config remote.origin.url)
-RHGITCOMMIT?=$(shell $(GIT) log -1 --pretty=format:%H)
-
 # this section is needed in order to make O= to work
 _OUTPUT := ..
 ifeq ("$(origin O)", "command line")
diff --git a/redhat/Makefile.variables b/redhat/Makefile.variables
index blahblah..blahblah 100644
--- a/redhat/Makefile.variables
+++ b/redhat/Makefile.variables
@@ -96,3 +96,12 @@ BUILD ?=
 # be set to 1 to decrease the kernel UTS_RELEASE and PKGRELEASE by 11 characters
 # (YYYYMMDDgit).
 PREBUILD_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
+# rhg.url.
+RHGITURL?=$(shell $(GIT) config rhg.url || $(GIT) config remote.origin.url)
+
+# This sets the base commit ID for distg-* targets, and must be set on the
+# commandline with distg-* targets.
+RHGITCOMMIT?=$(shell $(GIT) log -1 --pretty=format:%H)

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1641

[OS-BUILD PATCHv2 12/24] redhat/Makefile: Move RHJOBS to Makefile.variables

[Prarit Bhargava (via Email Bridge)]

From: Prarit Bhargava <prarit(a)redhat.com&gt;

redhat/Makefile: Move RHJOBS to Makefile.variables

Move RHJOBS to Makefile.variables.

Signed-off-by: Prarit Bhargava <prarit(a)redhat.com&gt;

diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -222,13 +222,15 @@ KABIDW := $(REDHAT)/kabi-dwarf
 
 include Makefile.cross
 
-RHJOBS?=$(shell j=$$(echo $(MAKEFLAGS) | grep -Eo "\ -j[0-9]*" | xargs ); \
-	if [ -z "$${j}" ]; then \
-		echo "1"; \
-	else \
-		j=$$(echo "$${j}" | tr -d "\-j"); \
-		[ -z "$${j}" ] && nproc --all || echo $${j}; \
-	fi)
+ifndef RHJOBS
+  RHJOBS=$(shell j=$$(echo $(MAKEFLAGS) | grep -Eo "\ -j[0-9]*" | xargs ); \
+	  if [ -z "$${j}" ]; then \
+	  	echo "1"; \
+	  else \
+	  	j=$$(echo "$${j}" | tr -d "\-j"); \
+	  	[ -z "$${j}" ] && nproc --all || echo $${j}; \
+	  fi)
+endif
 
 ifndef BUILD_FLAGS
   ifeq ($(filter $(MAKECMDGOALS),dist-brew distg-brew),)
diff --git a/redhat/Makefile.variables b/redhat/Makefile.variables
index blahblah..blahblah 100644
--- a/redhat/Makefile.variables
+++ b/redhat/Makefile.variables
@@ -100,8 +100,12 @@ PREBUILD_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
 # rhg.url.
-RHGITURL?=$(shell $(GIT) config rhg.url || $(GIT) config remote.origin.url)
+RHGITURL ?= $(shell $(GIT) config rhg.url || $(GIT) config remote.origin.url)
 
 # This sets the base commit ID for distg-* targets, and must be set on the
 # commandline with distg-* targets.
-RHGITCOMMIT?=$(shell $(GIT) log -1 --pretty=format:%H)
+RHGITCOMMIT ?= $(shell $(GIT) log -1 --pretty=format:%H)
+
+# This sets the number of threads that scripts called by Makefile targets can
+# use.  By default, this variable is set by the makefile '-j' parameter.
+RHJOBS ?=

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1641

[OS-BUILD PATCHv2 13/24] redhat/Makefile: Move NO_CONFIGCHECKS to Makefile.variables

[Prarit Bhargava (via Email Bridge)]

From: Prarit Bhargava <prarit(a)redhat.com&gt;

redhat/Makefile: Move NO_CONFIGCHECKS to Makefile.variables

Move the NO_CONFIGCHECKS variable to Makefile.variables.

Signed-off-by: Prarit Bhargava <prarit(a)redhat.com&gt;

diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -196,7 +196,7 @@ else
   endif
 endif
 
-ifeq ("$(NO_CONFIGCHECKS)","1")
+ifdef NO_CONFIGCHECKS
    PROCESS_CONFIGS_OPTS=
    PROCESS_CONFIGS_CHECK_OPTS=
    BUILDOPTS += -configchecks
diff --git a/redhat/Makefile.variables b/redhat/Makefile.variables
index blahblah..blahblah 100644
--- a/redhat/Makefile.variables
+++ b/redhat/Makefile.variables
@@ -109,3 +109,6 @@ RHGITCOMMIT ?= $(shell $(GIT) log -1 --pretty=format:%H)
 # This sets the number of threads that scripts called by Makefile targets can
 # use.  By default, this variable is set by the makefile '-j' parameter.
 RHJOBS ?=
+
+# This disables the CONFIG error checking in redhat/configs/process_configs.sh.
+NO_CONFIGCHECKS ?=

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1641

[OS-BUILD PATCHv2 14/24] redhat/Makefile: Remove STAMP_VERSION

[Prarit Bhargava (via Email Bridge)]

From: Prarit Bhargava <prarit(a)redhat.com&gt;

redhat/Makefile: Remove STAMP_VERSION

STAMP_VERSION can be replaced with KVERSION.

Remove STAMP_VERSION.

Signed-off-by: Prarit Bhargava <prarit(a)redhat.com&gt;

diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -5,10 +5,10 @@ TOPDIR:=$(shell $(GIT) rev-parse --show-toplevel)
 REDHAT:=$(TOPDIR)/redhat
 include $(TOPDIR)/Makefile.rhelver
 
-RPMBUILD := $(shell if [ -x "/usr/bin/rpmbuild" ]; then echo rpmbuild; \
-                   else echo rpm; fi)
+RPMBUILD:=$(shell if [ -x "/usr/bin/rpmbuild" ]; then echo rpmbuild; \
+                  else echo rpm; fi)
 
-MACH :=  $(shell uname -m)
+MACH:=$(shell uname -m)
 RPMKVERSION:=$(shell $(GIT) show $(HEAD):Makefile | sed -ne '/^VERSION\ =\
/{s///;p;q}')
 RPMKPATCHLEVEL:=$(shell $(GIT) show $(HEAD):Makefile | sed -ne '/^PATCHLEVEL\ =\
/{s///;p;q}')
 RPMKSUBLEVEL:=$(shell $(GIT) show $(HEAD):Makefile | sed -ne '/^SUBLEVEL\ =\
/{s///;p;q}')
@@ -113,8 +113,6 @@ SOURCES:=$(RPM)/SOURCES
 TESTPATCH:=$(REDHAT)/linux-kernel-test.patch
 ARCH_LIST=aarch64 ppc64le s390x x86_64
 
-STAMP_VERSION:=$(KVERSION)
-
 LOCVERFILE:=../localversion
 # create an empty localversion file if you don't want a local buildid
 ifneq ($(wildcard $(LOCVERFILE)),)
@@ -523,7 +521,7 @@ dist-release-finish: setup-source
 	@cp $(SOURCES)/$(CHANGELOG) $(REDHAT)/$(CHANGELOG)
 	@$(GIT) add $(REDHAT)/$(CHANGELOG)
 	@$(GIT) add $(REDHAT)/marker
-	@$(GIT) commit -s ../Makefile.rhelver $(REDHAT)/marker $(REDHAT)/$(CHANGELOG)
$(PACKAGE_NAME).spec.template -m "[redhat]
$(PACKAGE_NAME)-$(STAMP_VERSION)-$(PKGRELEASE)"
+	@$(GIT) commit -s ../Makefile.rhelver $(REDHAT)/marker $(REDHAT)/$(CHANGELOG)
$(PACKAGE_NAME).spec.template -m "[redhat]
$(PACKAGE_NAME)-$(KVERSION)-$(PKGRELEASE)"
 dist-release-changed: setup-source
 	@cp $(SOURCES)/$(CHANGELOG) $(REDHAT)/$(CHANGELOG)
 	@echo $(MARKER) > $(REDHAT)/marker
@@ -539,7 +537,7 @@ dist-release-changed: setup-source
 dist-release: dist-clean-sources
 	@$(MAKE) dist-release-changed
 dist-release-tag:
-	@$(GIT) tag -a -m "$(PACKAGE_NAME)-$(STAMP_VERSION)-$(PKGRELEASE)"
$(PACKAGE_NAME)-$(STAMP_VERSION)-$(PKGRELEASE)
+	@$(GIT) tag -a -m "$(PACKAGE_NAME)-$(KVERSION)-$(PKGRELEASE)"
$(PACKAGE_NAME)-$(KVERSION)-$(PKGRELEASE)
 
 git-tree-check:
 	@if test -n "$(DIST_PUSH)" && test -z "$(shell $(GIT) remote
get-url gitlab 2>/dev/null)"; then \

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1641

[OS-BUILD PATCHv2 15/24] redhat/Makefile: Remove extra DIST_BRANCH

[Prarit Bhargava (via Email Bridge)]

From: Prarit Bhargava <prarit(a)redhat.com&gt;

redhat/Makefile: Remove extra DIST_BRANCH

This is already declared in Makefile.variables.

Signed-off-by: Prarit Bhargava <prarit(a)redhat.com&gt;

diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -547,7 +547,6 @@ git-tree-check:
 	@$(GIT) diff-index --quiet HEAD || \
 		{ echo -e "Dirty tree, please clean before merging.\n"; exit 1; }
 
-DIST_BRANCH ?= "os-build"
 dist-merge-upstream: git-tree-check
 	@if test "$(shell $(GIT) branch --show-current)" !=
"$(DIST_BRANCH)"; then \
 		echo -e "Please checkout $(DIST_BRANCH) branch before merging.\n"; \

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1641

[OS-BUILD PATCHv2 16/24] redhat/scripts/create-tarball.sh: Use Makefile TARBALL variable

[Prarit Bhargava (via Email Bridge)]

From: Prarit Bhargava <prarit(a)redhat.com&gt;

redhat/scripts/create-tarball.sh: Use Makefile TARBALL variable

Use the Makefile TARBALL variable instead of passing it as an argument.

Signed-off-by: Prarit Bhargava <prarit(a)redhat.com&gt;

diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -366,9 +366,9 @@ dist-stub-key:
 .PHONY:	$(TARBALL)
 $(TARBALL):
 	@if [ $(SINGLE_TARBALL) -eq 1 ]; then \
-		scripts/create-tarball.sh $(GITID) $(TARBALL) linux-$(KVERSION)-$(PKGRELEASE); \
+		scripts/create-tarball.sh $(GITID) linux-$(KVERSION)-$(PKGRELEASE); \
 	else \
-		scripts/create-tarball.sh $(MARKER) $(TARBALL) linux-$(TARFILE_RELEASE); \
+		scripts/create-tarball.sh $(MARKER) linux-$(TARFILE_RELEASE); \
 	fi
 
 .PHONY: $(KABI_TARBALL)
diff --git a/redhat/scripts/create-tarball.sh b/redhat/scripts/create-tarball.sh
index blahblah..blahblah 100755
--- a/redhat/scripts/create-tarball.sh
+++ b/redhat/scripts/create-tarball.sh
@@ -1,8 +1,7 @@
 #!/bin/sh
 
 GITID=$1
-TARBALL=$2
-DIR=$3
+DIR=$2
 
 # shellcheck disable=SC1083
 XZ_THREADS=$(rpm --eval %{_smp_mflags} | sed -e 's!^-j!--threads !')

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1641

[OS-BUILD PATCHv2 17/24] redhat/Makefile.variables: Default RHGITCOMMIT to HEAD

[Prarit Bhargava (via Email Bridge)]

From: Prarit Bhargava <prarit(a)redhat.com&gt;

redhat/Makefile.variables: Default RHGITCOMMIT to HEAD

RHGITCOMMIT is equal to HEAD.  Rather than recalculating it, just set it
to HEAD by default.

Signed-off-by: Prarit Bhargava <prarit(a)redhat.com&gt;

diff --git a/redhat/Makefile.variables b/redhat/Makefile.variables
index blahblah..blahblah 100644
--- a/redhat/Makefile.variables
+++ b/redhat/Makefile.variables
@@ -104,7 +104,7 @@ RHGITURL ?= $(shell $(GIT) config rhg.url || $(GIT) config
remote.origin.url)
 
 # This sets the base commit ID for distg-* targets, and must be set on the
 # commandline with distg-* targets.
-RHGITCOMMIT ?= $(shell $(GIT) log -1 --pretty=format:%H)
+RHGITCOMMIT ?= $(HEAD)
 
 # This sets the number of threads that scripts called by Makefile targets can
 # use.  By default, this variable is set by the makefile '-j' parameter.

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1641

[OS-BUILD PATCHv2 18/24] redhat/Makefile: Cleanup KABI* variables.

[Prarit Bhargava (via Email Bridge)]

From: Prarit Bhargava <prarit(a)redhat.com&gt;

redhat/Makefile: Cleanup KABI* variables.

There is no need for both TARBALL and TARFILE variables.

Cleanup the KABI* variables.

Extra fix: Move KABIDW to the other KABI variables.

Signed-off-by: Prarit Bhargava <prarit(a)redhat.com&gt;

diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -167,10 +167,9 @@ endif
 TARFILE:=linux-$(TARFILE_RELEASE).tar.xz
 TARBALL:=$(REDHAT)/$(TARFILE)
 DISTRO_BUILD:=$(PREBUILD)$(shell echo $(BUILD) | sed -e
's|\(^[0-9]\{1,4\}\)\..*|\1|')
-KABI_TARFILE:=kernel-abi-stablelists-$(KVERSION)-$(DISTRO_BUILD).tar.bz2
-KABI_TARBALL:=$(REDHAT)/rpm/SOURCES/$(KABI_TARFILE)
-KABIDW_TARFILE:=kernel-kabi-dw-$(KVERSION)-$(DISTRO_BUILD).tar.bz2
-KABIDW_TARBALL:=$(REDHAT)/rpm/SOURCES/$(KABIDW_TARFILE)
+KABI_TARBALL:=$(SOURCES)/kernel-abi-stablelists-$(KVERSION)-$(DISTRO_BUILD).tar.bz2
+KABIDW := $(REDHAT)/kabi-dwarf
+KABIDW_TARBALL:=$(SOURCES)/kernel-kabi-dw-$(KVERSION)-$(DISTRO_BUILD).tar.bz2
 
 CHANGELOG:=$(PACKAGE_NAME).changelog-$(RHEL_MAJOR).$(RHEL_MINOR)
 CHANGELOG_PREV:=$(PACKAGE_NAME).changelog-$(RHEL_MAJOR).$(shell expr $(RHEL_MINOR) - 1)
@@ -373,14 +372,14 @@ $(TARBALL):
 
 .PHONY: $(KABI_TARBALL)
 $(KABI_TARBALL):
-	@(cd kabi && tar cjf $(SOURCES)/$(KABI_TARFILE) kabi-rhel$(RHEL_MAJOR)*
kabi-current)
+	@(cd kabi && tar cjf $(KABI_TARBALL) kabi-rhel$(RHEL_MAJOR)* kabi-current)
 
 .PHONY: $(KABIDW_TARBALL)
 $(KABIDW_TARBALL):
 	@if [ ! -d $(KABIDW)/base ]; then \
 		mkdir -p $(KABIDW)/base; \
 	fi
-	@(cd kabi-dwarf && tar cjf $(SOURCES)/$(KABIDW_TARFILE) base run_kabi-dw.sh)
+	@(cd kabi-dwarf && tar cjf $(KABIDW_TARBALL) base run_kabi-dw.sh)
 
 
 dist-tarball: $(TARBALL)
@@ -477,11 +476,11 @@ sources-rh: $(TARBALL) generate-testpatch-tmp setup-source
dist-configs-check
 		cp kabi/Module.kabi_$$KABIARCH $(SOURCES)/; \
 		cp kabi/Module.kabi_dup_$$KABIARCH $(SOURCES)/; \
 	done
-	@(cd kabi && tar cjf $(SOURCES)/$(KABI_TARFILE) kabi-rhel$(RHEL_MAJOR)*
kabi-current)
+	@(cd kabi && tar cjf $(KABI_TARBALL) kabi-rhel$(RHEL_MAJOR)* kabi-current)
 	@if [ ! -d $(KABIDW)/base ]; then \
 		mkdir -p $(KABIDW)/base; \
 	fi
-	@(cd kabi-dwarf && tar cjf $(SOURCES)/$(KABIDW_TARFILE) base run_kabi-dw.sh)
+	@(cd kabi-dwarf && tar cjf $(KABIDW_TARBALL) base run_kabi-dw.sh)
 
 dist-sources: dist-kabi dist-kabi-dup sources-rh
 

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1641

[OS-BUILD PATCHv2 19/24] redhat/Makefile: Remove dead comment

[Prarit Bhargava (via Email Bridge)]

From: Prarit Bhargava <prarit(a)redhat.com&gt;

redhat/Makefile: Remove dead comment

This comment no longer applies and can be dropped.

Signed-off-by: Prarit Bhargava <prarit(a)redhat.com&gt;

diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -96,10 +96,6 @@ ifeq ($(SNAPSHOT),1)
   UPSTREAM_TARBALL_NAME:=$(patsubst v%,%,$(_TAG))
 endif
 
-
-# RPMKPATCHVERSION may get adjusted if we're snapshotting
-# during the merge window so ensure this gets set after
-# we've checked for snapshots
 KVERSION:=$(RPMKVERSION).$(RPMKPATCHLEVEL).$(RPMKSUBLEVEL)
 RPMVERSION:=$(KVERSION)
 

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1641

[OS-BUILD PATCHv2 20/24] redhat/genspec.sh: Rework RPMVERSION variable

[Prarit Bhargava (via Email Bridge)]

From: Prarit Bhargava <prarit(a)redhat.com&gt;

redhat/genspec.sh: Rework RPMVERSION variable

The redhat/genspec.sh file contains $RPMVERSION and $RPM_VERSION variables
which don't match the Makefile variables.  Create a new KVERSION variable
and replace $RPMVERSION with KVERSION, and $RPM_VERSION with $RPMVERSION.

Rework the RPMVERSION variable in redhat/genspec.sh and the Makfile.

Signed-off-by: Prarit Bhargava <prarit(a)redhat.com&gt;

diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -13,6 +13,7 @@ RPMKVERSION:=$(shell $(GIT) show $(HEAD):Makefile | sed -ne
'/^VERSION\ =\ /{s//
 RPMKPATCHLEVEL:=$(shell $(GIT) show $(HEAD):Makefile | sed -ne '/^PATCHLEVEL\ =\
/{s///;p;q}')
 RPMKSUBLEVEL:=$(shell $(GIT) show $(HEAD):Makefile | sed -ne '/^SUBLEVEL\ =\
/{s///;p;q}')
 RPMKEXTRAVERSION:=$(shell $(GIT) show $(HEAD):Makefile | sed -ne '/^EXTRAVERSION\ =\
/{s///;p;q}')
+KVERSION:=$(RPMKVERSION).$(RPMKPATCHLEVEL).$(RPMKSUBLEVEL)
 GITID:= $(shell $(GIT) log --max-count=1 --pretty=format:%H $(HEAD))
 # marker is git tag which we base off of for exporting patches
 # Make sure marker uses RPMKPATCHLEVEL and RPMKEXTRAVERSION from the kernel
@@ -26,7 +27,7 @@ else
   KEXTRAVERSION:=
   ifeq ($(RPMKSUBLEVEL),0)
     MARKER:=v$(RPMKVERSION).$(RPMKPATCHLEVEL)
-    UPSTREAM_TARBALL_NAME:=$(RPMKVERSION).$(RPMKPATCHLEVEL)
+    UPSTREAM_TARBALL_NAME:=$$(RPMKVERSION).$(RPMKPATCHLEVEL)
   else
     MARKER:=v$(RPMKVERSION).$(RPMKPATCHLEVEL).$(RPMKSUBLEVEL)
     UPSTREAM_TARBALL_NAME:=$(RPMKVERSION).$(RPMKPATCHLEVEL).$(RPMKSUBLEVEL)
@@ -97,7 +98,6 @@ ifeq ($(SNAPSHOT),1)
 endif
 
 KVERSION:=$(RPMKVERSION).$(RPMKPATCHLEVEL).$(RPMKSUBLEVEL)
-RPMVERSION:=$(KVERSION)
 
 ifndef BUILD
   BUILD:=$(RHEL_RELEASE)
@@ -122,6 +122,7 @@ else
 endif
 
 PKGRELEASE:=$(PREBUILD)$(BUILD)$(BUILDID)
+RPMVERSION:=$(RPMKVERSION).$(RPMKPATCHLEVEL)-$(PKGRELEASE)
 SPECRELEASE:=$(PREBUILD)$(BUILD)%{?buildid}%{?dist}
 
 ifeq ("$(DISTRO)", "fedora")
diff --git a/redhat/genspec.sh b/redhat/genspec.sh
index blahblah..blahblah 100755
--- a/redhat/genspec.sh
+++ b/redhat/genspec.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 
 LAST_MARKER=$(cat $REDHAT/marker)
-RPMVERSION=${RPMKVERSION}.${RPMKPATCHLEVEL}
 clogf="$SOURCES/changelog"
 # hide [redhat] entries from changelog
 HIDE_REDHAT=1;
@@ -10,11 +9,10 @@ HIDE_UNSUPPORTED_ARCH=1;
 # override LC_TIME to avoid date conflicts when building the srpm
 LC_TIME=
 # STAMP=$(echo $MARKER | cut -f 1 -d '-' | sed -e "s/v//"); # unused
-RPM_VERSION="$RPMVERSION-$PKGRELEASE";
 
 echo > "$clogf"
 
-lasttag=$(git rev-list --first-parent --grep="^\[redhat\] kernel-${RPMVERSION}"
--max-count=1 HEAD)
+lasttag=$(git rev-list --first-parent --grep="^\[redhat\]
kernel-${RPMKVERSION}.${RPMKPATCHLEVEL}" --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
@@ -33,7 +31,7 @@ UPSTREAM="$(git rev-parse -q --verify origin/$UPSTREAM_BRANCH || \
 git log --topo-order --reverse --no-merges -z --format="- %s (%an)%n%b" \
 	^${UPSTREAM} "$lasttag".. -- ':!/redhat/rhdocs' | ${0%/*}/genlog.py
>> "$clogf"
 
-grep -v "tagging $RPM_VERSION" "$clogf" >
"$clogf.stripped"
+grep -v "tagging $RPMVERSION" "$clogf" >
"$clogf.stripped"
 cp "$clogf.stripped" "$clogf"
 
 if [ "$HIDE_REDHAT" = "1" ]; then
@@ -75,7 +73,7 @@ LENGTH=$(wc -l "$clogf" | awk '{print $1}')
 #left by the 'print version\n' logic above
 cname="$(git var GIT_COMMITTER_IDENT |sed 's/>.*/>/')"
 cdate="$(LC_ALL=C date +"%a %b %d %Y")"
-cversion="[$RPM_VERSION]";
+cversion="[$RPMVERSION]";
 tac "$clogf" | sed "1{/^$/d; /^- /i\
 * $cdate $cname $cversion
 	}" > "$clogf.rev"
@@ -153,10 +151,10 @@ if [ "$SINGLE_TARBALL" = 0 ]; then
 	# May need to preserve word splitting in EXCLUDE_FILES
 	# shellcheck disable=SC2086
 	git diff -p --no-renames --stat "$MARKER"..  $EXCLUDE_FILES \
-		> "$SOURCES"/patch-"$RPMVERSION"-redhat.patch
+		>
"$SOURCES"/patch-"${RPMKVERSION}.${RPMKPATCHLEVEL}"-redhat.patch
 else
 	# Need an empty file for dist-git compatibility
-	touch "$SOURCES"/patch-"$RPMVERSION"-redhat.patch
+	touch
"$SOURCES"/patch-"${RPMKVERSION}.${RPMKPATCHLEVEL}"-redhat.patch
 fi
 
 # We depend on work splitting of BUILDOPTS

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1641

[OS-BUILD PATCHv2 21/24] redhat/Makfile: Deprecate BREW_FLAGS, KOJI_FLAGS, and TEST_FLAGS

[Prarit Bhargava (via Email Bridge)]

From: Prarit Bhargava <prarit(a)redhat.com&gt;

redhat/Makfile: Deprecate BREW_FLAGS, KOJI_FLAGS, and TEST_FLAGS

The BREW_FLAGS, KOJI_FLAGS, and TEST_FLAGS variables can be replaced with
BUILD_FLAGS.  Mark these three variables for later deprecation and warn
users about their usage.

Signed-off-by: Prarit Bhargava <prarit(a)redhat.com&gt;

diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -1,3 +1,19 @@
+# deprecated variables
+ifdef BREW_FLAGS
+  # deprecated in 5.17.0
+  $(warning WARNING: BREW_FLAGS will be deprecated in a later release, use BUILD_FLAGS
instead.)
+endif
+
+ifdef KOJI_FLAGS
+  # deprecated in 5.17.0
+  $(warning WARNING: KOJI_FLAGS will be deprecated in a later release, use BUILD_FLAGS
instead.)
+endif
+
+ifdef TEST_FLAGS
+  # deprecated in 5.17.0
+  $(warning WARNING: TEST_FLAGS will be deprecated in a later release, use BUILD_FLAGS
instead.)
+endif
+
 include Makefile.variables
 
 LANG=C

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1641

[OS-BUILD PATCHv2 22/24] redhat/Makfile: Move SNAPSHOT check

[Prarit Bhargava (via Email Bridge)]

From: Prarit Bhargava <prarit(a)redhat.com&gt;

redhat/Makfile: Move SNAPSHOT check

Move the SNAPSHOT check to the only place where it can actually be "1".

Signed-off-by: Prarit Bhargava <prarit(a)redhat.com&gt;

diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -80,37 +80,35 @@ ifeq ($(VERSION_ON_UPSTREAM),1)
   _TAG:=$(shell $(GIT) describe $(MERGE_BASE))
   # a snapshot off of a tagged git is of the form [tag]-[cnt]-g[hash]
   SNAPSHOT:=$(shell echo $(_TAG) | grep -c '\-g')
-else
-  SNAPSHOT:=0
-endif
 
-ifeq ($(SNAPSHOT),1)
-  # The base for generating tags is the snapshot commit
-  MARKER:=$(shell echo $(_TAG) | awk -F "-g" '{ print $$2 }')
-  # The merge window is weird because the actual versioning hasn't
-  # been updated but we still need something that works for
-  # packaging. Fix this by bumping the patch level and marking
-  # this as rc0
-  ifeq ($(RPMKEXTRAVERSION),)
-    KEXTRAVERSION:=.rc0
-    PREBUILD:=0$(KEXTRAVERSION).
-    RPMKPATCHLEVEL:=$(shell expr $(RPMKPATCHLEVEL) + 1)
-  endif
-  ifndef PREBUILD_GIT_ONLY
-    ifneq ($(filter $(MAKECMDGOALS),dist-git-test dist-git),)
-      PREBUILD_GIT_ONLY:=0
+  ifeq ($(SNAPSHOT),1)
+    # The base for generating tags is the snapshot commit
+    MARKER:=$(shell echo $(_TAG) | awk -F "-g" '{ print $$2 }')
+    # The merge window is weird because the actual versioning hasn't
+    # been updated but we still need something that works for
+    # packaging. Fix this by bumping the patch level and marking
+    # this as rc0
+    ifeq ($(RPMKEXTRAVERSION),)
+      KEXTRAVERSION:=.rc0
+      PREBUILD:=0$(KEXTRAVERSION).
+      RPMKPATCHLEVEL:=$(shell expr $(RPMKPATCHLEVEL) + 1)
+    endif
+    ifndef PREBUILD_GIT_ONLY
+      ifneq ($(filter $(MAKECMDGOALS),dist-git-test dist-git),)
+        PREBUILD_GIT_ONLY:=0
+      else
+        PREBUILD_GIT_ONLY:=1
+      endif
+    endif
+    ifeq ($(PREBUILD_GIT_ONLY),1)
+      PREBUILD:=$(PREBUILD)$(MARKER).
     else
-      PREBUILD_GIT_ONLY:=1
+      # 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).
     endif
+    UPSTREAM_TARBALL_NAME:=$(patsubst v%,%,$(_TAG))
   endif
-  ifeq ($(PREBUILD_GIT_ONLY),1)
-    PREBUILD:=$(PREBUILD)$(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).
-  endif
-  UPSTREAM_TARBALL_NAME:=$(patsubst v%,%,$(_TAG))
 endif
 
 KVERSION:=$(RPMKVERSION).$(RPMKPATCHLEVEL).$(RPMKSUBLEVEL)

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1641

[OS-BUILD PATCHv2 23/24] redhat/Makefile: Add some descriptions

[Prarit Bhargava (via Email Bridge)]

From: Prarit Bhargava <prarit(a)redhat.com&gt;

redhat/Makefile: Add some descriptions

Add some descriptive text about some of the Makefile sections.

Signed-off-by: Prarit Bhargava <prarit(a)redhat.com&gt;

diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -1,4 +1,8 @@
-# deprecated variables
+#
+# Deprecated variables
+#
+# This section is intentionally left at the top of the Makefile so it won't be
ignored.
+#
 ifdef BREW_FLAGS
   # deprecated in 5.17.0
   $(warning WARNING: BREW_FLAGS will be deprecated in a later release, use BUILD_FLAGS
instead.)
@@ -139,6 +143,10 @@ PKGRELEASE:=$(PREBUILD)$(BUILD)$(BUILDID)
 RPMVERSION:=$(RPMKVERSION).$(RPMKPATCHLEVEL)-$(PKGRELEASE)
 SPECRELEASE:=$(PREBUILD)$(BUILD)%{?buildid}%{?dist}
 
+#
+# This conditional statement is where fedora, centos, and other (aka RHEL)
+# specific values should be set.
+#
 ifeq ("$(DISTRO)", "fedora")
   # A non-unified tarball means that the tarball is only upstream sources
   # and the patches get applied as a diff in the spec file
@@ -250,6 +258,14 @@ ifndef BUILD_FLAGS
   BUILD_FLAGS += $(TEST_FLAGS)
 endif
 
+#
+# Targets
+#
+# Do not place variable declarations below this line.  Variables are exported
+# to scripts called in the targets below and do not need to be passed on the
+# command-line.
+#
+
 default: dist-help
 
 dist-python-check:
diff --git a/redhat/Makefile.variables b/redhat/Makefile.variables
index blahblah..blahblah 100644
--- a/redhat/Makefile.variables
+++ b/redhat/Makefile.variables
@@ -1,3 +1,10 @@
+# Only the variables listed in this file, ../Makefile.rhelver, and
+# Makefile.rhpkg are available for command line modification.  There is no
+# guarantee on the stability of variables found in this file, or any other
+# redhat/ Makefile.
+#
+# Merge requests to include additional variables in _this_ file must include
+# details of why the variable must be exported.
 
 # Variables below should be changed as needed for building on a different
 # branch, or with a different upstream branch. This should be the only

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1641

[OS-BUILD PATCHv2 24/24] redhat/Makefile: Reorganize variables

[Prarit Bhargava (via Email Bridge)]

From: Prarit Bhargava <prarit(a)redhat.com&gt;

redhat/Makefile: Reorganize variables

Reorganize the variables from simple variables to complex variables.

Signed-off-by: Prarit Bhargava <prarit(a)redhat.com&gt;

diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -35,8 +35,83 @@ RPMKSUBLEVEL:=$(shell $(GIT) show $(HEAD):Makefile | sed -ne
'/^SUBLEVEL\ =\ /{s
 RPMKEXTRAVERSION:=$(shell $(GIT) show $(HEAD):Makefile | sed -ne '/^EXTRAVERSION\ =\
/{s///;p;q}')
 KVERSION:=$(RPMKVERSION).$(RPMKPATCHLEVEL).$(RPMKSUBLEVEL)
 GITID:= $(shell $(GIT) log --max-count=1 --pretty=format:%H $(HEAD))
-# marker is git tag which we base off of for exporting patches
-# Make sure marker uses RPMKPATCHLEVEL and RPMKEXTRAVERSION from the kernel
+ifndef BUILD
+  BUILD:=$(RHEL_RELEASE)
+endif
+FLAVOR=
+CURARCH := $(shell uname -m)
+ARCHCONFIG := $(shell uname -m | sed -e s/x86_64/X86_64/ \
+				     -e s/s390x/S390/ -e s/ppc.*/PPC/ )
+
+# rpm information
+SPECFILE:=$(PACKAGE_NAME).spec
+RPM:=$(REDHAT)/rpm
+SRPMS:=$(RPM)/SRPMS
+SOURCES:=$(RPM)/SOURCES
+TESTPATCH:=$(REDHAT)/linux-kernel-test.patch
+CHANGELOG:=$(PACKAGE_NAME).changelog-$(RHEL_MAJOR).$(RHEL_MINOR)
+CHANGELOG_PREV:=$(PACKAGE_NAME).changelog-$(RHEL_MAJOR).$(shell expr $(RHEL_MINOR) - 1)
+ARCH_LIST=aarch64 ppc64le s390x x86_64
+
+ifndef DISTRO
+  ifneq ($(findstring .fc,$(DIST)),)
+    DISTRO := fedora
+  else
+    DISTRO := rhel
+  endif
+endif
+
+ifndef BUILD_FLAGS
+  ifeq ($(filter $(MAKECMDGOALS),dist-brew distg-brew),)
+	BUILD_FLAGS := $(BREW_FLAGS)
+  endif
+  ifeq ($(filter $(MAKECMDGOALS),dist-koji distg-koji),)
+	BUILD_FLAGS := $(KOJI_FLAGS)
+  endif
+  BUILD_FLAGS += $(TEST_FLAGS)
+endif
+
+ifndef RHJOBS
+  RHJOBS=$(shell j=$$(echo $(MAKEFLAGS) | grep -Eo "\ -j[0-9]*" | xargs ); \
+	  if [ -z "$${j}" ]; then \
+	  	echo "1"; \
+	  else \
+	  	j=$$(echo "$${j}" | tr -d "\-j"); \
+	  	[ -z "$${j}" ] && nproc --all || echo $${j}; \
+	  fi)
+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.)
+else
+  ifeq ($(BUILDID),)
+    BUILDID:=.test
+  endif
+  $(info BUILDID is "$(BUILDID)".)
+endif
+
+# options for process_configs.sh script
+ifdef NO_CONFIGCHECKS
+   PROCESS_CONFIGS_OPTS=
+   PROCESS_CONFIGS_CHECK_OPTS=
+   BUILDOPTS += -configchecks
+else
+   PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
+   PROCESS_CONFIGS_OPTS=-n -w -c
+endif
+
+# this section is needed in order to make O= to work
+_OUTPUT := ..
+ifeq ("$(origin O)", "command line")
+  _OUTPUT := $(O)
+  _EXTRA_ARGS := O=$(_OUTPUT)
+endif
+
+# MARKER is the git tag which we base off of for exporting patches
+# Make sure MARKER uses RPMKPATCHLEVEL and RPMKEXTRAVERSION from the kernel
 # makefile as opposed to any adjusted version for snapshotting.
 ifneq ($(RPMKEXTRAVERSION),)
   MARKER:=v$(RPMKVERSION).$(RPMKPATCHLEVEL)$(RPMKEXTRAVERSION)
@@ -55,14 +130,6 @@ else
   PREBUILD:=
 endif
 
-ifndef DISTRO
-  ifneq ($(findstring .fc,$(DIST)),)
-    DISTRO := fedora
-  else
-    DISTRO := rhel
-  endif
-endif
-
 # If VERSION_ON_UPSTREAM is set, the versioning of the rpm package is based
 # on a branch tracking upstream. This allows for generating rpms
 # based on untagged releases.
@@ -115,33 +182,14 @@ ifeq ($(VERSION_ON_UPSTREAM),1)
   endif
 endif
 
-KVERSION:=$(RPMKVERSION).$(RPMKPATCHLEVEL).$(RPMKSUBLEVEL)
-
-ifndef BUILD
-  BUILD:=$(RHEL_RELEASE)
-endif
-SPECFILE:=$(PACKAGE_NAME).spec
-RPM:=$(REDHAT)/rpm
-SRPMS:=$(RPM)/SRPMS
-SOURCES:=$(RPM)/SOURCES
-TESTPATCH:=$(REDHAT)/linux-kernel-test.patch
-ARCH_LIST=aarch64 ppc64le s390x x86_64
-
-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.)
-else
-  ifeq ($(BUILDID),)
-    BUILDID:=.test
-  endif
-  $(info BUILDID is "$(BUILDID)".)
-endif
-
+DISTRO_BUILD:=$(PREBUILD)$(shell echo $(BUILD) | sed -e
's|\(^[0-9]\{1,4\}\)\..*|\1|')
+KABI_TARBALL:=$(SOURCES)/kernel-abi-stablelists-$(KVERSION)-$(DISTRO_BUILD).tar.bz2
+KABIDW := $(REDHAT)/kabi-dwarf
+KABIDW_TARBALL:=$(SOURCES)/kernel-kabi-dw-$(KVERSION)-$(DISTRO_BUILD).tar.bz2
 PKGRELEASE:=$(PREBUILD)$(BUILD)$(BUILDID)
 RPMVERSION:=$(RPMKVERSION).$(RPMKPATCHLEVEL)-$(PKGRELEASE)
 SPECRELEASE:=$(PREBUILD)$(BUILD)%{?buildid}%{?dist}
+SRPM:=$(SRPMS)/$(PACKAGE_NAME)-$(KVERSION)-$(PKGRELEASE)$(DIST).src.rpm
 
 #
 # This conditional statement is where fedora, centos, and other (aka RHEL)
@@ -185,13 +233,6 @@ endif
 
 TARFILE:=linux-$(TARFILE_RELEASE).tar.xz
 TARBALL:=$(REDHAT)/$(TARFILE)
-DISTRO_BUILD:=$(PREBUILD)$(shell echo $(BUILD) | sed -e
's|\(^[0-9]\{1,4\}\)\..*|\1|')
-KABI_TARBALL:=$(SOURCES)/kernel-abi-stablelists-$(KVERSION)-$(DISTRO_BUILD).tar.bz2
-KABIDW := $(REDHAT)/kabi-dwarf
-KABIDW_TARBALL:=$(SOURCES)/kernel-kabi-dw-$(KVERSION)-$(DISTRO_BUILD).tar.bz2
-
-CHANGELOG:=$(PACKAGE_NAME).changelog-$(RHEL_MAJOR).$(RHEL_MINOR)
-CHANGELOG_PREV:=$(PACKAGE_NAME).changelog-$(RHEL_MAJOR).$(shell expr $(RHEL_MINOR) - 1)
 
 include Makefile.rhpkg
 
@@ -234,30 +275,8 @@ CURARCH := $(shell uname -m)
 ARCHCONFIG := $(shell uname -m | sed -e s/x86_64/X86_64/ \
 				     -e s/s390x/S390/ -e s/ppc.*/PPC/ )
 
-KABIDW := $(REDHAT)/kabi-dwarf
-
 include Makefile.cross
 
-ifndef RHJOBS
-  RHJOBS=$(shell j=$$(echo $(MAKEFLAGS) | grep -Eo "\ -j[0-9]*" | xargs ); \
-	  if [ -z "$${j}" ]; then \
-	  	echo "1"; \
-	  else \
-	  	j=$$(echo "$${j}" | tr -d "\-j"); \
-	  	[ -z "$${j}" ] && nproc --all || echo $${j}; \
-	  fi)
-endif
-
-ifndef BUILD_FLAGS
-  ifeq ($(filter $(MAKECMDGOALS),dist-brew distg-brew),)
-	BUILD_FLAGS := $(BREW_FLAGS)
-  endif
-  ifeq ($(filter $(MAKECMDGOALS),dist-koji distg-koji),)
-	BUILD_FLAGS := $(KOJI_FLAGS)
-  endif
-  BUILD_FLAGS += $(TEST_FLAGS)
-endif
-
 #
 # Targets
 #

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1641

[Prarit Bhargava (via Email Bridge)]

From: Prarit Bhargava on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1641#note_8725...

Fixed.  Will push in a few minutes.

[Prarit Bhargava (via Email Bridge)]

From: Prarit Bhargava on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1641#note_8725...

Fixed.  Will push in a few minutes.

[Prarit Bhargava (via Email Bridge)]

From: Prarit Bhargava on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1641#note_8725...

Fixed.  Will push in a few minutes.

[Prarit Bhargava (via Email Bridge)]

From: Prarit Bhargava on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1641#note_8725...

v3: Fixed @hertonk-rh comments