Re: [Xen-devel] [PATCH v2] shim: don't let build modify shim.config

["Jan Beulich" <JBeulich@xxxxxxxx>]

>>> On 20.04.18 at 14:13, <jgross@xxxxxxxx> wrote:
> On 20/04/18 12:28, Jan Beulich wrote:
>>>>> On 20.04.18 at 08:40, <jgross@xxxxxxxx> wrote:
>>> --- a/tools/firmware/xen-dir/Makefile
>>> +++ b/tools/firmware/xen-dir/Makefile
>>> @@ -41,16 +41,14 @@ linkfarm.stamp: $(DEP_DIRS) $(DEP_FILES) FORCE
>>>  $(D): linkfarm.stamp
>>>     $(MAKE) -C $(D)/xen distclean
>>>  
>>> -.PHONY: shim-%config
>>> -shim-%config: $(D) FORCE
>>> -   $(MAKE) -C $(D)/xen $*config \
>>> -           XEN_CONFIG_EXPERT=y \
>>> -           KCONFIG_CONFIG=$(CURDIR)/shim.config
>>> +$(D)/xen/.config: shim.config $(D)
>> 
>> Do you need the $(D)/ prefix here, ...
>> 
>>> +   cp $< $@
>>> +   $(MAKE) -C $(D)/xen olddefconfig \
>> 
>> ... here, and ...
>> 
>>> +           XEN_CONFIG_EXPERT=y
>>>  
>>> -xen-shim: $(D) shim-olddefconfig
>>> +xen-shim: $(D) $(D)/xen/.config
>> 
>> ... here? In the middle case using $(@D) might be better anyway. Other
>> than that LGTM, but please consider removing the line continuations from
>> the make invocations.
> 
> You are aware of the line further up:
> 
> D=xen-root

Oh, indeed. This xen-dir/xen-root hierarchy is confusing.

> So $(D)/xen is just the path to the hypervisor part of the shim. This
> has nothing to do with $(@D) or other variants of the make automatic
> variables.

The suggested $(@D) would still be worthwhile to have imo, but I agree
you can't drop the $(D)/ prefixes.

Jan



_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel