From: Scott Weaver <scweaver@xxxxxxxxxx>
Revert "Merge branch 'ark-make-help' into 'os-build'"
This reverts commit f11ef857288e28ec3859e4a6af74506b914d85b7, reversing
changes made to a6c76faa127a684197ec2febba863c856df93c12.
diff --git a/makefile b/makefile
index blahblah..blahblah 100644
--- a/makefile
+++ b/makefile
@@ -1,24 +1,16 @@
-ifeq ($(filter help dist-% distg-%,$(MAKECMDGOALS)),)
+ifeq ($(filter 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)
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,$(filter-out --%,$(MAKEFLAGS))))
+ifneq (,$(findstring n,$(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/2158
_______________________________________________
kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx
Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx
Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
