1 files changed, 18 insertions, 65 deletions

diff --git a/meta-application-manager/recipes-others/dlog/dlog.inc b/meta-application-manager/recipes-others/dlog/dlog.inc
index 1d4c1c3..c94b2b7 100644
--- a/meta-application-manager/recipes-others/dlog/dlog.inc
+++ b/meta-application-manager/recipes-others/dlog/dlog.inc
@@ -38,15 +38,7 @@ RDEPENDS_lib${PN}-dev += "libdlog"
 
 DEPENDS = ""
 #DEPENDS of dlog
-DEPENDS_append_class-native = " autoconf-native"
-DEPENDS_append_class-target = " autoconf-native"
-DEPENDS_append_class-native = " automake-native"
-DEPENDS_append_class-target = " automake-native"
-DEPENDS_append_class-native = " libtool"
-DEPENDS_append_class-target = " libtool-cross"
 DEPENDS += "systemd"
-DEPENDS += "capi-base-common"
-DEPENDS += "udev"
 DEPENDS += "tizen-platform-config"
 inherit pkgconfig
 
@@ -54,6 +46,9 @@ do_prep() {
  cd ${S}
  chmod -Rf a+rX,u+w,g-w,o-w ${S}
  #setup -q
+ cp ${S}/packaging/dlog.manifest .
+ 
+ 
 }
 do_patch_append() {
     bb.build.exec_func('do_prep', d)
@@ -70,24 +65,13 @@ do_compile() {
   LD_AS_NEEDED=1; export LD_AS_NEEDED ;
   
   
-  cp ${S}/packaging/dlogutil.manifest .
-  cp ${S}/packaging/libdlog.manifest .
-
-  ./autogen.sh --disable-static
   autotools_do_configure
-  make ${PARALLEL_MAKE} \
-       CFLAGS+=-DTZ_SYS_ETC=\\\"${sysconfdir}\\\"
+  oe_runmake ${PARALLEL_MAKE}
   
   
   
 }
-EXTRA_OECONF += " \
-  --disable-static \
-  --enable-fatal_on \
-  --enable-journal \
-  --enable-debug_mode \
-  TZ_SYS_ETC=${sysconfdir} \
-"
+EXTRA_OECONF += " --disable-static"
 
 do_install() {
  export RPM_BUILD_ROOT=${D}
@@ -98,8 +82,7 @@ do_install() {
  rm -rf ${D}
  mkdir -p ${D}
  
- rm -rf ${D}
-
+ 
    oe_runmake \
          DESTDIR=${D} \
          INSTALL_ROOT=${D} \
@@ -108,34 +91,11 @@ do_install() {
    rm -f ${D}${infodir}/dir 
    find ${D} -regex ".*\.la$" | xargs rm -f -- 
    find ${D} -regex ".*\.a$" | xargs rm -f --
- mkdir -p ${D}/usr/bin/
- mkdir -p ${D}${sysconfdir}
-
- mkdir -p ${D}/usr/share/license
- cp ${S}/LICENSE.Apache-2.0 ${D}/usr/share/license/${PN}
- cp ${S}/LICENSE.Apache-2.0 ${D}/usr/share/license/libdlog
- cp ${S}/LICENSE.Apache-2.0 ${D}/usr/share/license/dlogutil
-
- mkdir -p ${D}/var/log/dlog
-}
-
-pkg_postinst_${PN}() {
-    #!/bin/sh -e
-
-    systemctl daemon-reload
-}
-
-pkg_postinst_dlogutil() {
-    #!/bin/sh -e
-
-    systemctl daemon-reload
-    chsmack -a System /var/log/dlog
-}
-
-pkg_postrm_dlogutil() {
-    #!/bin/sh -e
-
-    systemctl daemon-reload
+ mkdir -p ${D}${sysconfdir}/dlog
+ cp platformlog.conf ${D}${sysconfdir}/dlog/platformlog.conf
+ cp dlogctrl ${D}${prefix}/bin/dlogctrl
+ 
+ 
 }
 
 pkg_postinst_libdlog() {
@@ -156,28 +116,21 @@ PACKAGES += " dlogutil "
 PACKAGES += " libdlog-dev "
 
 libdlog_files = ""
-libdlog_files += "/usr/share/license/libdlog"
-libdlog_files += "${prefix}/lib/libdlog.so.0"
-libdlog_files += "${prefix}/lib/libdlog.so.0.0.0"
-libdlog_files += "${sysconfdir}"
-libdlog_files += "${sysconfdir}/dlog.conf"
-libdlog_files += "/opt/etc/dlog.conf"
-libdlog_files += "/usr/share/license/${PN}"
-MANIFESTFILES_lib${PN} = "libdlog.manifest"
+libdlog_files += "${sysconfdir}/dlog/platformlog.conf"
+libdlog_files += "${prefix}/lib/libdlog.so.*"
+CONFFILES_lib${PN} = ""
+CONFFILES_lib${PN} += "${sysconfdir}/dlog/platformlog.conf"
+MANIFESTFILES_lib${PN} = "dlog.manifest"
 
 dlogutil_files = ""
-dlogutil_files += "/usr/share/license/dlogutil"
-dlogutil_files += "${prefix}/bin/dlogutil"
 dlogutil_files += "${prefix}/bin/dlogctrl"
-dlogutil_files += "/var/log/dlog"
-dlogutil_files += "/var/volatile/log/dlog"
-MANIFESTFILES_${PN}util = "dlogutil.manifest"
+MANIFESTFILES_${PN}util = "dlog.manifest"
 
 libdlog-dev_files = ""
 libdlog-dev_files += "${prefix}/include/dlog/dlog.h"
-libdlog-dev_files += "${prefix}/include/dlog/dlog-internal.h"
 libdlog-dev_files += "${prefix}/lib/pkgconfig/dlog.pc"
 libdlog-dev_files += "${prefix}/lib/libdlog.so"
+MANIFESTFILES_lib${PN}-dev = "dlog.manifest"
 
 FILES_lib${PN} = "${libdlog_files}"
 FILES_${PN}util = "${dlogutil_files}"