Fix system-server

Change-Id: I4316f77c26345ac877204fdfbc7b8de3a9ae1546
Signed-off-by: Ronan Le Martret <ronan@fridu.net>

diff --git a/recipes-tizen/system-server/system-server-extraconf.inc b/recipes-tizen/system-server/system-server-extraconf.inc
index adae6c7..3c61be7 100644 (file)
--- a/recipes-tizen/system-server/system-server-extraconf.inc
+++ b/recipes-tizen/system-server/system-server-extraconf.inc
@@ -3,12 +3,3 @@ FILES_${PN} += "/usr/lib/systemd/system/system-server.socket"
 
 
 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/recipes-tizen/system-server/system-server.inc b/recipes-tizen/system-server/system-server.inc
index e8d7572..635db94 100644 (file)
--- a/recipes-tizen/system-server/system-server.inc
+++ b/recipes-tizen/system-server/system-server.inc
@@ -132,6 +132,8 @@ inherit gettext
 DEPENDS += "libslp-sensor"
 DEPENDS += "heynoti"
 DEPENDS += "ecore"
+DEPENDS_append_class-native = " fdupes-native"
+DEPENDS_append_class-target = " fdupes-native"
 DEPENDS += "vconf"
 DEPENDS += "common"
 
@@ -139,22 +141,12 @@ do_prep() {
  cd ${S}
  chmod -Rf a+rX,u+w,g-w,o-w ${S}
  #setup -q
- 
- 
-   cmake \
-         -DCMAKE_VERBOSE_MAKEFILE=ON \
-         -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \
-         -DCMAKE_INSTALL_LIBDIR:PATH=${prefix}/lib \
-         -DINCLUDE_INSTALL_DIR:PATH=${prefix}/include \
-         -DLIB_INSTALL_DIR:PATH=${prefix}/lib \
-         -DSYSCONF_INSTALL_DIR:PATH=${sysconfdir} \
-         -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \
-         -DCMAKE_SKIP_RPATH:BOOL=ON \
-         -DBUILD_SHARED_LIBS:BOOL=ON \
-         ${EXTRA_OECMAKE} . \
-     -DCMAKE_INSTALL_PREFIX=${prefix} \
-     -DX11_SUPPORT=Off \
-     #eol
+ cp ${S}/packaging/system-server.manifest .
+ cp ${S}/packaging/deviced.manifest .
+ cp ${S}/packaging/sysman.manifest .
+ cp ${S}/packaging/libslp-pm.manifest .
+ cp ${S}/packaging/haptic.manifest .
+ cp ${S}/packaging/devman.manifest .
  
  
 }
@@ -172,12 +164,6 @@ do_compile() {
  unset DISPLAY
  LD_AS_NEEDED=1; export LD_AS_NEEDED ;
  
- cp ${S}/packaging/system-server.manifest .
- cp ${S}/packaging/deviced.manifest .
- cp ${S}/packaging/sysman.manifest .
- cp ${S}/packaging/libslp-pm.manifest .
- cp ${S}/packaging/haptic.manifest .
- cp ${S}/packaging/devman.manifest .
  
    cmake \
          -DCMAKE_VERBOSE_MAKEFILE=ON \
@@ -233,6 +219,28 @@ do_install() {
  
  
  
+  _target=""; 
+  _symlinks=0; 
+   
+  fdupes -q -n -r ${D} | 
+   while read _file; do 
+     if test -z "$_target" ; then 
+       _target="$_file"; 
+     else 
+       if test -z "$_file" ; then 
+       _target=""; 
+       continue ; 
+       fi ; 
+       if test "$_symlinks" = 1; then 
+         ln -sf "${_target#${D}}" "$_file"; 
+       else 
+         ln -f "$_target" "$_file"; 
+       fi ;
+     fi ; 
+  done 
+ 
+ 
+ 
 }
 
 pkg_postinst_${PN}() {
@@ -294,7 +302,7 @@ pkg_postinst_${PN}() {
     if [ "$1" = "1" ]; then
         systemctl restart system-server.service
         systemctl restart regpmon.service
-       systemctl restart zbooting-done.service
+        systemctl restart zbooting-done.service
     fi
     [ "x$D" == "x" ] && ldconfig
 
@@ -336,7 +344,7 @@ pkg_prerm_${PN}() {
     if [ "$1" = "0" ]; then
         systemctl stop system-server.service
         systemctl stop regpmon.service
-       systemctl stop zbooting-done.service
+        systemctl stop zbooting-done.service
     fi
 
 }

diff --git a/recipes-tizen/system-server/system-server_git.bb b/recipes-tizen/system-server/system-server_git.bb
index 14514c2..722b2a7 100644 (file)
--- a/recipes-tizen/system-server/system-server_git.bb
+++ b/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=31269af4f5bdfd92a50ac39f14196bf333bea406;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/core/system/system-server;tag=458698a096ec94b8e6849179d8438d0e0b2a5503;nobranch=1"
 
 BBCLASSEXTEND += " native "