* [PATCH] firmware/shim : filter output files during Xen tree setup
@ 2018-07-20 21:15 Christopher Clark
2018-07-23 8:17 ` Wei Liu
` (2 more replies)
0 siblings, 3 replies; 11+ messages in thread
From: Christopher Clark @ 2018-07-20 21:15 UTC (permalink / raw)
To: xen-devel; +Cc: wei.liu2, ian.jackson
Exclude named output files from the Xen tree setup.
The linkfarm.stamp content will differ between top level "make"
and "make install" invocations, due to the introduction of these
output files that are produced during the "make" build.
Filter these out to prevent an unnecessary rebuild of the shim during
"make install".
Signed-off-by: Christopher Clark <christopher.clark6@baesystems.com>
---
tools/firmware/xen-dir/Makefile | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/tools/firmware/xen-dir/Makefile b/tools/firmware/xen-dir/Makefile
index 84648c3..e490dca 100644
--- a/tools/firmware/xen-dir/Makefile
+++ b/tools/firmware/xen-dir/Makefile
@@ -11,6 +11,9 @@ D=xen-root
LINK_DIRS=config xen
LINK_FILES=Config.mk
+# Files to exclude from the link farm
+EXCLUDE_FILES=xen xen.gz xen-syms xen-syms.map efi.lds xen.lds mkelf32 mkreloc
+
DEP_DIRS=$(foreach i, $(LINK_DIRS), $(XEN_ROOT)/$(i))
DEP_FILES=$(foreach i, $(LINK_FILES), $(XEN_ROOT)/$(i))
@@ -26,7 +29,8 @@ linkfarm.stamp: $(DEP_DIRS) $(DEP_FILES) FORCE
$(foreach d, $(LINK_DIRS), \
(cd $(XEN_ROOT); \
find $(d) ! -type l -type f \
- $(addprefix ! -name , '*.[isoa]' '.*.d' '.*.d2')) \
+ $(addprefix ! -name , '*.[isoa]' '.*.d' '.*.d2' \
+ $(EXCLUDE_FILES) )) \
>> linkfarm.stamp.tmp ; ) \
$(foreach f, $(LINK_FILES), \
echo $(f) >> linkfarm.stamp.tmp ;)
--
2.7.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH] firmware/shim : filter output files during Xen tree setup
2018-07-20 21:15 [PATCH] firmware/shim : filter output files during Xen tree setup Christopher Clark
@ 2018-07-23 8:17 ` Wei Liu
2018-07-23 9:09 ` Roger Pau Monné
2018-07-24 9:43 ` Jan Beulich
2 siblings, 0 replies; 11+ messages in thread
From: Wei Liu @ 2018-07-23 8:17 UTC (permalink / raw)
To: Christopher Clark; +Cc: xen-devel, ian.jackson, wei.liu2
On Fri, Jul 20, 2018 at 02:15:05PM -0700, Christopher Clark wrote:
> Exclude named output files from the Xen tree setup.
>
> The linkfarm.stamp content will differ between top level "make"
> and "make install" invocations, due to the introduction of these
> output files that are produced during the "make" build.
>
> Filter these out to prevent an unnecessary rebuild of the shim during
> "make install".
>
> Signed-off-by: Christopher Clark <christopher.clark6@baesystems.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] firmware/shim : filter output files during Xen tree setup
2018-07-20 21:15 [PATCH] firmware/shim : filter output files during Xen tree setup Christopher Clark
2018-07-23 8:17 ` Wei Liu
@ 2018-07-23 9:09 ` Roger Pau Monné
2018-07-23 9:26 ` Andrew Cooper
2018-07-24 9:43 ` Jan Beulich
2 siblings, 1 reply; 11+ messages in thread
From: Roger Pau Monné @ 2018-07-23 9:09 UTC (permalink / raw)
To: Christopher Clark; +Cc: xen-devel, wei.liu2, ian.jackson
On Fri, Jul 20, 2018 at 02:15:05PM -0700, Christopher Clark wrote:
> Exclude named output files from the Xen tree setup.
>
> The linkfarm.stamp content will differ between top level "make"
> and "make install" invocations, due to the introduction of these
> output files that are produced during the "make" build.
>
> Filter these out to prevent an unnecessary rebuild of the shim during
> "make install".
>
> Signed-off-by: Christopher Clark <christopher.clark6@baesystems.com>
> ---
> tools/firmware/xen-dir/Makefile | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/tools/firmware/xen-dir/Makefile b/tools/firmware/xen-dir/Makefile
> index 84648c3..e490dca 100644
> --- a/tools/firmware/xen-dir/Makefile
> +++ b/tools/firmware/xen-dir/Makefile
> @@ -11,6 +11,9 @@ D=xen-root
> LINK_DIRS=config xen
> LINK_FILES=Config.mk
>
> +# Files to exclude from the link farm
> +EXCLUDE_FILES=xen xen.gz xen-syms xen-syms.map efi.lds xen.lds mkelf32 mkreloc
I don't really like to list the files here, since it's very easy for
them to get out of sync. The alternative I have is also not very nice
however, since it relies on .gitignore:
EXCLUDE_FILES:=$(patsubst xen/%,%,$(filter xen/%,$(shell cat $(XEN_ROOT)/.gitignore)))
Roger.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] firmware/shim : filter output files during Xen tree setup
2018-07-23 9:09 ` Roger Pau Monné
@ 2018-07-23 9:26 ` Andrew Cooper
2018-07-23 23:00 ` Christopher Clark
0 siblings, 1 reply; 11+ messages in thread
From: Andrew Cooper @ 2018-07-23 9:26 UTC (permalink / raw)
To: Roger Pau Monné, Christopher Clark; +Cc: xen-devel, wei.liu2, ian.jackson
On 23/07/18 10:09, Roger Pau Monné wrote:
> On Fri, Jul 20, 2018 at 02:15:05PM -0700, Christopher Clark wrote:
>> Exclude named output files from the Xen tree setup.
>>
>> The linkfarm.stamp content will differ between top level "make"
>> and "make install" invocations, due to the introduction of these
>> output files that are produced during the "make" build.
>>
>> Filter these out to prevent an unnecessary rebuild of the shim during
>> "make install".
>>
>> Signed-off-by: Christopher Clark <christopher.clark6@baesystems.com>
>> ---
>> tools/firmware/xen-dir/Makefile | 6 +++++-
>> 1 file changed, 5 insertions(+), 1 deletion(-)
>>
>> diff --git a/tools/firmware/xen-dir/Makefile b/tools/firmware/xen-dir/Makefile
>> index 84648c3..e490dca 100644
>> --- a/tools/firmware/xen-dir/Makefile
>> +++ b/tools/firmware/xen-dir/Makefile
>> @@ -11,6 +11,9 @@ D=xen-root
>> LINK_DIRS=config xen
>> LINK_FILES=Config.mk
>>
>> +# Files to exclude from the link farm
>> +EXCLUDE_FILES=xen xen.gz xen-syms xen-syms.map efi.lds xen.lds mkelf32 mkreloc
> I don't really like to list the files here, since it's very easy for
> them to get out of sync. The alternative I have is also not very nice
> however, since it relies on .gitignore:
>
> EXCLUDE_FILES:=$(patsubst xen/%,%,$(filter xen/%,$(shell cat $(XEN_ROOT)/.gitignore)))
The correct way to fix this is to rip the current build system to
shreds, start again, and get it to support out-of-tree builds.
This linkfarm logic exists only to work around a hole which we couldn't
fix at the time.
~Andrew
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] firmware/shim : filter output files during Xen tree setup
2018-07-23 9:26 ` Andrew Cooper
@ 2018-07-23 23:00 ` Christopher Clark
0 siblings, 0 replies; 11+ messages in thread
From: Christopher Clark @ 2018-07-23 23:00 UTC (permalink / raw)
To: Andrew Cooper; +Cc: xen-devel, Wei Liu, Ian Jackson, Roger Pau Monné
[-- Attachment #1.1: Type: text/plain, Size: 2256 bytes --]
On Mon, Jul 23, 2018 at 2:26 AM, Andrew Cooper <andrew.cooper3@citrix.com>
wrote:
> On 23/07/18 10:09, Roger Pau Monné wrote:
> > On Fri, Jul 20, 2018 at 02:15:05PM -0700, Christopher Clark wrote:
> >> Exclude named output files from the Xen tree setup.
> >>
> >> The linkfarm.stamp content will differ between top level "make"
> >> and "make install" invocations, due to the introduction of these
> >> output files that are produced during the "make" build.
> >>
> >> Filter these out to prevent an unnecessary rebuild of the shim during
> >> "make install".
> >>
> >> Signed-off-by: Christopher Clark <christopher.clark6@baesystems.com>
> >> ---
> >> tools/firmware/xen-dir/Makefile | 6 +++++-
> >> 1 file changed, 5 insertions(+), 1 deletion(-)
> >>
> >> diff --git a/tools/firmware/xen-dir/Makefile b/tools/firmware/xen-dir/
> Makefile
> >> index 84648c3..e490dca 100644
> >> --- a/tools/firmware/xen-dir/Makefile
> >> +++ b/tools/firmware/xen-dir/Makefile
> >> @@ -11,6 +11,9 @@ D=xen-root
> >> LINK_DIRS=config xen
> >> LINK_FILES=Config.mk
> >>
> >> +# Files to exclude from the link farm
> >> +EXCLUDE_FILES=xen xen.gz xen-syms xen-syms.map efi.lds xen.lds mkelf32
> mkreloc
> > I don't really like to list the files here, since it's very easy for
> > them to get out of sync. The alternative I have is also not very nice
> > however, since it relies on .gitignore:
> >
> > EXCLUDE_FILES:=$(patsubst xen/%,%,$(filter xen/%,$(shell cat
> $(XEN_ROOT)/.gitignore)))
>
> The correct way to fix this is to rip the current build system to
> shreds, start again, and get it to support out-of-tree builds.
>
> This linkfarm logic exists only to work around a hole which we couldn't
> fix at the time.
>
As Andrew observes, the linkfarm code is a temporary solution until Xen
supports out of tree builds.
The proposed patch is localized and easy to understand.
If the list of files is not maintained, it will break in obvious ways
(either an unnecessary shim rebuild, or a non-rebuild when it should but
only in a developer environment) and it will serve as a reminder to fix
support for out of tree builds.
So, I'd like to request inclusion of the original patch proposed.
Christopher
[-- Attachment #1.2: Type: text/html, Size: 3416 bytes --]
[-- Attachment #2: Type: text/plain, Size: 157 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] firmware/shim : filter output files during Xen tree setup
2018-07-20 21:15 [PATCH] firmware/shim : filter output files during Xen tree setup Christopher Clark
2018-07-23 8:17 ` Wei Liu
2018-07-23 9:09 ` Roger Pau Monné
@ 2018-07-24 9:43 ` Jan Beulich
2018-07-25 0:21 ` Christopher Clark
2 siblings, 1 reply; 11+ messages in thread
From: Jan Beulich @ 2018-07-24 9:43 UTC (permalink / raw)
To: Christopher Clark; +Cc: Ian Jackson, Wei Liu, xen-devel
>>> On 20.07.18 at 23:15, <christopher.w.clark@gmail.com> wrote:
> Exclude named output files from the Xen tree setup.
>
> The linkfarm.stamp content will differ between top level "make"
> and "make install" invocations, due to the introduction of these
> output files that are produced during the "make" build.
>
> Filter these out to prevent an unnecessary rebuild of the shim during
> "make install".
>
> Signed-off-by: Christopher Clark <christopher.clark6@baesystems.com>
> ---
> tools/firmware/xen-dir/Makefile | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/tools/firmware/xen-dir/Makefile
> b/tools/firmware/xen-dir/Makefile
> index 84648c3..e490dca 100644
> --- a/tools/firmware/xen-dir/Makefile
> +++ b/tools/firmware/xen-dir/Makefile
> @@ -11,6 +11,9 @@ D=xen-root
> LINK_DIRS=config xen
> LINK_FILES=Config.mk
>
> +# Files to exclude from the link farm
> +EXCLUDE_FILES=xen xen.gz xen-syms xen-syms.map efi.lds xen.lds mkelf32 mkreloc
What about xen.efi and all of its auxiliary files? What about other generated
files?
Jan
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] firmware/shim : filter output files during Xen tree setup
2018-07-24 9:43 ` Jan Beulich
@ 2018-07-25 0:21 ` Christopher Clark
2018-07-25 0:28 ` [PATCH v2] " Christopher Clark
2018-07-25 7:51 ` [PATCH] " Jan Beulich
0 siblings, 2 replies; 11+ messages in thread
From: Christopher Clark @ 2018-07-25 0:21 UTC (permalink / raw)
To: Jan Beulich; +Cc: Ian Jackson, Wei Liu, xen-devel
[-- Attachment #1.1: Type: text/plain, Size: 1655 bytes --]
On Tue, Jul 24, 2018 at 2:43 AM, Jan Beulich <JBeulich@suse.com> wrote:
> >>> On 20.07.18 at 23:15, <christopher.w.clark@gmail.com> wrote:
> > Exclude named output files from the Xen tree setup.
> >
> > The linkfarm.stamp content will differ between top level "make"
> > and "make install" invocations, due to the introduction of these
> > output files that are produced during the "make" build.
> >
> > Filter these out to prevent an unnecessary rebuild of the shim during
> > "make install".
> >
> > Signed-off-by: Christopher Clark <christopher.clark6@baesystems.com>
> > ---
> > tools/firmware/xen-dir/Makefile | 6 +++++-
> > 1 file changed, 5 insertions(+), 1 deletion(-)
> >
> > diff --git a/tools/firmware/xen-dir/Makefile
> > b/tools/firmware/xen-dir/Makefile
> > index 84648c3..e490dca 100644
> > --- a/tools/firmware/xen-dir/Makefile
> > +++ b/tools/firmware/xen-dir/Makefile
> > @@ -11,6 +11,9 @@ D=xen-root
> > LINK_DIRS=config xen
> > LINK_FILES=Config.mk
> >
> > +# Files to exclude from the link farm
> > +EXCLUDE_FILES=xen xen.gz xen-syms xen-syms.map efi.lds xen.lds mkelf32
> mkreloc
>
> What about xen.efi and all of its auxiliary files?
Fair point - this list was from a non-EFI build, and EFI does add two more
files to it: xen.efi and xen.efi.map
> What about other generated files?
>
I don't see any others being added to the stamp file -- with the possible
exception of the "disabled" file in xen/arch/x86/efi which can capture
build errors. I don't think that file will be present in production builds.
Did you have any others in mind? I'll post an updated patch with the
EFI-updated list in the meantime.
Christopher
[-- Attachment #1.2: Type: text/html, Size: 2653 bytes --]
[-- Attachment #2: Type: text/plain, Size: 157 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v2] firmware/shim : filter output files during Xen tree setup
2018-07-25 0:21 ` Christopher Clark
@ 2018-07-25 0:28 ` Christopher Clark
[not found] ` <5B57C29F0200000804C77BEC@prv1-mh.provo.novell.com>
2018-07-25 7:51 ` [PATCH] " Jan Beulich
1 sibling, 1 reply; 11+ messages in thread
From: Christopher Clark @ 2018-07-25 0:28 UTC (permalink / raw)
To: xen-devel; +Cc: wei.liu2, ian.jackson, jbeulich
Exclude named output files from the Xen tree setup.
The linkfarm.stamp content will differ between top level "make"
and "make install" invocations, due to the introduction of these
output files that are produced during the "make" build.
Filter these out to prevent an unnecessary rebuild of the shim
during "make install".
Signed-off-by: Christopher Clark <christopher.clark6@baesystems.com>
---
v2: added xen.efi, xen.efi.map to the exclusion list
tools/firmware/xen-dir/Makefile | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/tools/firmware/xen-dir/Makefile b/tools/firmware/xen-dir/Makefile
index 84648c3..a9614e4 100644
--- a/tools/firmware/xen-dir/Makefile
+++ b/tools/firmware/xen-dir/Makefile
@@ -11,6 +11,10 @@ D=xen-root
LINK_DIRS=config xen
LINK_FILES=Config.mk
+# Files to exclude from the link farm
+EXCLUDE_FILES=xen xen.gz xen-syms xen-syms.map xen.efi xen.efi.map \
+ efi.lds xen.lds mkelf32 mkreloc
+
DEP_DIRS=$(foreach i, $(LINK_DIRS), $(XEN_ROOT)/$(i))
DEP_FILES=$(foreach i, $(LINK_FILES), $(XEN_ROOT)/$(i))
@@ -26,7 +30,8 @@ linkfarm.stamp: $(DEP_DIRS) $(DEP_FILES) FORCE
$(foreach d, $(LINK_DIRS), \
(cd $(XEN_ROOT); \
find $(d) ! -type l -type f \
- $(addprefix ! -name , '*.[isoa]' '.*.d' '.*.d2')) \
+ $(addprefix ! -name , '*.[isoa]' '.*.d' '.*.d2' \
+ $(EXCLUDE_FILES) )) \
>> linkfarm.stamp.tmp ; ) \
$(foreach f, $(LINK_FILES), \
echo $(f) >> linkfarm.stamp.tmp ;)
--
2.7.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH] firmware/shim : filter output files during Xen tree setup
2018-07-25 0:21 ` Christopher Clark
2018-07-25 0:28 ` [PATCH v2] " Christopher Clark
@ 2018-07-25 7:51 ` Jan Beulich
1 sibling, 0 replies; 11+ messages in thread
From: Jan Beulich @ 2018-07-25 7:51 UTC (permalink / raw)
To: Christopher Clark; +Cc: Ian Jackson, Wei Liu, xen-devel
>>> On 25.07.18 at 02:21, <christopher.w.clark@gmail.com> wrote:
> On Tue, Jul 24, 2018 at 2:43 AM, Jan Beulich <JBeulich@suse.com> wrote:
>
>> >>> On 20.07.18 at 23:15, <christopher.w.clark@gmail.com> wrote:
>> > Exclude named output files from the Xen tree setup.
>> >
>> > The linkfarm.stamp content will differ between top level "make"
>> > and "make install" invocations, due to the introduction of these
>> > output files that are produced during the "make" build.
>> >
>> > Filter these out to prevent an unnecessary rebuild of the shim during
>> > "make install".
>> >
>> > Signed-off-by: Christopher Clark <christopher.clark6@baesystems.com>
>> > ---
>> > tools/firmware/xen-dir/Makefile | 6 +++++-
>> > 1 file changed, 5 insertions(+), 1 deletion(-)
>> >
>> > diff --git a/tools/firmware/xen-dir/Makefile
>> > b/tools/firmware/xen-dir/Makefile
>> > index 84648c3..e490dca 100644
>> > --- a/tools/firmware/xen-dir/Makefile
>> > +++ b/tools/firmware/xen-dir/Makefile
>> > @@ -11,6 +11,9 @@ D=xen-root
>> > LINK_DIRS=config xen
>> > LINK_FILES=Config.mk
>> >
>> > +# Files to exclude from the link farm
>> > +EXCLUDE_FILES=xen xen.gz xen-syms xen-syms.map efi.lds xen.lds mkelf32
>> mkreloc
>>
>> What about xen.efi and all of its auxiliary files?
>
>
> Fair point - this list was from a non-EFI build, and EFI does add two more
> files to it: xen.efi and xen.efi.map
So what about the auxiliary ones created there, like ..xen-syms.* or
..xen.efi.*
>> What about other generated files?
>>
>
> I don't see any others being added to the stamp file -- with the possible
> exception of the "disabled" file in xen/arch/x86/efi which can capture
> build errors. I don't think that file will be present in production builds.
>
> Did you have any others in mind? I'll post an updated patch with the
> EFI-updated list in the meantime.
Besides the above ones, I'd suspect generated headers to show up
there, possibly only after having run a second (incremental) build in
that tree. I notice that the *.[isoa] exclusion already takes care of
avoiding e.g. asm-offsets.s.
Jan
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2018-07-26 21:10 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-07-20 21:15 [PATCH] firmware/shim : filter output files during Xen tree setup Christopher Clark
2018-07-23 8:17 ` Wei Liu
2018-07-23 9:09 ` Roger Pau Monné
2018-07-23 9:26 ` Andrew Cooper
2018-07-23 23:00 ` Christopher Clark
2018-07-24 9:43 ` Jan Beulich
2018-07-25 0:21 ` Christopher Clark
2018-07-25 0:28 ` [PATCH v2] " Christopher Clark
[not found] ` <5B57C29F0200000804C77BEC@prv1-mh.provo.novell.com>
[not found] ` <5B57C462020000E403D61C84@prv1-mh.provo.novell.com>
2018-07-25 8:10 ` Jan Beulich
2018-07-26 21:10 ` Christopher Clark
2018-07-25 7:51 ` [PATCH] " Jan Beulich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).