From 8f3410e85933f1d4b3d7539adf35124d4e756600 Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Fri, 19 Sep 2014 09:39:23 +0200 Subject: [PATCH] meta-tizen: Fix cmake build Change-Id: Ia605682e5b586fe127c43fefb87a84ee7067e0f3 (From meta-tizen rev: fbd5dd8150619c69d5b214bbb2904bdcc22adc7a) Signed-off-by: Ronan Le Martret Signed-off-by: Patrick Ohly --- .../classes/{tizen-cmake.bbclass => tizen_cmake.bbclass} | 2 +- meta-tizen/recipes-tizen/security-server/security-server.inc | 2 +- .../recipes-tizen/security-server/security-server_git.bb | 2 +- .../recipes-tizen/system-server/system-server-extraconf.inc | 11 ++++++++++- meta-tizen/recipes-tizen/system-server/system-server_git.bb | 2 +- 5 files changed, 14 insertions(+), 5 deletions(-) rename meta-tizen/classes/{tizen-cmake.bbclass => tizen_cmake.bbclass} (97%) diff --git a/meta-tizen/classes/tizen-cmake.bbclass b/meta-tizen/classes/tizen_cmake.bbclass similarity index 97% rename from meta-tizen/classes/tizen-cmake.bbclass rename to meta-tizen/classes/tizen_cmake.bbclass index 73757bc..7f626ce 100644 --- a/meta-tizen/classes/tizen-cmake.bbclass +++ b/meta-tizen/classes/tizen_cmake.bbclass @@ -26,7 +26,7 @@ OECMAKE_RPATH ?= "" OECMAKE_PERLNATIVE_DIR ??= "" OECMAKE_EXTRA_ROOT_PATH ?= "" -tizen-cmake_do_generate_toolchain_file() { +tizen_cmake_do_generate_toolchain_file() { cat > ${WORKDIR}/toolchain.cmake << EOF # CMake system name must be something like "Linux". # This is important for cross-compiling. diff --git a/meta-tizen/recipes-tizen/security-server/security-server.inc b/meta-tizen/recipes-tizen/security-server/security-server.inc index e46e1bc..57ab96a 100644 --- a/meta-tizen/recipes-tizen/security-server/security-server.inc +++ b/meta-tizen/recipes-tizen/security-server/security-server.inc @@ -87,7 +87,7 @@ do_compile() { LD_AS_NEEDED=1; export LD_AS_NEEDED ; - export LDFLAGS+="-Wl,--rpath=${prefix}/lib" + export LDFLAGS="${LDFLAGS} -Wl,--rpath=${prefix}/lib" cmake \ diff --git a/meta-tizen/recipes-tizen/security-server/security-server_git.bb b/meta-tizen/recipes-tizen/security-server/security-server_git.bb index 0db45ef..971641b 100644 --- a/meta-tizen/recipes-tizen/security-server/security-server_git.bb +++ b/meta-tizen/recipes-tizen/security-server/security-server_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/platform/core/security/security-server;tag=ddc0b44b013c92a78f43ddf060a0d7a02a88c591;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/core/security/security-server;tag=998749b2a5eae8c65345cd975dffc8270523fd74;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen/recipes-tizen/system-server/system-server-extraconf.inc b/meta-tizen/recipes-tizen/system-server/system-server-extraconf.inc index 29d61f2..adae6c7 100644 --- a/meta-tizen/recipes-tizen/system-server/system-server-extraconf.inc +++ b/meta-tizen/recipes-tizen/system-server/system-server-extraconf.inc @@ -2,4 +2,13 @@ FILES_${PN} += "/usr/lib/systemd/system/system-server.service" FILES_${PN} += "/usr/lib/systemd/system/system-server.socket" -inherit tizen-cmake +inherit tizen_cmake + +do_prep() { + cd ${S} + chmod -Rf a+rX,u+w,g-w,o-w ${S} + #setup -q + + + +} \ No newline at end of file diff --git a/meta-tizen/recipes-tizen/system-server/system-server_git.bb b/meta-tizen/recipes-tizen/system-server/system-server_git.bb index 60506f5..14514c2 100644 --- a/meta-tizen/recipes-tizen/system-server/system-server_git.bb +++ b/meta-tizen/recipes-tizen/system-server/system-server_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/platform/core/system/system-server;tag=5635bde5ac3a9528eb253254fb090f93b6ecd000;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/core/system/system-server;tag=31269af4f5bdfd92a50ac39f14196bf333bea406;nobranch=1" BBCLASSEXTEND += " native " -- 2.7.4