[OS-BUILD PATCHv2 0/24] redhat/Makefile: Cleanup variables
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>
---
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(-)