diff options
author | Chunrong Guo <chunrong.guo@nxp.com> | 2019-01-21 07:46:32 +0000 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2019-01-31 10:29:40 -0200 |
commit | c6f55535fa208993861e6a0399dd99d204ffc076 (patch) | |
tree | 8fdd4b1a92144de882e65e7177505f603bde1f83 | |
parent | 677aa859a7da80cebc5fc461461d03a92ba5db32 (diff) | |
download | meta-freescale-c6f55535fa208993861e6a0399dd99d204ffc076.tar.gz |
ovs-dpdk: remove static key word
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>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-rw-r--r-- | recipes-extended/ovs-dpdk/ovs-dpdk/0001-automake-remove-static-key-word.patch | 27 | ||||
-rw-r--r-- | recipes-extended/ovs-dpdk/ovs-dpdk_2.9.bb | 4 |
2 files changed, 30 insertions, 1 deletions
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 00000000..e438e476 --- /dev/null +++ b/recipes-extended/ovs-dpdk/ovs-dpdk/0001-automake-remove-static-key-word.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | From 9327cc35bc9e7040d9de743caebd0fee72bbd619 Mon Sep 17 00:00:00 2001 | ||
2 | From: Chunrong Guo <chunrong.guo@nxp.com> | ||
3 | Date: Fri, 12 Oct 2018 10:53:00 +0800 | ||
4 | Subject: [PATCH] automake: remove static key word | ||
5 | |||
6 | Upstream-Status: Inappropriate [embedded specific] | ||
7 | |||
8 | Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com> | ||
9 | --- | ||
10 | lib/automake.mk | 1 + | ||
11 | 1 file changed, 1 insertion(+) | ||
12 | |||
13 | diff --git a/lib/automake.mk b/lib/automake.mk | ||
14 | index 8ecad12..f9016a0 100644 | ||
15 | --- a/lib/automake.mk | ||
16 | +++ b/lib/automake.mk | ||
17 | @@ -439,6 +439,7 @@ lib/dhparams.c: lib/dh1024.pem lib/dh2048.pem lib/dh4096.pem | ||
18 | openssl dhparam -C -in $(srcdir)/lib/dh2048.pem -noout && \ | ||
19 | openssl dhparam -C -in $(srcdir)/lib/dh4096.pem -noout) \ | ||
20 | | sed 's/\(get_dh[0-9]*\)()/\1(void)/' > lib/dhparams.c.tmp && \ | ||
21 | + sed -i '/\(get_dh[0-9]*\)(void)/s/^static//' lib/dhparams.c.tmp && \ | ||
22 | mv lib/dhparams.c.tmp lib/dhparams.c | ||
23 | else | ||
24 | lib_libopenvswitch_la_SOURCES += lib/stream-nossl.c | ||
25 | -- | ||
26 | 2.7.4 | ||
27 | |||
diff --git a/recipes-extended/ovs-dpdk/ovs-dpdk_2.9.bb b/recipes-extended/ovs-dpdk/ovs-dpdk_2.9.bb index ab351f6c..b1994c5c 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" | |||
7 | 7 | ||
8 | inherit pythonnative | 8 | inherit pythonnative |
9 | 9 | ||
10 | SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/ovs-dpdk;nobranch=1" | 10 | SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/ovs-dpdk;nobranch=1 \ |
11 | file://0001-automake-remove-static-key-word.patch \ | ||
12 | " | ||
11 | SRCREV = "24eec4133f03b0a5a8f903577bc87603577150c0" | 13 | SRCREV = "24eec4133f03b0a5a8f903577bc87603577150c0" |
12 | 14 | ||
13 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |