aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilippe Coval <philippe.coval@osg.samsung.com>2016-12-29 14:40:39 +0100
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2016-12-30 13:08:42 +0000
commit5c82102bb1f6ec3cdc97258a36912628cc518b24 (patch)
tree362fae565d57f7bad810b92e17f5c9211557acf2
parent0723eddcb9d683a9b9e0ee03a8455e2ce78cc8fc (diff)
meta-oic: Hotfix to support aarch64 for DragonBoard-410c
Apply patch from iotivity-1.2.1: * [PATCH 081/341] yocto: Add aarch64 for DragonBoard-410c Bug-AGL: SPEC-158 Change-Id: I06f56ae860760002a6376866488e1f55624f50cc Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
-rw-r--r--meta-agl-bsp/meta-oic/recipes-core/iotivity/files/0081-yocto-Add-aarch64-for-DragonBoard-410c.patch48
-rw-r--r--meta-agl-bsp/meta-oic/recipes-core/iotivity/iotivity_1.2.0.bbappend2
2 files changed, 50 insertions, 0 deletions
diff --git a/meta-agl-bsp/meta-oic/recipes-core/iotivity/files/0081-yocto-Add-aarch64-for-DragonBoard-410c.patch b/meta-agl-bsp/meta-oic/recipes-core/iotivity/files/0081-yocto-Add-aarch64-for-DragonBoard-410c.patch
new file mode 100644
index 000000000..08c93f608
--- /dev/null
+++ b/meta-agl-bsp/meta-oic/recipes-core/iotivity/files/0081-yocto-Add-aarch64-for-DragonBoard-410c.patch
@@ -0,0 +1,48 @@
+From 6554de025f4819f9f458cde70d706beab3ed11b8 Mon Sep 17 00:00:00 2001
+From: Philippe Coval <philippe.coval@osg.samsung.com>
+Date: Thu, 10 Nov 2016 12:47:39 +0100
+Subject: [PATCH 081/341] yocto: Add aarch64 for DragonBoard-410c
+
+Backported to 1.1-rel branch
+
+Change-Id: I0ebf93ca17a9a6624da3caaaf7487529b2c556d6
+Credit-to: Kotaro HASHIMOTO <Hashimoto.Kotaro@ds.MitsubishiElectric.co.jp>
+Origin: https://lists.linuxfoundation.org/pipermail/automotive-discussions/2016-November/002805.html
+Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
+Reviewed-on: https://gerrit.iotivity.org/gerrit/14187
+Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
+Reviewed-by: Habib Virji <habib.virji@samsung.com>
+---
+ build_common/SConscript | 2 +-
+ resource/csdk/connectivity/build/SConscript | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/build_common/SConscript b/build_common/SConscript
+index 1427f08..56ea713 100644
+--- a/build_common/SConscript
++++ b/build_common/SConscript
+@@ -26,7 +26,7 @@ os_arch_map = {
+ 'darwin': ['i386', 'x86_64'],
+ 'ios': ['i386', 'x86_64', 'armv7', 'armv7s', 'arm64'],
+ 'arduino': ['avr', 'arm'],
+- 'yocto': ['i586', 'i686', 'x86_64', 'arm', 'powerpc', 'powerpc64', 'mips', 'mipsel'],
++ 'yocto': ['i586', 'i686', 'x86_64', 'arm', 'aarch64', 'powerpc', 'powerpc64', 'mips', 'mipsel'],
+ }
+
+ host = platform.system().lower()
+diff --git a/resource/csdk/connectivity/build/SConscript b/resource/csdk/connectivity/build/SConscript
+index b812fed..44c7d09 100644
+--- a/resource/csdk/connectivity/build/SConscript
++++ b/resource/csdk/connectivity/build/SConscript
+@@ -21,7 +21,7 @@ os_arch_map = {
+ 'darwin': ['i386', 'x86_64'],
+ 'ios': ['i386', 'x86_64', 'armv7', 'armv7s', 'arm64'],
+ 'arduino': ['avr', 'arm'],
+- 'yocto': ['i586', 'i686', 'x86_64', 'arm', 'powerpc', 'powerpc64', 'mips', 'mipsel'],
++ 'yocto': ['i586', 'i686', 'x86_64', 'arm', 'aarch64', 'powerpc', 'powerpc64', 'mips', 'mipsel'],
+ }
+
+ host = platform.system().lower()
+--
+1.9.1
+
diff --git a/meta-agl-bsp/meta-oic/recipes-core/iotivity/iotivity_1.2.0.bbappend b/meta-agl-bsp/meta-oic/recipes-core/iotivity/iotivity_1.2.0.bbappend
index 6a822e5de..8e4635b6a 100644
--- a/meta-agl-bsp/meta-oic/recipes-core/iotivity/iotivity_1.2.0.bbappend
+++ b/meta-agl-bsp/meta-oic/recipes-core/iotivity/iotivity_1.2.0.bbappend
@@ -1 +1,3 @@
DEPENDS += " glib-2.0-native"
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+SRC_URI += "file://0081-yocto-Add-aarch64-for-DragonBoard-410c.patch"