[SLOF] [PATCH 1/3] net: Get rid of netlib and netapps prefixes in include statements

Thomas Huth thuth at redhat.com
Fri Jun 10 16:43:02 AEST 2016


On 10.06.2016 06:56, Alexey Kardashevskiy wrote:
> On 09/06/16 17:06, Thomas Huth wrote:
>> These prefixes prevent that the files can easily be moved to another
>> folder, so let's use proper "-I" statements in the Makefiles instead.
>>
>> Signed-off-by: Thomas Huth <thuth at redhat.com>
>> ---
...
>> diff --git a/clients/net-snk/app/netlib/dhcp.h b/clients/net-snk/app/netlib/dhcp.h
>> index 54fb1ee..4432c9b 100644
>> --- a/clients/net-snk/app/netlib/dhcp.h
>> +++ b/clients/net-snk/app/netlib/dhcp.h
>> @@ -14,12 +14,7 @@
>>  #define _DHCP_H_
>>  
>>  #include <stdint.h>
>> -
>> -#ifdef USE_MTFTP
>> -#include <netlib/mtftp.h>
>> -#else
>> -#include <netlib/tftp.h>
>> -#endif
>> +#include "tftp.h"
> 
> 
> You are getting rid of MTFTP references by tiny bits? :)

The MTFTP code is not in the repository, so we don't need that anymore.
But I can also put that into a separate patch if you prefer.

> Another thing - it does not compile without 2/3 applied:
> 
>> make distclean
>         [CLEAN] time/
>         [CLEAN] netlib/
>         [CLEAN] netapps/
>         [CLEAN] netapps/
>         [CLEAN] netapps/
> 
>> make qemu
> ******** Building qemu system ********
>  ====== Building clients ======
>         [CC]    depend
>         [CC]    init.o
>         [CC]    crt0.o
>         [CC]    systemcall.o
>         [CC]    timer.o
>         [CC]    entry.o
> In file included from main.c:16:0:
> ./netapps/netapps.h:16:18: fatal error: tftp.h: No such file or directory
> compilation terminated.
> /home/aik/p/slof/clients/net-snk/make.depend:16: recipe for target 'depend'
> failed

Darn, sorry, I thought I had tested it ... I'll send a v2 where it is fixed.

> Also, while we are on this topic, could you write a small text explaining
> the romfs layout? Thanks!

The different parts of the firmware are already explained in the README,
isn't that enough?

 Thomas



More information about the SLOF mailing list