[PATCH] include: correct re-building conditions around hypercall-defs.h

Jan Beulich posted 1 patch 1 year, 8 months ago
Failed in applying to current master (apply log)
[PATCH] include: correct re-building conditions around hypercall-defs.h
Posted by Jan Beulich 1 year, 8 months ago
For a .cmd file to be picked up, the respective target needs to be
listed in $(targets). This wasn't the case for hypercall-defs.i, leading
to permanent re-building even on an entirely unchanged tree (because of
the command apparently having changed).

Fixes: eca1f00d0227 ("xen: generate hypercall interface related code")
Signed-off-by: Jan Beulich <jbeulich@suse.com>

--- a/xen/include/Makefile
+++ b/xen/include/Makefile
@@ -114,7 +114,7 @@ all: $(obj)/xen/hypercall-defs.h
 $(obj)/xen/hypercall-defs.h: $(obj)/hypercall-defs.i $(srctree)/scripts/gen_hypercall.awk FORCE
 	$(call if_changed,genhyp)
 
-targets += xen/hypercall-defs.h
+targets += hypercall-defs.i xen/hypercall-defs.h
 
 ifeq ($(XEN_TARGET_ARCH),$(XEN_COMPILE_ARCH))
Re: [PATCH] include: correct re-building conditions around hypercall-defs.h
Posted by Anthony PERARD 1 year, 8 months ago
On Mon, Jul 25, 2022 at 02:08:04PM +0200, Jan Beulich wrote:
> For a .cmd file to be picked up, the respective target needs to be
> listed in $(targets). This wasn't the case for hypercall-defs.i, leading
> to permanent re-building even on an entirely unchanged tree (because of
> the command apparently having changed).
> 
> Fixes: eca1f00d0227 ("xen: generate hypercall interface related code")
> Signed-off-by: Jan Beulich <jbeulich@suse.com>
> 
> --- a/xen/include/Makefile
> +++ b/xen/include/Makefile
> @@ -114,7 +114,7 @@ all: $(obj)/xen/hypercall-defs.h
>  $(obj)/xen/hypercall-defs.h: $(obj)/hypercall-defs.i $(srctree)/scripts/gen_hypercall.awk FORCE
>  	$(call if_changed,genhyp)
>  
> -targets += xen/hypercall-defs.h
> +targets += hypercall-defs.i xen/hypercall-defs.h

Do you want to remove "hypercall-defs.i" from $(clean-files) at the same
time?

In any case,
Reviewed-by: Anthony PERARD <anthony.perard@citrix.com>

Thanks,

-- 
Anthony PERARD
Re: [PATCH] include: correct re-building conditions around hypercall-defs.h
Posted by Jan Beulich 1 year, 8 months ago
On 25.07.2022 14:24, Anthony PERARD wrote:
> On Mon, Jul 25, 2022 at 02:08:04PM +0200, Jan Beulich wrote:
>> For a .cmd file to be picked up, the respective target needs to be
>> listed in $(targets). This wasn't the case for hypercall-defs.i, leading
>> to permanent re-building even on an entirely unchanged tree (because of
>> the command apparently having changed).
>>
>> Fixes: eca1f00d0227 ("xen: generate hypercall interface related code")
>> Signed-off-by: Jan Beulich <jbeulich@suse.com>
>>
>> --- a/xen/include/Makefile
>> +++ b/xen/include/Makefile
>> @@ -114,7 +114,7 @@ all: $(obj)/xen/hypercall-defs.h
>>  $(obj)/xen/hypercall-defs.h: $(obj)/hypercall-defs.i $(srctree)/scripts/gen_hypercall.awk FORCE
>>  	$(call if_changed,genhyp)
>>  
>> -targets += xen/hypercall-defs.h
>> +targets += hypercall-defs.i xen/hypercall-defs.h
> 
> Do you want to remove "hypercall-defs.i" from $(clean-files) at the same
> time?

Oh, right - I certainly should.

> In any case,
> Reviewed-by: Anthony PERARD <anthony.perard@citrix.com>

Thanks.

Jan