From 0540b982fc5547951ac55427206c8b3a810ef3a5 Mon Sep 17 00:00:00 2001 From: Philippe Coval Date: Tue, 24 Jan 2017 15:22:01 +0100 Subject: meta-oic: Align to 1.2.0, drop downstream changes This is reverting all downstream changes: Change-Id: I6af59a590f8be489398623d29cf85c2f00000002 Change-Id: I06f56ae860760002a6376866488e1f55624f50cc Change-Id: I4c735a276d3a484a330ef1ea8611105e6a84e35a Bug-AGL: SPEC-158 Change-Id: I9bee17f841d1caa5492112fc4ea044fee9104038 Signed-off-by: Philippe Coval --- ...81-yocto-Add-aarch64-for-DragonBoard-410c.patch | 48 ---------------------- 1 file changed, 48 deletions(-) delete mode 100644 meta-agl-bsp/meta-oic/recipes-core/iotivity/files/0081-yocto-Add-aarch64-for-DragonBoard-410c.patch (limited to 'meta-agl-bsp/meta-oic/recipes-core/iotivity/files/0081-yocto-Add-aarch64-for-DragonBoard-410c.patch') 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 deleted file mode 100644 index 08c93f608..000000000 --- a/meta-agl-bsp/meta-oic/recipes-core/iotivity/files/0081-yocto-Add-aarch64-for-DragonBoard-410c.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 6554de025f4819f9f458cde70d706beab3ed11b8 Mon Sep 17 00:00:00 2001 -From: Philippe Coval -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 -Origin: https://lists.linuxfoundation.org/pipermail/automotive-discussions/2016-November/002805.html -Signed-off-by: Philippe Coval -Reviewed-on: https://gerrit.iotivity.org/gerrit/14187 -Tested-by: jenkins-iotivity -Reviewed-by: Habib Virji ---- - 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 - -- cgit 1.2.3-korg