[PATCH 1/2] ovs-dpdk: remove static key word

[PATCH 1/2] ovs-dpdk: remove static key word

[C.r. Guo]

From: Chunrong Guo <chunrong.guo@nxp.com>

fix the below error:
|lib/dhparams.c:2:12: error: static declaration of 'get_dh1024' follows non-static declaration
|  static DH *get_dh1024(void)

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 .../0001-automake-remove-static-key-word.patch     | 27 ++++++++++++++++++++++
 recipes-extended/ovs-dpdk/ovs-dpdk_2.9.bb          |  4 +++-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 recipes-extended/ovs-dpdk/ovs-dpdk/0001-automake-remove-static-key-word.patch

diff --git a/recipes-extended/ovs-dpdk/ovs-dpdk/0001-automake-remove-static-key-word.patch b/recipes-extended/ovs-dpdk/ovs-dpdk/0001-automake-remove-static-key-word.patch
new file mode 100644
index 0000000..e438e47
--- /dev/null
+++ b/recipes-extended/ovs-dpdk/ovs-dpdk/0001-automake-remove-static-key-word.patch
@@ -0,0 +1,27 @@
+From 9327cc35bc9e7040d9de743caebd0fee72bbd619 Mon Sep 17 00:00:00 2001
+From: Chunrong Guo <chunrong.guo@nxp.com>
+Date: Fri, 12 Oct 2018 10:53:00 +0800
+Subject: [PATCH] automake: remove static key word
+
+Upstream-Status: Inappropriate [embedded specific]
+
+Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
+---
+ lib/automake.mk | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/automake.mk b/lib/automake.mk
+index 8ecad12..f9016a0 100644
+--- a/lib/automake.mk
++++ b/lib/automake.mk
+@@ -439,6 +439,7 @@ lib/dhparams.c: lib/dh1024.pem lib/dh2048.pem lib/dh4096.pem
+ 	 openssl dhparam -C -in $(srcdir)/lib/dh2048.pem -noout &&	\
+ 	 openssl dhparam -C -in $(srcdir)/lib/dh4096.pem -noout)	\
+ 	| sed 's/\(get_dh[0-9]*\)()/\1(void)/' > lib/dhparams.c.tmp &&  \
++        sed -i '/\(get_dh[0-9]*\)(void)/s/^static//' lib/dhparams.c.tmp && \
+ 	mv lib/dhparams.c.tmp lib/dhparams.c
+ else
+ lib_libopenvswitch_la_SOURCES += lib/stream-nossl.c
+-- 
+2.7.4
+
diff --git a/recipes-extended/ovs-dpdk/ovs-dpdk_2.9.bb b/recipes-extended/ovs-dpdk/ovs-dpdk_2.9.bb
index ab351f6..b1994c5 100644
--- a/recipes-extended/ovs-dpdk/ovs-dpdk_2.9.bb
+++ b/recipes-extended/ovs-dpdk/ovs-dpdk_2.9.bb
@@ -7,7 +7,9 @@ RDEPENDS_${PN} = "bash libcrypto libssl python"
 
 inherit pythonnative
 
-SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/ovs-dpdk;nobranch=1"
+SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/ovs-dpdk;nobranch=1 \
+    file://0001-automake-remove-static-key-word.patch \
+"
 SRCREV = "24eec4133f03b0a5a8f903577bc87603577150c0"
 
 S = "${WORKDIR}/git"
-- 
2.7.4

[PATCH 2/2] ceetm: install json_print.h

[C.r. Guo]

From: Chunrong Guo <chunrong.guo@nxp.com>

*fix the below error:
|fatal error: json_print.h: No such file or directory

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 recipes-kernel/ceetm/ceetm_git.bb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/recipes-kernel/ceetm/ceetm_git.bb b/recipes-kernel/ceetm/ceetm_git.bb
index 57fbbe4..8613e50 100644
--- a/recipes-kernel/ceetm/ceetm_git.bb
+++ b/recipes-kernel/ceetm/ceetm_git.bb
@@ -11,6 +11,10 @@ S = "${WORKDIR}/git"
 
 EXTRA_OEMAKE = 'CC="${CC}" LD="${CC}" IPROUTE2_DIR="{STAGING_DIR_TARGET}"'
 
+do_compile_prepend () {
+    cp ${RECIPE_SYSROOT}/usr/include/include/json_print.h ${RECIPE_SYSROOT}/usr/include
+}
+
 do_install(){
     mkdir -p ${D}/${libdir}/tc
     cp ${S}/q_ceetm.so ${D}/${libdir}/tc/
-- 
2.7.4