summaryrefslogtreecommitdiffstats
path: root/recipes-extended/odp
diff options
context:
space:
mode:
authorChunrong Guo <chunrong.guo@nxp.com>2017-07-28 15:44:22 +0800
committerOtavio Salvador <otavio@ossystems.com.br>2017-08-07 11:42:29 -0300
commitf2e3d4574ee0a543d1270c30377c2a8c24a7bda6 (patch)
treef334e128ff1e9d1f91290c4914772593783d054f /recipes-extended/odp
parent5e414150057f379e7b8a988c8f5832a0168fb162 (diff)
downloadmeta-freescale-f2e3d4574ee0a543d1270c30377c2a8c24a7bda6.tar.gz
odp: update to fdb26cb
*include the following changes fdb26cb - Removing local compilation patch from QBMAN repo 487e3ce - Patch to update the repo for submodule to github repo. d62396e - Patch to fix the copyright issues caught by black-duck 14878eb - Patch to fix legal review comments. e460f97 - Minor changes in KNI module w.r.t. Linux 4.4 541d97b - Merge pull request #492 in GITAM/odp from ~B42948/odp:feature/ODP-1114 to fsl_odp_v16.07_qoriq bf27ab6 - Merge pull request #490 in GITAM/odp from ~B49015/odp:fsl_odp_v16.07_qoriq_bug5 to fsl_odp_v16.07_qoriq 3b17a94 - Script: A script added to disable the services on ls2088 board 1a6e18f - Merge pull request #491 in GITAM/odp from ~B02416/odp:fsl_odp_v16.07_qoriq to fsl_odp_v16.07_qoriq 1358542 - Patch to remove the support for dpaa1 from ODP. 5a7998a - Patch to sync the ODP QBMAN code with QBMAN repo. 589700d - Affing threads starting from highest CPU# 1bdbf7a - Merge pull request #485 in GITAM/odp from ~B38457/odp:fsl_odp_v16.07_qoriq to fsl_odp_v16.07_qoriq e6344c8 - Merge pull request #484 in GITAM/odp from ~B42948/odp:bugfix/ODP-1099 to fsl_odp_v16.07_qoriq fe19377 - Removing global variable "enable_hash" 909b445 - Updating DPL creation script for AIOP support 776e830 - Fixing array out of bound issue for tm_capability records e036b2e - Merge pull request #480 in GITAM/odp from ~B46187/odp_2:fsl_odp_v16.07_qoriq to fsl_odp_v16.07_qoriq 5fa71cb - odp_dpaa2: Patch to change queue state when queue is attached 188333f - odp_dpaa2: Patch to fix DPNI_OPTIONS issue in dynamic_dpl script. 9d8fcba - Merge pull request #476 in GITAM/odp from ~B38457/odp:fsl_odp_v16.07_qoriq to fsl_odp_v16.07_qoriq 1dd2557 - Merge pull request #479 in GITAM/odp from ~B02416/odp:fsl_odp_v16.07_qoriq to fsl_odp_v16.07_qoriq c67496b - Adding README for QorIQ ODP in LDASH. d9864bb - Merge pull request #474 in GITAM/odp from ~B49015/odp:fsl_odp_v16.07_qoriq_bug5 to fsl_odp_v16.07_qoriq 7385bc4 - Merge pull request #475 in GITAM/odp from ~B46187/odp_2:fsl_odp_v16.07_qoriq to fsl_odp_v16.07_qoriq 6d4381b - Giving dedicated portals to control threads. 4361d1f - Validating pktio state before cleaning it ac87bce - odp_dpaa2: Patch to define MAP_HUGETLB flag. 09ac60f - SCRIPT: Invalid board type fix 924e7a4 - Merge pull request #471 in GITAM/odp from ~B42948/odp:feature/ODP-988 to fsl_odp_v16.07_qoriq Signed-off-by: Chunrong Guo <B40290@freescale.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-extended/odp')
-rw-r--r--recipes-extended/odp/odp.inc19
-rw-r--r--recipes-extended/odp/odp/0001-Fix-this-build-error.patch28
-rw-r--r--recipes-extended/odp/odp/disable-the-Werror-flag.patch19
-rw-r--r--recipes-extended/odp/odp_git.bb2
4 files changed, 39 insertions, 29 deletions
diff --git a/recipes-extended/odp/odp.inc b/recipes-extended/odp/odp.inc
index 172b81c8..421deff2 100644
--- a/recipes-extended/odp/odp.inc
+++ b/recipes-extended/odp/odp.inc
@@ -4,21 +4,22 @@ DESCRIPTION = "OpenDataPlane (ODP) provides a data plane application programming
4HOMEPAGE = "http://www.opendataplane.org" 4HOMEPAGE = "http://www.opendataplane.org"
5SECTION = "console/network" 5SECTION = "console/network"
6LICENSE = "BSD-3-Clause" 6LICENSE = "BSD-3-Clause"
7LIC_FILES_CHKSUM = "file://LICENSE;md5=4ccfa994aa96974cfcd39a59faee20a2" 7LIC_FILES_CHKSUM = "file://LICENSE;md5=472053b942339f200d9e1d2dcb947e9d"
8 8
9FILESEXTRAPATHS_prepend := "${THISDIR}/odp:" 9FILESEXTRAPATHS_prepend := "${THISDIR}/odp:"
10 10
11SRC_URI = " \ 11SRC_URI = " \
12git://git.freescale.com/ppc/sdk/odp.git;nobranch=1 \ 12git://github.com/qoriq-open-source/odp.git;nobranch=1 \
13git://git.freescale.com/ppc/sdk/qbman_userspace.git;nobranch=1;name=qbman;destsuffix=git/platform/linux-dpaa2/flib/qbman \ 13git://github.com/qoriq-open-source/qbman_userspace.git;nobranch=1;name=qbman;destsuffix=git/platform/linux-dpaa2/flib/qbman \
14git://git.freescale.com/ppc/sdk/flib.git;nobranch=1;name=rta;destsuffix=git/platform/linux-dpaa2/flib/rta \ 14git://github.com/qoriq-open-source/flib.git;nobranch=1;name=rta;destsuffix=git/platform/linux-dpaa2/flib/rta \
15" 15"
16SRC_URI += "file://disable-the-Werror-flag.patch"
17 16
18SRCREV = "a8935384642f5da8236260dd553c52dbbc7c63ed" 17SRC_URI += "file://0001-Fix-this-build-error.patch"
19SRCREV_qbman = "0b8648d702f701417cd6cc3cbcdc228e640d20b6" 18
20SRCREV_rta = "bbab28b03ae21c52ce913f8b052acf53bd24ff5d" 19SRCREV = "fdb26cb5c751afadf2299da2a1376e6ca0e61cc7"
20SRCREV_qbman = "097595befc2bb60b733027e94ad2ed16a0e9cae0"
21SRCREV_rta = "2c9b9dc22699f7c00f24a2134c42901932a6a0b9"
21 22
22S = "${WORKDIR}/git" 23S = "${WORKDIR}/git"
23 24
24COMPATIBLE_MACHINE = "(ls1043a|ls1046a|ls2080a|ls2088a)" 25COMPATIBLE_MACHINE = "(ls1043a|ls1046a|ls2080a|ls2088a|ls1088a)"
diff --git a/recipes-extended/odp/odp/0001-Fix-this-build-error.patch b/recipes-extended/odp/odp/0001-Fix-this-build-error.patch
new file mode 100644
index 00000000..fd276437
--- /dev/null
+++ b/recipes-extended/odp/odp/0001-Fix-this-build-error.patch
@@ -0,0 +1,28 @@
1From 9fb1642b38053de6e8098f6b608ad86ff45bf7f7 Mon Sep 17 00:00:00 2001
2From: Chunrong Guo <chunrong.guo@nxp.com>
3Date: Fri, 28 Jul 2017 14:59:22 +0800
4Subject: [PATCH] Fix this build error
5
6fix the below error:
7|error: 'SIGEV_THREAD' undeclared (first use in this function); did you mean 'CLONE_THREAD'?
8
9Signed-off-by: Chunrong Guo <B40290@freescale.com>
10---
11 example/lpm-ipfwd/app/odp_lpmfwd.c | 1 +
12 1 file changed, 1 insertion(+)
13
14diff --git a/example/lpm-ipfwd/app/odp_lpmfwd.c b/example/lpm-ipfwd/app/odp_lpmfwd.c
15index 57c5e82..f8507be 100644
16--- a/example/lpm-ipfwd/app/odp_lpmfwd.c
17+++ b/example/lpm-ipfwd/app/odp_lpmfwd.c
18@@ -23,6 +23,7 @@
19 #include <errno.h>
20 #include <error.h>
21 #include <mqueue.h>
22+#include <signal.h>
23
24 #include <example_debug.h>
25
26--
271.8.3.2
28
diff --git a/recipes-extended/odp/odp/disable-the-Werror-flag.patch b/recipes-extended/odp/odp/disable-the-Werror-flag.patch
deleted file mode 100644
index 3ba1c060..00000000
--- a/recipes-extended/odp/odp/disable-the-Werror-flag.patch
+++ /dev/null
@@ -1,19 +0,0 @@
1Patch to disable the Werror flag.
2
3Werror flag is causing the code compilaton error when
4ubuntu toolchain is used to compile the code in Dash.
5This patch disables the Werror flag to avoid such errors.
6
7Signed-off-by: Sandeep Malik <Sandeep.Malik@nxp.com>
8
9--- a/configure.acold 2017-04-19 17:40:58.312258373 +0800
10+++ b/configure.ac 2017-04-19 17:41:22.820257525 +0800
11@@ -249,7 +249,7 @@
12 ##########################################################################
13 # Default warning setup
14 ##########################################################################
15-ODP_CFLAGS="$ODP_CFLAGS -W -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes"
16+ODP_CFLAGS="$ODP_CFLAGS -W -Wall -Wstrict-prototypes -Wmissing-prototypes"
17 ODP_CFLAGS="$ODP_CFLAGS -Wmissing-declarations -Wold-style-definition -Wpointer-arith"
18 ODP_CFLAGS="$ODP_CFLAGS -Wcast-align -Wnested-externs -Wcast-qual -Wformat-nonliteral"
19 ODP_CFLAGS="$ODP_CFLAGS -Wformat-security -Wundef -Wwrite-strings"
diff --git a/recipes-extended/odp/odp_git.bb b/recipes-extended/odp/odp_git.bb
index 32e31072..b7c7deb6 100644
--- a/recipes-extended/odp/odp_git.bb
+++ b/recipes-extended/odp/odp_git.bb
@@ -18,6 +18,7 @@ ODP_BUILD_TYPE ?= "ls2088"
18ODP_BUILD_TYPE_ls1043ardb = "ls1043" 18ODP_BUILD_TYPE_ls1043ardb = "ls1043"
19ODP_BUILD_TYPE_ls1046ardb = "ls1046" 19ODP_BUILD_TYPE_ls1046ardb = "ls1046"
20ODP_BUILD_TYPE_ls2080ardb = "ls2080" 20ODP_BUILD_TYPE_ls2080ardb = "ls2080"
21ODP_BUILD_TYPE_ls1088ardb = "ls1088"
21 22
22EXTRA_OECONF = "--with-platform=${ODP_PLATFORM} \ 23EXTRA_OECONF = "--with-platform=${ODP_PLATFORM} \
23 --with-sdk-install-path=${STAGING_DIR_TARGET} \ 24 --with-sdk-install-path=${STAGING_DIR_TARGET} \
@@ -53,7 +54,6 @@ do_install_append () {
53 cp -rf ${S}/platform/linux-dpaa2/kni/*.h ${D}${includedir}/odp/kni/ 54 cp -rf ${S}/platform/linux-dpaa2/kni/*.h ${D}${includedir}/odp/kni/
54 cp -rf ${S}/kern/*.h ${D}${includedir}/odp/kern/ 55 cp -rf ${S}/kern/*.h ${D}${includedir}/odp/kern/
55 cp -rf ${S}/platform/linux-dpaa2/flib/mc/*.h ${D}${includedir}/odp/flib/mc/ 56 cp -rf ${S}/platform/linux-dpaa2/flib/mc/*.h ${D}${includedir}/odp/flib/mc/
56 cp -rf ${S}/platform/linux-dpaa2/flib/qbman/include/drivers/*.h ${D}${includedir}/odp/flib/qbman/include/drivers
57 57
58 sed -i -e 's#platform/linux-dpaa2/##g' ${D}${includedir}/odp/kern/*.h 58 sed -i -e 's#platform/linux-dpaa2/##g' ${D}${includedir}/odp/kern/*.h
59} 59}