Update capi-system-info

from: 7c1c890c5fdc4c80d99b6a74d1011bfb144ee5b3
to  : af7a0f1deb93eb8590011deca20fc3f9526e7516

Change-Id: Ia305199f4713fa2b85e5828e3e3427514e101439
Signed-off-by: Yuta Doi <yuta-d@witz-inc.co.jp>

2 files changed, 47 insertions, 14 deletions

diff --git a/meta-application-manager/recipes-application-framework/capi-system-info/capi-system-info.inc b/meta-application-manager/recipes-application-framework/capi-system-info/capi-system-info.inc
index 2eef94b..8109dc6 100644
--- a/meta-application-manager/recipes-application-framework/capi-system-info/capi-system-info.inc
+++ b/meta-application-manager/recipes-application-framework/capi-system-info/capi-system-info.inc
@@ -1,4 +1,4 @@
-DESCRIPTION = "A System Information library in SLP C API"
+DESCRIPTION = "A System Information library in Core API"
 HOMEPAGE = "http://nohomepage.org"
 SECTION = "System/API"
 LICENSE = "Apache-2.0"
@@ -32,17 +32,26 @@ DEPENDS += "libxml2"
 inherit pkgconfig
 DEPENDS += "iniparser"
 DEPENDS += "dlog"
-DEPENDS += "ecore"
-DEPENDS += "vconf"
 DEPENDS += "capi-base-common"
+DEPENDS += "openssl"
+DEPENDS += "glib-2.0"
+DEPENDS += "tizen-platform-config"
+DEPENDS += "gdbm"
+DEPENDS += "glibc"
+
 
 do_prep() {
  cd ${S}
  chmod -Rf a+rX,u+w,g-w,o-w ${S}
  #setup -q
- cp ${S}/packaging/capi-system-info.manifest .
- 
- 
+ cp ${S}/packaging/${PN}.manifest .
+ EMULATOR=on
+ config_file_path=/etc/config/model-config.xml
+ info_file_path=/etc/info.ini
+ sysinfo_shared_path=${TZ_SYS_ETC}/sysinfo
+ tizen_id_path=${sysinfo_shared_path}/tizenid
+ db_path=${TZ_SYS_RO_ETC}/system_info_db
+
 }
 do_patch_append() {
     bb.build.exec_func('do_prep', d)
@@ -58,7 +67,7 @@ do_compile() {
  unset DISPLAY
  LD_AS_NEEDED=1; export LD_AS_NEEDED ;
  
- MAJORVER=`echo 0.2.0 | awk 'BEGIN {FS="."}{print $1}'`
+ MAJORVER=`echo ${PV} | awk 'BEGIN {FS="."}{print $1}'`
  
    cmake \
          -DCMAKE_VERBOSE_MAKEFILE=ON \
@@ -71,7 +80,15 @@ do_compile() {
          -DCMAKE_SKIP_RPATH:BOOL=ON \
          -DBUILD_SHARED_LIBS:BOOL=ON \
          -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \
-         ${EXTRA_OECMAKE} . -DFULLVER=0.2.0 -DMAJORVER=${MAJORVER} -DENABLE_WAYLAND=TRUE
+         -DCONFIG_FILE_PATH=${config_file_path} \
+         -DINFO_FILE_PATH=${info_file_path} \
+         -DMAJORVER=${MAJORVER} \
+         -DFULLVER=${PV} \
+         -DEMULATOR=${EMULATOR} \
+         -DTIZEN_ID_PATH=${tizen_id_path} \
+         -DDB_PATH=${db_path} \
+         ${EXTRA_OECMAKE} .
+
  oe_runmake ${PARALLEL_MAKE}
  
  
@@ -96,15 +113,19 @@ do_install() {
    rm -f ${D}${infodir}/dir 
    find ${D} -regex ".*\.la$" | xargs rm -f -- 
    find ${D} -regex ".*\.a$" | xargs rm -f --
- mkdir -p ${D}${prefix}/bin
- cp -f script/make_info_file.sh ${D}${prefix}/bin/make_info_file.sh
- 
- 
+ mkdir -p ${D}/etc
+ cp -f script/make_info_file.sh ${D}/etc/make_info_file.sh
+
+ mkdir -p ${D}/usr/lib/systemd/system/sysinit.target.wants
+ ln -s ../tizenid.service ${D}/usr/lib/systemd/system/sysinit.target.wants/tizenid.service
+
+ mkdir -p ${D}/${sysinfo_shared_path}
 }
 
 pkg_postinst_${PN}() {
     #!/bin/sh -e
 
+    chsmack -a "System::Shared" -t ${sysinfo_shared_path}
     [ "x$D" == "x" ] && ldconfig
 }
 
@@ -122,11 +143,23 @@ capi-system-info-dev_files = ""
 capi-system-info-dev_files += "${prefix}/include/system/system_info.h"
 capi-system-info-dev_files += "${prefix}/lib/pkgconfig/*.pc"
 capi-system-info-dev_files += "${prefix}/lib/libcapi-system-info.so"
+capi-system-info-dev_files += "${prefix}/include/system/system_info_type.h"
+capi-system-info-dev_files += "${prefix}/include/plugin/system_info_intf.h"
 MANIFESTFILES_${PN}-dev = "capi-system-info.manifest"
 
 capi-system-info_files = ""
 capi-system-info_files += "${prefix}/lib/libcapi-system-info.so.*"
-capi-system-info_files += "${prefix}/bin/make_info_file.sh"
+capi-system-info_files += "/etc/make_info_file.sh"
+capi-system-info_files += "${prefix}/bin/system_info_init_db"
+capi-system-info_files += "${prefix}/bin/system_info_update_db"
+
+#tizenid
+capi-system-info_files += "${sysinfo_shared_path}"
+capi-system-info_files += "${prefix}/bin/tizen_id"
+
+capi-system-info_files += "/usr/lib/systemd/system/tizenid.service"
+capi-system-info_files += "/usr/lib/systemd/system/sysinit.target.wants/tizenid.service"
+
 MANIFESTFILES_${PN} = "capi-system-info.manifest"
 
 FILES_${PN}-dev = "${capi-system-info-dev_files}"
diff --git a/meta-application-manager/recipes-application-framework/capi-system-info/capi-system-info_git.bb b/meta-application-manager/recipes-application-framework/capi-system-info/capi-system-info_git.bb
index 0093c8a..436d623 100644
--- a/meta-application-manager/recipes-application-framework/capi-system-info/capi-system-info_git.bb
+++ b/meta-application-manager/recipes-application-framework/capi-system-info/capi-system-info_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/api/system-info;tag=7c1c890c5fdc4c80d99b6a74d1011bfb144ee5b3;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/core/api/system-info;tag=af7a0f1deb93eb8590011deca20fc3f9526e7516;nobranch=1"
 
 BBCLASSEXTEND += " native "