Re: [OS-BUILD PATCH] Revert "Merge branch 'ark-make-help' into 'os-build'"
From: Jonathan Toppins on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2158#note_1180311795
It won't work without the second colon either as make doesn't like rules that
rewrite previously defined rules. The issue is the upstream kernel Makefile is
included and the help target is being defined. The solution is to not define
the `help:` target when Makefile is included.
Another possible solution is to use submake for all targets, maybe something
like:
```
# if only upstream goals or empty in $(MAKECMDGOALS)
%:
$(MAKE) -f Makefile $(MAKECMDGOALS)
# else
help:
# do help goal
_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
dist-%::
$(MAKE) -C redhat $(@) $(_EXTRA_ARGS)
distg-%::
$(MAKE) -C redhat $(@) $(_EXTRA_ARGS)
# endif
```
This obviously prevents someone from doing something like `make dist-brew
mrproper`, I don't know how many are doing that.
A longer term solution is to convince upstream to reserve the `dist%:` target
namespace and use an optional file `scripts/Makefile.dist` which would
implement the `dist%` targets. Then the standard upstream help and other
infrastructure could be directly extended to present more information if this
optional Makefile.dist file exists.
___
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
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@lists.fedoraproject.org
Do not reply to spam, report it:
https://pagure.io/fedora-infrastructure/new_issue
Re: [OS-BUILD PATCH] Revert "Merge branch 'ark-make-help' into 'os-build'"
From: Scott Weaver on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2158#note_1180141884 @clrkwllms, Yes and also running make dist-rpms on aarch64 I ran into it (but dist-rpms worked on x86). ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
Re: [OS-BUILD PATCH] Revert "Merge branch 'ark-make-help' into 'os-build'"
Scott, Were you seeing the failure using 'make mrproper'? (that's where i saw it) Clark On Mon, Nov 21, 2022 at 10:14 AM Prarit Bhargava (via Email Bridge) < cki-git...@redhat.com> wrote: > From: Prarit Bhargava on gitlab.com > > https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2158#note_1180048991 > > @jtoppins_redhat FYI. > ___ > kernel mailing list -- kernel@lists.fedoraproject.org > To unsubscribe send an email to kernel-le...@lists.fedoraproject.org > 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@lists.fedoraproject.org > Do not reply to spam, report it: > https://pagure.io/fedora-infrastructure/new_issue > ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
Re: [OS-BUILD PATCH] Revert "Merge branch 'ark-make-help' into 'os-build'"
From: Prarit Bhargava on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2158#note_1180048991 @jtoppins_redhat FYI. ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
Re: [OS-BUILD PATCH] Revert "Merge branch 'ark-make-help' into 'os-build'"
From: Don Zickus on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2158#note_1179935350 Unfortunate. Let's discuss this at our weekly meeting. ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCH] Revert "Merge branch 'ark-make-help' into 'os-build'"
From: Scott Weaver
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@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
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@lists.fedoraproject.org
Do not reply to spam, report it:
https://pagure.io/fedora-infrastructure/new_issue
