From 0540b982fc5547951ac55427206c8b3a810ef3a5 Mon Sep 17 00:00:00 2001 From: Philippe Coval Date: Tue, 24 Jan 2017 15:22:01 +0100 Subject: [PATCH] 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 ----------- ...ools-from-sysroot-before-system-PATH-agai.patch | 93 ---------------------- .../recipes-core/iotivity/iotivity_1.2.0.bbappend | 4 - 3 files changed, 145 deletions(-) delete mode 100644 meta-agl-bsp/meta-oic/recipes-core/iotivity/files/0081-yocto-Add-aarch64-for-DragonBoard-410c.patch delete mode 100644 meta-agl-bsp/meta-oic/recipes-core/iotivity/files/0364-yocto-Use-tools-from-sysroot-before-system-PATH-agai.patch delete mode 100644 meta-agl-bsp/meta-oic/recipes-core/iotivity/iotivity_1.2.0.bbappend 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 - diff --git a/meta-agl-bsp/meta-oic/recipes-core/iotivity/files/0364-yocto-Use-tools-from-sysroot-before-system-PATH-agai.patch b/meta-agl-bsp/meta-oic/recipes-core/iotivity/files/0364-yocto-Use-tools-from-sysroot-before-system-PATH-agai.patch deleted file mode 100644 index b8493c0b6..000000000 --- a/meta-agl-bsp/meta-oic/recipes-core/iotivity/files/0364-yocto-Use-tools-from-sysroot-before-system-PATH-agai.patch +++ /dev/null @@ -1,93 +0,0 @@ -From b0f0c742ec1e1fc223871f6d98b21de09cf024b7 Mon Sep 17 00:00:00 2001 -From: Philippe Coval -Date: Fri, 16 Sep 2016 20:22:03 +0200 -Subject: [PATCH 364/364] yocto: Use tools from sysroot before system PATH - (again) - -Reintroduce existing change that was (wrongly?) removed in: - -https://gerrit.iotivity.org/gerrit/#/c/12029/64/build_common/SConscript - -Original review at: - -https://gerrit.iotivity.org/gerrit/11935 - -To ensure reproductibily Scons avoids to rely on environment - but some systems like Yocto are defining their own cross compiling env. - -To deal with those orthogonal paradigms, - a new CONFIG_ENVIRONMENT_IMPORT variable has been introduced, - It enables import of needed variables (PATH and pkg-config's ones). - -Without this change, system tools might be used by scons - instead of looking into yocto's sysroot. - This is not not wanted and may be less reproductible. - -This problem was noticed when building Ostro OS - (on a system without all Yocto dependencies) - reported error messages were: - - | sh: gdbus-codegen: command not found - | /bin/sh: 1: pkg-config: not found - -More information about using SCONS along Yocto, check some notes at: - -https://bitbucket.org/scons/scons/wiki/Notes - -Bug: https://jira.iotivity.org/browse/IOT-1219 -Change-Id: I6af59a590f8be489398623d29cf85c2f00000002 -Origin: https://github.com/TizenTeam/iotivity/tree/sandbox/pcoval/on/master/mine -Thanks-to: Mikko Ylinen -Signed-off-by: Philippe Coval -Reviewed-on: https://gerrit.iotivity.org/gerrit/16225 -Tested-by: jenkins-iotivity -Reviewed-by: Kishen Maloor -(cherry picked from commit 1085512bc103e987d95a43063e6552f39acd40f2) -Reviewed-on: https://gerrit.iotivity.org/gerrit/16223 ---- - build_common/SConscript | 22 +++++++++++++--------- - 1 file changed, 13 insertions(+), 9 deletions(-) - -diff --git a/build_common/SConscript b/build_common/SConscript -index a9ff494..fff1752 100644 ---- a/build_common/SConscript -+++ b/build_common/SConscript -@@ -194,13 +194,19 @@ if target_os in targets_support_cc: - if prefix or tc_path: - print tc_set_msg - --# If cross-compiling, honor environment settings for toolchain to avoid picking up native tools --if os.environ.get('PKG_CONFIG') != None: -- env["ENV"]["PKG_CONFIG"] = os.environ.get("PKG_CONFIG") --if os.environ.get('PKG_CONFIG_PATH') != None: -- env["ENV"]["PKG_CONFIG_PATH"] = os.environ.get("PKG_CONFIG_PATH") --if os.environ.get('PKG_CONFIG_SYSROOT_DIR') != None: -- env["ENV"]["PKG_CONFIG_SYSROOT_DIR"] = os.environ.get("PKG_CONFIG_SYSROOT_DIR") -+# Import env variables only if reproductibility is ensured -+if target_os in ['yocto']: -+ env['CONFIG_ENVIRONMENT_IMPORT'] = True -+else: -+ env['CONFIG_ENVIRONMENT_IMPORT'] = False -+ -+if env['CONFIG_ENVIRONMENT_IMPORT'] == True: -+ print "warning: importing some environment variables for OS: %s" % target_os -+ for ev in ['PATH', 'PKG_CONFIG', 'PKG_CONFIG_PATH', 'PKG_CONFIG_SYSROOT_DIR']: -+ if os.environ.get(ev) != None: -+ env['ENV'][ev] = os.environ.get(ev) -+ if os.environ['LDFLAGS'] != None: -+ env.AppendUnique(LINKFLAGS = Split(os.environ['LDFLAGS'])) - - # Ensure scons be able to change its working directory - env.SConscriptChdir(1) -@@ -394,8 +400,6 @@ if target_os == "yocto": - env[tool] = os.path.join(path, os.environ[tool]) - break - env['CROSS_COMPILE'] = target_prefix[:len(target_prefix) - 1] -- if os.environ['LDFLAGS'] != None: -- env.AppendUnique(LINKFLAGS = Split(os.environ['LDFLAGS'])) - except: - print "ERROR in Yocto cross-toolchain environment" - Exit(1) --- -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 deleted file mode 100644 index 0d97354e7..000000000 --- a/meta-agl-bsp/meta-oic/recipes-core/iotivity/iotivity_1.2.0.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -DEPENDS += " glib-2.0-native" -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" -SRC_URI += "file://0081-yocto-Add-aarch64-for-DragonBoard-410c.patch" -SRC_URI += "file://0364-yocto-Use-tools-from-sysroot-before-system-PATH-agai.patch" -- 2.16.6