aboutsummaryrefslogtreecommitdiff
path: root/meta-linaro
diff options
context:
space:
mode:
authorStuart Haslam <stuart.haslam@linaro.org>2015-04-23 10:34:19 +0100
committerKoen Kooi <koen.kooi@linaro.org>2015-05-08 08:20:39 +0000
commit4e0bb483557cb467f4f35fcbad88a8387b262e58 (patch)
treedb453bc8ad234b49c0e6c0fa7f4b35db4ffe0a4b /meta-linaro
parent94c5706b193baddffdc7073e603cf401ad2a3a86 (diff)
downloadmeta-linaro-4e0bb483557cb467f4f35fcbad88a8387b262e58.tar.gz
odp: update to v1.0.3
Update ODP recipe to use release v1.0.3 and drop the patch which was previously required in order to avoid a compiler warning, as this is now included in the upstream release (ODP commit 71fcc8a5). Change-Id: I2d4441020e165ab557f78d85a684f8228384f509 Signed-off-by: Stuart Haslam <stuart.haslam@linaro.org>
Diffstat (limited to 'meta-linaro')
-rw-r--r--meta-linaro/recipes-extra/odp/odp/0001-Replace-deprecated-_BSD_SOURCE-with-_DEFAULT_SOURCE.patch41
-rw-r--r--meta-linaro/recipes-extra/odp/odp_v1.0.3.bb (renamed from meta-linaro/recipes-extra/odp/odp.bb)7
2 files changed, 2 insertions, 46 deletions
diff --git a/meta-linaro/recipes-extra/odp/odp/0001-Replace-deprecated-_BSD_SOURCE-with-_DEFAULT_SOURCE.patch b/meta-linaro/recipes-extra/odp/odp/0001-Replace-deprecated-_BSD_SOURCE-with-_DEFAULT_SOURCE.patch
deleted file mode 100644
index 4173e081..00000000
--- a/meta-linaro/recipes-extra/odp/odp/0001-Replace-deprecated-_BSD_SOURCE-with-_DEFAULT_SOURCE.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From fe143c348c887e2ffee61516aa631e41e4f752ba Mon Sep 17 00:00:00 2001
-From: "Gary S. Robertson" <gary.robertson@linaro.org>
-Date: Wed, 4 Mar 2015 17:16:16 -0600
-Subject: [PATCH] Replace deprecated _BSD_SOURCE with _DEFAULT_SOURCE
-
-Compilation of ODP v1.0 on OpenEmbedded failed due to
-the following warning being treated as an error:
-| In file included from /usr/include/stdlib.h:24:0,
-| from odp/example/ipsec/odp_ipsec.c:16:
-| /usr/include/features.h:148:3:
-| error: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated,
-| use _DEFAULT_SOURCE" [-Werror=cpp]
-| # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated,
-| use _DEFAULT_SOURCE"
-| ^
-
-Modified the source 'example/ipsec/odp_ipsec.c' as recommended.
-
-Upstream Status: Applied to lng/odp.git repository
-
-Signed-off-by: Gary S. Robertson <gary.robertson@linaro.org>
----
- example/ipsec/odp_ipsec.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/example/ipsec/odp_ipsec.c b/example/ipsec/odp_ipsec.c
-index 70cd957..98160ba 100644
---- a/example/ipsec/odp_ipsec.c
-+++ b/example/ipsec/odp_ipsec.c
-@@ -10,7 +10,7 @@
- * @example odp_example_ipsec.c ODP basic packet IO cross connect with IPsec test application
- */
-
--#define _BSD_SOURCE
-+#define _DEFAULT_SOURCE
- /* enable strtok */
- #define _POSIX_C_SOURCE 200112L
- #include <stdlib.h>
---
-1.9.1
-
diff --git a/meta-linaro/recipes-extra/odp/odp.bb b/meta-linaro/recipes-extra/odp/odp_v1.0.3.bb
index 67f8097a..1717e5ae 100644
--- a/meta-linaro/recipes-extra/odp/odp.bb
+++ b/meta-linaro/recipes-extra/odp/odp_v1.0.3.bb
@@ -5,15 +5,12 @@ SECTION = "console/network"
LICENSE = "BSD | GPLv2"
LIC_FILES_CHKSUM = "file://LICENSE;md5=4ccfa994aa96974cfcd39a59faee20a2"
-PV = "20140820+git${SRCPV}"
DEPENDS = "openssl"
-SRC_URI = "git://git.linaro.org/lng/odp.git;name=odp \
- file://0001-Replace-deprecated-_BSD_SOURCE-with-_DEFAULT_SOURCE.patch \
-"
+SRC_URI = "git://git.linaro.org/lng/odp.git;name=odp"
-SRCREV_odp = "49bc9ee8fdd47c6193108a90c94ca3b3de66ba46"
+SRCREV_odp = "1bc6f09703cfa1cb0cb6632af2106ed4238784b0"
SRCREV_FORMAT = "odp"
S = "${WORKDIR}/git"