Update vconf-internal-keys

from: 9d1f756ba5062a60eeea11cf0b2b7fd60461bcf5
to  : 4ac53a9fe5490aa7b85b3432d2e5b8b625a9182a

[NOTE]
This commit have been checked compiling
but the command of pkgmgr is not existed,
so it is necessary that alternative command is added.

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

2 files changed, 74 insertions, 9 deletions

diff --git a/meta-application-manager/recipes-application-framework/vconf-internal-keys/vconf-internal-keys.inc b/meta-application-manager/recipes-application-framework/vconf-internal-keys/vconf-internal-keys.inc
index e5fbf31..025f157 100644
--- a/meta-application-manager/recipes-application-framework/vconf-internal-keys/vconf-internal-keys.inc
+++ b/meta-application-manager/recipes-application-framework/vconf-internal-keys/vconf-internal-keys.inc
@@ -1,8 +1,8 @@
 DESCRIPTION = "Internal shared keys for vconf"
 HOMEPAGE = "http://nohomepage.org"
-SECTION = "Application Framework/Development"
+SECTION = "Application Framework/Configuration"
 LICENSE = "Apache-2.0"
-PV = "0.0.82"
+PV = "0.0.157"
 
 SRC_URI = ""
 
@@ -14,23 +14,32 @@ BBCLASSEXTEND = ""
 PROVIDES = ""
 
 #PROVIDES by vconf-internal-keys
-
+PROVIDES += "vconf-internal-keys"
 
 #PROVIDES by vconf-internal-keys-dev
 PROVIDES += "vconf-internal-keys-dev"
 
 
 RDEPENDS = ""
+#RDEPENDS of vconf-internal-keys (${PN})
+RDEPENDS_${PN} += "vconf"
+RDEPENDS_${PN} += "findutils"
+
+#RDEPENDS of vconf-internal-keys-dev (${PN}-dev)
+RDEPENDS_${PN}-dev += "capi-base-common"
+
 
 DEPENDS = ""
 #DEPENDS of vconf-internal-keys
 inherit tizen_cmake
+DEPENDS += "libxslt"
+DEPENDS += "findutils"
+
 
 do_prep() {
  cd ${S}
  chmod -Rf a+rX,u+w,g-w,o-w ${S}
  #setup -q
- cp ${S}/packaging/vconf-internal-keys.manifest .
  
  
 }
@@ -48,7 +57,10 @@ do_compile() {
  unset DISPLAY
  LD_AS_NEEDED=1; export LD_AS_NEEDED ;
  
- 
+ make model=ivi
+
+ MAJORVER=`echo ${PV} | awk 'BEGIN {FS="."}{print $1}'`
+
    cmake \
          -DCMAKE_VERBOSE_MAKEFILE=ON \
          -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \
@@ -60,6 +72,9 @@ do_compile() {
          -DCMAKE_SKIP_RPATH:BOOL=ON \
          -DBUILD_SHARED_LIBS:BOOL=ON \
          -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \
+         -DFULLVER=${PV} \
+         -DMAJORVER=${MAJORVER} \
+         -DCMAKE_LIBDIR:PATH=${prefix}/lib \
          ${EXTRA_OECMAKE} .
  
  make ${PARALLEL_MAKE}
@@ -77,7 +92,15 @@ do_install() {
  rm -rf ${D}
  mkdir -p ${D}
  
+ rm -rf ${D}
  
+ mkdir -p ${D}
+ mkdir -p ${D}/opt/usr
+ install -m 755 ${S}/scripts/*.sh ${D}/opt/usr
+
+ mkdir -p ${D}/usr/include/vconf
+ install -m 644 ${S}/include/*.h ${D}/usr/include/vconf
+
    oe_runmake \
          DESTDIR=${D} \
          INSTALL_ROOT=${D} \
@@ -88,19 +111,61 @@ do_install() {
    find ${D} -regex ".*\.a$" | xargs rm -f --
  
  
- 
 }
 
+pkg_postinst_${PN}() {
+    #!/bin/sh -e
+
+    [ "x$D" == "x" ] && ldconfig
+
+    filelist=("/opt/usr/all.sh")
+    for file in ${filelist[@]} ; do
+
+    echo "running ---------------------------------------------------- $file"
+    if [ -e $file ]
+    then
+      chmod a+x $file
+      . $file
+      rm $file
+    fi
+    done
+
+    filelist=`find /opt/usr -name "vconf-internal-*.sh"`
+    for file in $filelist
+    do
+      chmod a+x  $file
+      #/bin/sh $file
+      echo "running ---------------------------------------------------- $file"
+      . $file
+      rm $file
+    done
+}
+
+
+pkg_postrm_${PN}() {
+    #!/bin/sh -e
+
+    [ "x$D" == "x" ] && ldconfig
+}
+
+
 PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-locale"
+PACKAGES += " vconf-internal-keys "
 PACKAGES += " vconf-internal-keys-dev "
 
+vconf-internal-keys_files = ""
+#vconf-internal-keys_files += "${prefix}/lib/lib*.so.*"
+vconf-internal-keys_files += "/opt/usr/*.sh"
+
 vconf-internal-keys-dev_files = ""
-vconf-internal-keys-dev_files += "${prefix}/include/vconf/*"
+vconf-internal-keys-dev_files += "/usr/include/vconf/*.h"
+vconf-internal-keys-dev_files += "/usr/include/vconf/include"
 vconf-internal-keys-dev_files += "${prefix}/lib/pkgconfig/*.pc"
-MANIFESTFILES_${PN}-dev = "vconf-internal-keys.manifest"
 
+FILES_${PN} = "${vconf-internal-keys_files}"
 FILES_${PN}-dev = "${vconf-internal-keys-dev_files}"
 
+PKG_vconf-internal-keys= "vconf-internal-keys"
 PKG_vconf-internal-keys-dev= "vconf-internal-keys-dev"
 
 require vconf-internal-keys-extraconf.inc
diff --git a/meta-application-manager/recipes-application-framework/vconf-internal-keys/vconf-internal-keys_git.bb b/meta-application-manager/recipes-application-framework/vconf-internal-keys/vconf-internal-keys_git.bb
index 0aff6fa..f8415ff 100644
--- a/meta-application-manager/recipes-application-framework/vconf-internal-keys/vconf-internal-keys_git.bb
+++ b/meta-application-manager/recipes-application-framework/vconf-internal-keys/vconf-internal-keys_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/appfw/vconf-internal-keys;tag=9d1f756ba5062a60eeea11cf0b2b7fd60461bcf5;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/core/appfw/vconf-internal-keys;tag=4ac53a9fe5490aa7b85b3432d2e5b8b625a9182a;nobranch=1"
 
 BBCLASSEXTEND += " native "