Adding support for Ubuntu 17.10...

Change-Id: I9a9da79cb4ccb245ccb38b50b561da51a40a359d
Signed-off-by: Deepak S <deepak.s@linux.intel.com>

diff --git a/VNFs/vACL/Makefile b/VNFs/vACL/Makefile
index 0995f90..bf1502a 100644 (file)
--- a/VNFs/vACL/Makefile
+++ b/VNFs/vACL/Makefile
@@ -66,7 +66,7 @@ CFLAGS += -I$(VNF_CORE)/common/VIL/gateway
 TOP = $(RTE_SDK)/../civetweb
 CFLAGS += -I$(TOP)/include $(COPT) -DUSE_WEBSOCKET -DUSE_IPV6 -DUSE_SSL_DH=1
 CFLAGS += -DREST_API_SUPPORT
-LDFLAGS +=  -ljson -lcrypto -lssl
+LDFLAGS +=  -ljson-c -lcrypto -lssl
 LDFLAGS += -L$(RTE_SDK)/../civetweb/ -lcivetweb
 
 # all source are stored in SRCS-y

diff --git a/VNFs/vACL/pipeline/pipeline_acl.h b/VNFs/vACL/pipeline/pipeline_acl.h
index 93b92c4..a0ff84d 100644 (file)
--- a/VNFs/vACL/pipeline/pipeline_acl.h
+++ b/VNFs/vACL/pipeline/pipeline_acl.h
@@ -29,7 +29,7 @@
 #include "pipeline.h"
 #include "pipeline_acl_be.h"
 #include <civetweb.h>
-#include <json/json.h>
+#include <json-c/json.h>
 
 /* ACL IPV4 and IPV6 enable flags for debugging (Default both on) */
 extern int acl_ipv4_enabled;

diff --git a/VNFs/vCGNAPT/Makefile b/VNFs/vCGNAPT/Makefile
index 41cacfb..82efa76 100644 (file)
--- a/VNFs/vCGNAPT/Makefile
+++ b/VNFs/vCGNAPT/Makefile
@@ -68,7 +68,7 @@ CFLAGS += -I$(VNF_CORE)/common/VIL/gateway
 TOP = $(RTE_SDK)/../civetweb
 CFLAGS += -I$(TOP)/include $(COPT) -DUSE_WEBSOCKET -DUSE_IPV6 -DUSE_SSL_DH=1
 CFLAGS += -DREST_API_SUPPORT
-LDFLAGS +=  -ljson -lcrypto -lssl
+LDFLAGS +=  -ljson-c -lcrypto -lssl
 LDFLAGS += -L$(RTE_SDK)/../civetweb/ -lcivetweb
 
 # all source are stored in SRCS-y

diff --git a/VNFs/vCGNAPT/pipeline/pipeline_cgnapt.h b/VNFs/vCGNAPT/pipeline/pipeline_cgnapt.h
index 6497de2..d61273f 100644 (file)
--- a/VNFs/vCGNAPT/pipeline/pipeline_cgnapt.h
+++ b/VNFs/vCGNAPT/pipeline/pipeline_cgnapt.h
@@ -29,7 +29,7 @@
 #include "pipeline.h"
 #include "pipeline_cgnapt_common.h"
 #include <civetweb.h>
-#include <json/json.h>
+#include <json-c/json.h>
 
 /**
  * Add NAPT rule to the NAPT rule table.

diff --git a/VNFs/vFW/Makefile b/VNFs/vFW/Makefile
index b011eca..80dd91a 100644 (file)
--- a/VNFs/vFW/Makefile
+++ b/VNFs/vFW/Makefile
@@ -68,7 +68,7 @@ CFLAGS += -I$(VNF_CORE)/common/VIL/gateway
 
 TOP = $(RTE_SDK)/../civetweb
 CFLAGS += -I$(TOP)/include $(COPT) -DUSE_WEBSOCKET -DUSE_IPV6 -DUSE_SSL_DH=1 -DREST_API_SUPPORT=1
-LDFLAGS +=  -ljson -lcrypto -lssl
+LDFLAGS +=  -ljson-c -lcrypto -lssl
 LDFLAGS += -L$(RTE_SDK)/../civetweb/ -lcivetweb
 
 # all source are stored in SRCS-y

diff --git a/VNFs/vFW/pipeline/pipeline_vfw.h b/VNFs/vFW/pipeline/pipeline_vfw.h
index 96e7ad3..7cfc95c 100644 (file)
--- a/VNFs/vFW/pipeline/pipeline_vfw.h
+++ b/VNFs/vFW/pipeline/pipeline_vfw.h
@@ -31,7 +31,7 @@
 #include "pipeline_vfw_be.h"
 
 #include <civetweb.h>
-#include <json/json.h>
+#include <json-c/json.h>
 
 /* VFW IPV4 and IPV6 enable flags for debugging (Default both on) */
 extern int vfw_ipv4_enabled;

diff --git a/common/vnf_common/rest_api.c b/common/vnf_common/rest_api.c
index 9cfbe88..8efd773 100644 (file)
--- a/common/vnf_common/rest_api.c
+++ b/common/vnf_common/rest_api.c
@@ -52,7 +52,7 @@
 #include "pipeline_arpicmp.h"
 
 #include <civetweb.h>
-#include <json/json.h>
+#include <json-c/json.h>
 #include "app.h"
 #include "lib_arp.h"
 #include "interface.h"

diff --git a/tools/vnf_build.sh b/tools/vnf_build.sh
index 0a085a6..d1bb898 100755 (executable)
--- a/tools/vnf_build.sh
+++ b/tools/vnf_build.sh
@@ -179,8 +179,7 @@ install_libs()
        sudo apt-get update
        sudo apt-get -y install build-essential linux-headers-$(uname -r) git unzip libpcap0.8-dev gcc \
                make libc6 libc6-dev g++-multilib libzmq3-dev libcurl4-openssl-dev net-tools wget gcc unzip \
-                libpcap-dev libncurses-dev libedit-dev pciutils liblua5.2-dev libncursesw5-dev libjson0 \
-               libjson0-dev libssl-dev
+                libpcap-dev libncurses-dev libedit-dev pciutils liblua5.2-dev libncursesw5-dev libjson-c-dev libssl-dev
        touch .download
 }