[SLOF] [PATCH 08/11] Do not link libnet to net-snk anymore

[Alexey Kardashevskiy]

On 10/09/16 05:52, Thomas Huth wrote:
> Since libnet is now linked to Paflof directly, we do not have to
> link it into net-snk anymore.
> 
> Signed-off-by: Thomas Huth <thuth at redhat.com>
> ---
>  clients/net-snk/Makefile     | 2 +-
>  clients/net-snk/app/Makefile | 2 +-
>  clients/net-snk/app/main.c   | 5 -----
>  lib/libnet/Makefile          | 3 +--
>  lib/libnet/netload.c         | 2 +-
>  5 files changed, 4 insertions(+), 10 deletions(-)
> 
> diff --git a/clients/net-snk/Makefile b/clients/net-snk/Makefile
> index 1cab7ae..c0bb73a 100644
> --- a/clients/net-snk/Makefile
> +++ b/clients/net-snk/Makefile
> @@ -17,7 +17,7 @@ include $(TOP)/make.rules
>  OBJS	=  kernel/kernel.o oflib/oflib.o libc/libc-glue.o app/app.o
>  .PHONY : subdirs clean depend mrproper
>  
> -CLIENTLIBS = $(LIBCMNDIR)/libelf.a $(LIBCMNDIR)/libnet.a $(LIBCMNDIR)/libc.a
> +CLIENTLIBS = $(LIBCMNDIR)/libelf.a $(LIBCMNDIR)/libc.a
>  
>  all:	.depend subdirs
>  	$(MAKE) client
> diff --git a/clients/net-snk/app/Makefile b/clients/net-snk/app/Makefile
> index 52d446c..2da02b9 100644
> --- a/clients/net-snk/app/Makefile
> +++ b/clients/net-snk/app/Makefile
> @@ -16,7 +16,7 @@ export TOP
>  endif
>  include $(TOP)/make.rules
>  
> -CFLAGS +=$(ADDCFLAGS) -I$(LIBCMNDIR)/libnet
> +CFLAGS +=$(ADDCFLAGS)
>  
>  OBJS = main.o
>  
> diff --git a/clients/net-snk/app/main.c b/clients/net-snk/app/main.c
> index 22aeba7..17c16b6 100644
> --- a/clients/net-snk/app/main.c
> +++ b/clients/net-snk/app/main.c
> @@ -13,7 +13,6 @@
>  #include <string.h>
>  #include <stdio.h>
>  #include <of.h>
> -#include <netapps.h>
>  #include <libbootmsg.h>
>  
>  #ifdef SNK_BIOSEMU_APPS
> @@ -31,10 +30,6 @@ main(int argc, char *argv[])
>  	int i;
>  	of_set_callback((void *) &_callback_entry);
>  
> -	if (strcmp(argv[0], "netboot") == 0 && argc >= 5)
> -		return netboot(argc, argv);
> -	if (strcmp(argv[0], "ping") == 0)
> -		return ping(argc, argv);


After this change we do not have working "ping" - it is added in the next
patch, not good for bisectability. Was this intentional?




>  #ifdef SNK_BIOSEMU_APPS
>  	// BIOS Emulator applications
>  	if (strcmp(argv[0], "biosemu") == 0)
> diff --git a/lib/libnet/Makefile b/lib/libnet/Makefile
> index 2c9b7c2..83ac1e5 100644
> --- a/lib/libnet/Makefile
> +++ b/lib/libnet/Makefile
> @@ -16,8 +16,7 @@ ifndef TOP
>  endif
>  include $(TOP)/make.rules
>  
> -CFLAGS += -I. -I.. -I../libc/include
> -CFLAGS += -I../../clients/net-snk/app/netapps -I../../clients/net-snk/include
> +CFLAGS += -I. -I.. -I../libc/include -I$(TOP)/include
>  
>  SRCS =	ethernet.c ipv4.c udp.c tcp.c dns.c bootp.c dhcp.c tftp.c \
>  	ipv6.c dhcpv6.c icmpv6.c ndp.c netload.c ping.c args.c
> diff --git a/lib/libnet/netload.c b/lib/libnet/netload.c
> index d99aa29..2d1cea0 100644
> --- a/lib/libnet/netload.c
> +++ b/lib/libnet/netload.c
> @@ -23,7 +23,7 @@
>  #include <stdlib.h>
>  #include <sys/socket.h>
>  #include <libbootmsg/libbootmsg.h>
> -#include <of.h>
> +#include <helpers.h>
>  #include "args.h"
>  #include "netapps.h"
>  
> 


-- 
Alexey