[CRIU] [PATCH 1/3] criu: don't forget to include log.h into UAPI

[Ruslan Kuprieiev]

So should I just swap log.h <-> criu-log.h back and replace criu-log.h 
in source files
or is there a more complex way we need to follow to solve this headers 
confusion?


On 01/10/2017 03:25 PM, Pavel Emelyanov wrote:
> On 01/10/2017 03:51 PM, Ruslan Kuprieiev wrote:
>> Yes, sure. Try to "#include <criu-log.h>" into a criu plugin you are
>> trying to compile and
>> gcc will throw an error, that log.h is not found, as criu-log.h has
>> log.h included [1]
>> but it is not provided by UAPI_HEADERS.
> Ah! I see :) We've swapped the headers and no plugins no need the criu-log.h
> as it contains internal criu logging stuff. Plugins need the log.h header
> that describes pr_xxx routines.
>
>> [1] https://github.com/xemul/criu/blob/master/criu/include/criu-log.h#L23
>>
>>
>> On 01/10/2017 02:52 PM, Pavel Emelyanov wrote:
>>> On 01/05/2017 03:42 PM, Ruslan Kuprieiev wrote:
>>>> Otherwise, gcc fails to find it in system headers.
>>> Can you elaborate? UAPI_HEADERS are those installed by make install
>>> command for -devel package. Why do you need log.h in there?
>>>
>>>> Signed-off-by: Ruslan Kuprieiev <rkuprieiev at cloudlinux.com>
>>>> ---
>>>>    criu/Makefile | 1 +
>>>>    1 file changed, 1 insertion(+)
>>>>
>>>> diff --git a/criu/Makefile b/criu/Makefile
>>>> index 01b1d98..d18c13f 100644
>>>> --- a/criu/Makefile
>>>> +++ b/criu/Makefile
>>>> @@ -108,6 +108,7 @@ mrproper: subproper
>>>>    
>>>>    UAPI_HEADERS := $(SRC_DIR)/criu/include/criu-plugin.h
>>>>    UAPI_HEADERS += $(SRC_DIR)/criu/include/criu-log.h
>>>> +UAPI_HEADERS += $(SRC_DIR)/criu/include/log.h
>>>>    
>>>>    install: $(obj)/criu
>>>>    	$(E) "  INSTALL " $(obj)/criu
>>>>
>> .
>>