| Message ID | 20161122150917.16524-5-andre.przywara@arm.com |
|---|---|
| State | Superseded |
| Headers | show |
On Tue, Nov 22, 2016 at 03:09:17PM +0000, Andre Przywara wrote: > From: Christoffer Dall <christoffer.dall@linaro.org> > > When doing a make clean, only the output image currently configured to > build is being removed. However, one would expect all build artifacts > to be removed when doing a 'make clean' and when switching between Xen > and Linux builds, it is easy to accidentally run an older build than > intended. Simply hardcode the axf image file names. > > Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org> > Signed-off-by: Andre Przywara <andre.przywara@arm.com> > Reviewed-by: Julien Grall <julien.grall@arm.com> Tested-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> > --- > Makefile.am | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Makefile.am b/Makefile.am > index db97f9c..506a1d9 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -130,7 +130,7 @@ OFILES += $(addprefix $(ARCH_SRC),boot.o stack.o $(BOOTMETHOD) utils.o) > > all: $(IMAGE) > > -CLEANFILES = $(IMAGE) $(OFILES) model.lds fdt.dtb > +CLEANFILES = $(IMAGE) linux-system.axf xen-system.axf $(OFILES) model.lds fdt.dtb > > $(IMAGE): $(OFILES) model.lds fdt.dtb $(KERNEL_IMAGE) $(FILESYSTEM) $(XEN_IMAGE) > $(LD) $(LDFLAGS) $(OFILES) -o $@ --script=model.lds > -- > 2.9.0 > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > https://lists.xen.org/xen-devel _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Hi Konrad, On 12/12/16 14:47, Konrad Rzeszutek Wilk wrote: > On Tue, Nov 22, 2016 at 03:09:17PM +0000, Andre Przywara wrote: >> From: Christoffer Dall <christoffer.dall@linaro.org> >> >> When doing a make clean, only the output image currently configured to >> build is being removed. However, one would expect all build artifacts >> to be removed when doing a 'make clean' and when switching between Xen >> and Linux builds, it is easy to accidentally run an older build than >> intended. Simply hardcode the axf image file names. >> >> Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org> >> Signed-off-by: Andre Przywara <andre.przywara@arm.com> >> Reviewed-by: Julien Grall <julien.grall@arm.com> > > Tested-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> > Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Thanks a lot! I will try to poke Mark to see if we can get this merged eventually. Cheers, Andre. >> --- >> Makefile.am | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/Makefile.am b/Makefile.am >> index db97f9c..506a1d9 100644 >> --- a/Makefile.am >> +++ b/Makefile.am >> @@ -130,7 +130,7 @@ OFILES += $(addprefix $(ARCH_SRC),boot.o stack.o $(BOOTMETHOD) utils.o) >> >> all: $(IMAGE) >> >> -CLEANFILES = $(IMAGE) $(OFILES) model.lds fdt.dtb >> +CLEANFILES = $(IMAGE) linux-system.axf xen-system.axf $(OFILES) model.lds fdt.dtb >> >> $(IMAGE): $(OFILES) model.lds fdt.dtb $(KERNEL_IMAGE) $(FILESYSTEM) $(XEN_IMAGE) >> $(LD) $(LDFLAGS) $(OFILES) -o $@ --script=model.lds >> -- >> 2.9.0 >> >> >> _______________________________________________ >> Xen-devel mailing list >> Xen-devel@lists.xen.org >> https://lists.xen.org/xen-devel _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
On Mon, Dec 12, 2016 at 02:50:20PM +0000, Andre Przywara wrote: > Hi Konrad, > > On 12/12/16 14:47, Konrad Rzeszutek Wilk wrote: > > On Tue, Nov 22, 2016 at 03:09:17PM +0000, Andre Przywara wrote: > >> From: Christoffer Dall <christoffer.dall@linaro.org> > >> > >> When doing a make clean, only the output image currently configured to > >> build is being removed. However, one would expect all build artifacts > >> to be removed when doing a 'make clean' and when switching between Xen > >> and Linux builds, it is easy to accidentally run an older build than > >> intended. Simply hardcode the axf image file names. > >> > >> Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org> > >> Signed-off-by: Andre Przywara <andre.przywara@arm.com> > >> Reviewed-by: Julien Grall <julien.grall@arm.com> > > > > Tested-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> > > Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> > > Thanks a lot! > > I will try to poke Mark to see if we can get this merged eventually. I'm happy to take these so long as this doesn't adversely affect non-Xen usage. I assume they don't. :) Could you fix this up as per Julien's comments, and fold in the tags? I'm happy to take that from a v3 or a git repo. Thanks, Mark. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
diff --git a/Makefile.am b/Makefile.am index db97f9c..506a1d9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -130,7 +130,7 @@ OFILES += $(addprefix $(ARCH_SRC),boot.o stack.o $(BOOTMETHOD) utils.o) all: $(IMAGE) -CLEANFILES = $(IMAGE) $(OFILES) model.lds fdt.dtb +CLEANFILES = $(IMAGE) linux-system.axf xen-system.axf $(OFILES) model.lds fdt.dtb $(IMAGE): $(OFILES) model.lds fdt.dtb $(KERNEL_IMAGE) $(FILESYSTEM) $(XEN_IMAGE) $(LD) $(LDFLAGS) $(OFILES) -o $@ --script=model.lds