From: Jonathan Toppins jtoppins@redhat.com
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 jtoppins@redhat.com
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
From: Jonathan Toppins on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2144#note_1169391...
Don't know what you expect me to do about a failed merge label, without some sort of log.
From: John B. Wyatt IV on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2144#note_1169635...
@jtoppins_redhat according to this there was a missing file it tried to copy. https://gitlab.com/redhat/red-hat-ci-tools/kernel/cki-internal-pipelines/cki... trusted-contributors/-/jobs/3311313880
From: Jonathan Toppins on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2144#note_1169651...
Doesn't look like anything I touched.
From: Patrick Talbert on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2144#note_1171180...
Actually, the patch seems to break `make dist-srpm` when it runs the `sources- rh` make target. I am still trying to sort out why...
From: Jonathan Toppins on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2144#note_1171422...
The only change that would even have a possibility is the `MAKEFLAGS += --no- print-directory` change. I don't see why not printing the directory descending into would cause an issue with dist-srpm.
From: Don Zickus on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2144#note_1171514...
Oddly commenting that out, allows the dist-configs-check target to run and successfully generate the kernel-*.configs that are failing to copy over. Still investigating.
From: Don Zickus on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2144#note_1171535...
@jtoppins_redhat - found it. https://gitlab.com/cki-project/kernel- ark/-/blob/os-build/redhat/Makefile#L22-26
You are being bitten by @prarit RHTEST checker. It looks for a '-n' and thinks it is a self-test that will skip building configs (hence the copy failures). '--no-print-directory' has a -n in it.
From: Don Zickus on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2144#note_1171547...
@prarit @jtoppins_redhat - this change should fix it
-ifneq (,$(findstring n,$(MAKEFLAGS))) +ifneq (,$(findstring n,$(filter-out --%,$(MAKEFLAGS))))
From: Jonathan Toppins on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2144#note_1171607...
Nice find. How would you like me to deal with it? Create a new commit, rebase, something else?
From: Prarit Bhargava on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2144#note_1171642...
That looks like it keeps "-n" detection working. @jtoppins_redhat just add a new commit explaining what dzickus found (--no-print-directory, etc.)
kernel@lists.fedoraproject.org
-
Don Zickus (via Email Bridge) -
John B. Wyatt IV (via Email Bridge)
-
Jonathan Toppins (via Email Bridge)
-
Patrick Talbert (via Email Bridge)
-
Prarit Bhargava (via Email Bridge)