[OS-BUILD PATCHv2 0/2] redhat: override `make help` to include dist-help

[Jonathan Toppins (via Email Bridge)]

From: Jonathan Toppins on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2144

Override the upstream kernel `make help` target so we can inject
distribution targets at the top of the help output.

Signed-off-by: Jonathan Toppins

---
 redhat/Makefile |   2 +-
 makefile        |  14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

[OS-BUILD PATCHv2 1/2] redhat: make RHTEST stricter

[Jonathan Toppins (via Email Bridge)]

From: Jonathan Toppins

redhat: make RHTEST stricter

The test would originally match on any `-n` that existed in the
MAKEFLAGS variable. This is not correct.

Signed-off-by: Jonathan Toppins

diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -19,7 +19,7 @@ SPECRELEASED_KERNEL=$(RELEASED_KERNEL)
 SPECINCLUDE_FEDORA_FILES=$(INCLUDE_FEDORA_FILES)
 SPECINCLUDE_RHEL_FILES=$(INCLUDE_RHEL_FILES)

-ifneq (,$(findstring n,$(MAKEFLAGS)))
+ifneq (,$(findstring n,$(filter-out --%,$(MAKEFLAGS))))
   # Do not set RHTEST on the command line. Use the make command built-in options
   # -n, --just-print, --dry-run, --recon on the command line.
   RHTEST=1

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

[OS-BUILD PATCHv2 2/2] redhat: override `make help` to include dist-help

[Jonathan Toppins (via Email Bridge)]

From: Jonathan Toppins

redhat: override `make help` to include dist-help

Override the upstream kernel `make help` target so we can inject
distribution targets at the top of the help output.

Signed-off-by: Jonathan Toppins

diff --git a/makefile b/makefile
index blahblah..blahblah 100644
--- a/makefile
+++ b/makefile
@@ -1,16 +1,24 @@
-ifeq ($(filter dist-% distg-%,$(MAKECMDGOALS)),)
+ifeq ($(filter help dist-% distg-%,$(MAKECMDGOALS)),)
    include Makefile
 endif

+MAKEFLAGS += --no-print-directory
 _OUTPUT := "."
 # this section is needed in order to make O= to work
 ifeq ("$(origin O)", "command line")
   _OUTPUT := "$(abspath $(O))"
   _EXTRA_ARGS := O=$(_OUTPUT)
 endif
+help::
+	@echo "## Distribution Targets"
+	@$(MAKE) -C redhat dist-help
+	@echo ""
+	@echo "## Kernel Targets"
+	@$(MAKE) -f Makefile $(@)
+
 dist-%::
-	$(MAKE) -C redhat $(@) $(_EXTRA_ARGS)
+	@$(MAKE) -C redhat $(@) $(_EXTRA_ARGS)

distg-%::
-	$(MAKE) -C redhat $(@) $(_EXTRA_ARGS)
+	@$(MAKE) -C redhat $(@) $(_EXTRA_ARGS)

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

[Patrick Talbert (via Email Bridge)]

From: Patrick Talbert on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2144#note_1172094...

Thank you all.