* [Xen-devel] [PATCH] tools/Rules.mk: fix distclean
@ 2020-01-09 11:15 Paul Durrant
2020-01-09 13:52 ` Wei Liu
2020-01-10 17:51 ` Ian Jackson
0 siblings, 2 replies; 7+ messages in thread
From: Paul Durrant @ 2020-01-09 11:15 UTC (permalink / raw)
To: xen-devel; +Cc: Paul Durrant, Ian Jackson, Wei Liu
Running 'make distclean' under tools will currently result in:
tools/Rules.mk:245: *** You have to run ./configure before building or installing the tools. Stop.
This patch adds 'distclean', 'subdir-distclean%' and 'subdir-clean%' to
no-configure-targets, which allows 'make distclean' to run to completion.
Signed-off-by: Paul Durrant <pdurrant@amazon.com>
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Wei Liu <wl@xen.org>
---
tools/Rules.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/Rules.mk b/tools/Rules.mk
index 31cf419ef4..52f47be3f8 100644
--- a/tools/Rules.mk
+++ b/tools/Rules.mk
@@ -239,7 +239,7 @@ subdir-all-% subdir-clean-% subdir-install-% subdir-uninstall-%: .phony
subdir-distclean-%: .phony
$(MAKE) -C $* distclean
-no-configure-targets := clean subtree-force-update-all %-dir-force-update
+no-configure-targets := distclean subdir-distclean% clean subdir-clean% subtree-force-update-all %-dir-force-update
ifeq (,$(filter $(no-configure-targets),$(MAKECMDGOALS)))
$(XEN_ROOT)/config/Tools.mk:
$(error You have to run ./configure before building or installing the tools)
--
2.20.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [Xen-devel] [PATCH] tools/Rules.mk: fix distclean
2020-01-09 11:15 [Xen-devel] [PATCH] tools/Rules.mk: fix distclean Paul Durrant
@ 2020-01-09 13:52 ` Wei Liu
2020-01-09 14:02 ` Durrant, Paul
2020-01-10 17:51 ` Ian Jackson
1 sibling, 1 reply; 7+ messages in thread
From: Wei Liu @ 2020-01-09 13:52 UTC (permalink / raw)
To: Paul Durrant; +Cc: Anthony PERARD, xen-devel, Ian Jackson, Wei Liu
On Thu, Jan 09, 2020 at 11:15:05AM +0000, Paul Durrant wrote:
> Running 'make distclean' under tools will currently result in:
>
> tools/Rules.mk:245: *** You have to run ./configure before building or installing the tools. Stop.
>
> This patch adds 'distclean', 'subdir-distclean%' and 'subdir-clean%' to
> no-configure-targets, which allows 'make distclean' to run to completion.
>
> Signed-off-by: Paul Durrant <pdurrant@amazon.com>
Fixes: 00691c6c90b
Sorry for not noticing the breakage while reviewing that patch.
Is there a way to pattern match all targets containing "clean"?
(Would have looked into it myself but -ETIME today)
> ---
> Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> Cc: Wei Liu <wl@xen.org>
> ---
> tools/Rules.mk | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/Rules.mk b/tools/Rules.mk
> index 31cf419ef4..52f47be3f8 100644
> --- a/tools/Rules.mk
> +++ b/tools/Rules.mk
> @@ -239,7 +239,7 @@ subdir-all-% subdir-clean-% subdir-install-% subdir-uninstall-%: .phony
> subdir-distclean-%: .phony
> $(MAKE) -C $* distclean
>
> -no-configure-targets := clean subtree-force-update-all %-dir-force-update
> +no-configure-targets := distclean subdir-distclean% clean subdir-clean% subtree-force-update-all %-dir-force-update
> ifeq (,$(filter $(no-configure-targets),$(MAKECMDGOALS)))
> $(XEN_ROOT)/config/Tools.mk:
> $(error You have to run ./configure before building or installing the tools)
> --
> 2.20.1
>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Xen-devel] [PATCH] tools/Rules.mk: fix distclean
2020-01-09 13:52 ` Wei Liu
@ 2020-01-09 14:02 ` Durrant, Paul
2020-01-09 16:41 ` Wei Liu
0 siblings, 1 reply; 7+ messages in thread
From: Durrant, Paul @ 2020-01-09 14:02 UTC (permalink / raw)
To: Wei Liu; +Cc: Anthony PERARD, xen-devel, Ian Jackson
> -----Original Message-----
> From: Wei Liu <wl@xen.org>
> Sent: 09 January 2020 13:52
> To: Durrant, Paul <pdurrant@amazon.co.uk>
> Cc: xen-devel@lists.xenproject.org; Ian Jackson
> <ian.jackson@eu.citrix.com>; Wei Liu <wl@xen.org>; Anthony PERARD
> <anthony.perard@citrix.com>
> Subject: Re: [PATCH] tools/Rules.mk: fix distclean
>
> On Thu, Jan 09, 2020 at 11:15:05AM +0000, Paul Durrant wrote:
> > Running 'make distclean' under tools will currently result in:
> >
> > tools/Rules.mk:245: *** You have to run ./configure before building or
> installing the tools. Stop.
> >
> > This patch adds 'distclean', 'subdir-distclean%' and 'subdir-clean%' to
> > no-configure-targets, which allows 'make distclean' to run to
> completion.
> >
> > Signed-off-by: Paul Durrant <pdurrant@amazon.com>
>
> Fixes: 00691c6c90b
>
> Sorry for not noticing the breakage while reviewing that patch.
>
Ok. I'm sure that could be added at commit if there are no other changes needed.
> Is there a way to pattern match all targets containing "clean"?
>
> (Would have looked into it myself but -ETIME today)
I couldn't persuade filter to match against patterns with multiple % so this was the best I could come up with.
Paul
>
> > ---
> > Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> > Cc: Wei Liu <wl@xen.org>
> > ---
> > tools/Rules.mk | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/tools/Rules.mk b/tools/Rules.mk
> > index 31cf419ef4..52f47be3f8 100644
> > --- a/tools/Rules.mk
> > +++ b/tools/Rules.mk
> > @@ -239,7 +239,7 @@ subdir-all-% subdir-clean-% subdir-install-% subdir-
> uninstall-%: .phony
> > subdir-distclean-%: .phony
> > $(MAKE) -C $* distclean
> >
> > -no-configure-targets := clean subtree-force-update-all %-dir-force-
> update
> > +no-configure-targets := distclean subdir-distclean% clean subdir-clean%
> subtree-force-update-all %-dir-force-update
> > ifeq (,$(filter $(no-configure-targets),$(MAKECMDGOALS)))
> > $(XEN_ROOT)/config/Tools.mk:
> > $(error You have to run ./configure before building or installing
> the tools)
> > --
> > 2.20.1
> >
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Xen-devel] [PATCH] tools/Rules.mk: fix distclean
2020-01-09 14:02 ` Durrant, Paul
@ 2020-01-09 16:41 ` Wei Liu
2020-01-10 10:38 ` Wei Liu
0 siblings, 1 reply; 7+ messages in thread
From: Wei Liu @ 2020-01-09 16:41 UTC (permalink / raw)
To: Durrant, Paul; +Cc: Anthony PERARD, xen-devel, Ian Jackson, Wei Liu
On Thu, Jan 09, 2020 at 02:02:55PM +0000, Durrant, Paul wrote:
> > -----Original Message-----
> > From: Wei Liu <wl@xen.org>
> > Sent: 09 January 2020 13:52
> > To: Durrant, Paul <pdurrant@amazon.co.uk>
> > Cc: xen-devel@lists.xenproject.org; Ian Jackson
> > <ian.jackson@eu.citrix.com>; Wei Liu <wl@xen.org>; Anthony PERARD
> > <anthony.perard@citrix.com>
> > Subject: Re: [PATCH] tools/Rules.mk: fix distclean
> >
> > On Thu, Jan 09, 2020 at 11:15:05AM +0000, Paul Durrant wrote:
> > > Running 'make distclean' under tools will currently result in:
> > >
> > > tools/Rules.mk:245: *** You have to run ./configure before building or
> > installing the tools. Stop.
> > >
> > > This patch adds 'distclean', 'subdir-distclean%' and 'subdir-clean%' to
> > > no-configure-targets, which allows 'make distclean' to run to
> > completion.
> > >
> > > Signed-off-by: Paul Durrant <pdurrant@amazon.com>
> >
> > Fixes: 00691c6c90b
> >
> > Sorry for not noticing the breakage while reviewing that patch.
> >
>
> Ok. I'm sure that could be added at commit if there are no other changes needed.
Yes. Sure.
>
> > Is there a way to pattern match all targets containing "clean"?
> >
> > (Would have looked into it myself but -ETIME today)
>
> I couldn't persuade filter to match against patterns with multiple %
> so this was the best I could come up with.
>
OK.
Wei.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Xen-devel] [PATCH] tools/Rules.mk: fix distclean
2020-01-09 16:41 ` Wei Liu
@ 2020-01-10 10:38 ` Wei Liu
0 siblings, 0 replies; 7+ messages in thread
From: Wei Liu @ 2020-01-10 10:38 UTC (permalink / raw)
To: Durrant, Paul; +Cc: Anthony PERARD, xen-devel, Ian Jackson, Wei Liu
On Thu, Jan 09, 2020 at 04:41:06PM +0000, Wei Liu wrote:
> On Thu, Jan 09, 2020 at 02:02:55PM +0000, Durrant, Paul wrote:
> > > -----Original Message-----
> > > From: Wei Liu <wl@xen.org>
> > > Sent: 09 January 2020 13:52
> > > To: Durrant, Paul <pdurrant@amazon.co.uk>
> > > Cc: xen-devel@lists.xenproject.org; Ian Jackson
> > > <ian.jackson@eu.citrix.com>; Wei Liu <wl@xen.org>; Anthony PERARD
> > > <anthony.perard@citrix.com>
> > > Subject: Re: [PATCH] tools/Rules.mk: fix distclean
> > >
> > > On Thu, Jan 09, 2020 at 11:15:05AM +0000, Paul Durrant wrote:
> > > > Running 'make distclean' under tools will currently result in:
> > > >
> > > > tools/Rules.mk:245: *** You have to run ./configure before building or
> > > installing the tools. Stop.
> > > >
> > > > This patch adds 'distclean', 'subdir-distclean%' and 'subdir-clean%' to
> > > > no-configure-targets, which allows 'make distclean' to run to
> > > completion.
> > > >
> > > > Signed-off-by: Paul Durrant <pdurrant@amazon.com>
> > >
> > > Fixes: 00691c6c90b
> > >
> > > Sorry for not noticing the breakage while reviewing that patch.
> > >
> >
> > Ok. I'm sure that could be added at commit if there are no other changes needed.
>
> Yes. Sure.
>
> >
> > > Is there a way to pattern match all targets containing "clean"?
> > >
> > > (Would have looked into it myself but -ETIME today)
> >
> > I couldn't persuade filter to match against patterns with multiple %
> > so this was the best I could come up with.
> >
>
> OK.
If I hear no objection or suggestion for improvement today I will commit
this patch.
Wei.
>
> Wei.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Xen-devel] [PATCH] tools/Rules.mk: fix distclean
2020-01-09 11:15 [Xen-devel] [PATCH] tools/Rules.mk: fix distclean Paul Durrant
2020-01-09 13:52 ` Wei Liu
@ 2020-01-10 17:51 ` Ian Jackson
2020-01-14 11:24 ` Wei Liu
1 sibling, 1 reply; 7+ messages in thread
From: Ian Jackson @ 2020-01-10 17:51 UTC (permalink / raw)
To: Paul Durrant; +Cc: xen-devel, Wei Liu
Paul Durrant writes ("[PATCH] tools/Rules.mk: fix distclean"):
> Running 'make distclean' under tools will currently result in:
>
> tools/Rules.mk:245: *** You have to run ./configure before building or installing the tools. Stop.
>
> This patch adds 'distclean', 'subdir-distclean%' and 'subdir-clean%' to
> no-configure-targets, which allows 'make distclean' to run to completion.
This seems sound to me, even though I think in the case where it makes
a difference, `make distclean' will end up skipping most of the tools
stuff since the makefiles aren't present.
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Wei, do you agree with my analysis ?
Ian.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Xen-devel] [PATCH] tools/Rules.mk: fix distclean
2020-01-10 17:51 ` Ian Jackson
@ 2020-01-14 11:24 ` Wei Liu
0 siblings, 0 replies; 7+ messages in thread
From: Wei Liu @ 2020-01-14 11:24 UTC (permalink / raw)
To: Ian Jackson; +Cc: xen-devel, Paul Durrant, Wei Liu
On Fri, Jan 10, 2020 at 05:51:06PM +0000, Ian Jackson wrote:
> Paul Durrant writes ("[PATCH] tools/Rules.mk: fix distclean"):
> > Running 'make distclean' under tools will currently result in:
> >
> > tools/Rules.mk:245: *** You have to run ./configure before building or installing the tools. Stop.
> >
> > This patch adds 'distclean', 'subdir-distclean%' and 'subdir-clean%' to
> > no-configure-targets, which allows 'make distclean' to run to completion.
>
> This seems sound to me, even though I think in the case where it makes
> a difference, `make distclean' will end up skipping most of the tools
> stuff since the makefiles aren't present.
>
> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
>
> Wei, do you agree with my analysis ?
Yes.
Wei.
>
> Ian.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-01-14 11:25 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-09 11:15 [Xen-devel] [PATCH] tools/Rules.mk: fix distclean Paul Durrant
2020-01-09 13:52 ` Wei Liu
2020-01-09 14:02 ` Durrant, Paul
2020-01-09 16:41 ` Wei Liu
2020-01-10 10:38 ` Wei Liu
2020-01-10 17:51 ` Ian Jackson
2020-01-14 11:24 ` Wei Liu
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.