From d249458c99a9c8acb8191917de9384d27551ea81 Mon Sep 17 00:00:00 2001
From: =?utf8?q?K=C3=A9vin=20THIERRY?= <kevin.thierry@open.eurogiciel.org>
Date: Wed, 18 Jun 2014 12:00:41 +0200
Subject: [PATCH] dlog: update recipe
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

* New revision.
* New generated recipe from recent spec file.

Change-Id: Icae36d378a766d12e60b4f32eddfab9f308285e3
Signed-off-by: Kévin THIERRY <kevin.thierry@open.eurogiciel.org>
---
 recipes-tizen/dlog/dlog.inc    | 57 ++++--------------------------------------
 recipes-tizen/dlog/dlog_git.bb |  2 +-
 2 files changed, 6 insertions(+), 53 deletions(-)

diff --git a/recipes-tizen/dlog/dlog.inc b/recipes-tizen/dlog/dlog.inc
index a5f9f23..66965bd 100644
--- a/recipes-tizen/dlog/dlog.inc
+++ b/recipes-tizen/dlog/dlog.inc
@@ -27,7 +27,6 @@ PROVIDES = ""
 RDEPENDS = ""
 #RDEPENDS of dlogutil (${PN}util)
 RDEPENDS_${PN}util += "libdlog"
-RDEPENDS_${PN}util += "systemd"
 
 #RDEPENDS of libdlog-dev (lib${PN}-dev)
 RDEPENDS_lib${PN}-dev += "libdlog"
@@ -35,6 +34,7 @@ RDEPENDS_lib${PN}-dev += "libdlog"
 
 DEPENDS = ""
 #DEPENDS of dlog 
+DEPENDS += "systemd"
 DEPENDS += "tizen-platform-config"
 
 do_prep() {
@@ -102,8 +102,7 @@ do_compile() {
          --localstatedir=${localstatedir} \
          --sharedstatedir=${prefix}/com \
          --mandir=${mandir} \
-         --infodir=${infodir} --disable-static \
- --without-systemd-journal
+         --infodir=${infodir} --disable-static
  
  make -j16
  
@@ -129,23 +128,10 @@ do_install() {
    rm -f ${D}${infodir}/dir 
    find ${D} -regex ".*\.la$" | xargs rm -f -- 
    find ${D} -regex ".*\.a$" | xargs rm -f --
- mkdir -p ${D}/etc/dump.d/default.d
- cp dlog_dump.sh ${D}/etc/dump.d/default.d/dlog_dump.sh
- mkdir -p ${D}/usr/bin/
+ mkdir -p ${D}/etc/dlog
+ cp platformlog.conf ${D}/etc/dlog/platformlog.conf
  cp dlogctrl ${D}/usr/bin/dlogctrl
  
- mkdir -p ${D}/lib/systemd/system/multi-user.target.wants
- 
- install -m 0644 ${S}/packaging/dlog-main.service ${D}/lib/systemd/system
- install -m 0644 ${S}/packaging/dlog-radio.service ${D}/lib/systemd/system
- 
- 
- mkdir -p ${D}//lib/systemd/system/multi-user.target.wants 
- ln -s ../dlog-main.service  ${D}//lib/systemd/system/multi-user.target.wants/dlog-main.service  
- 
- mkdir -p ${D}//lib/systemd/system/multi-user.target.wants 
- ln -s ../dlog-radio.service  ${D}//lib/systemd/system/multi-user.target.wants/dlog-radio.service  
- 
  
 }
 
@@ -155,34 +141,6 @@ pkg_postinst_libdlog() {
     /sbin/ldconfig
 }
 
-pkg_postinst_dlogutil() {
-    #!/bin/sh -e
-
-    systemctl daemon-reload
-    if [ $1 == 1 ]; then
-        systemctl restart dlog-main.service
-        systemctl restart dlog-radio.service
-    fi
-
-}
-
-pkg_prerm_dlogutil() {
-    #!/bin/sh -e
-
-    if [ $1 == 0 ]; then
-        systemctl stop dlog-main.service
-        systemctl stop dlog-radio.service
-    fi
-
-}
-
-pkg_postrm_dlogutil() {
-    #!/bin/sh -e
-
-    systemctl daemon-reload
-
-}
-
 pkg_postrm_libdlog() {
     #!/bin/sh -e
 
@@ -195,17 +153,12 @@ PACKAGES += " libdlog-dev "
 
 libdlog_files = ""
 libdlog_files += "dlog.manifest"
+libdlog_files += "/etc/dlog/platformlog.conf"
 libdlog_files += "${prefix}/lib/libdlog.so.*"
 
 dlogutil_files = ""
 dlogutil_files += "dlog.manifest"
-dlogutil_files += "/etc/dump.d/default.d/dlog_dump.sh"
-dlogutil_files += "${prefix}/bin/dlogutil"
 dlogutil_files += "${prefix}/bin/dlogctrl"
-dlogutil_files += "/lib/systemd/system/dlog-main.service"
-dlogutil_files += "/lib/systemd/system/dlog-radio.service"
-dlogutil_files += "/lib/systemd/system/multi-user.target.wants/dlog-main.service"
-dlogutil_files += "/lib/systemd/system/multi-user.target.wants/dlog-radio.service"
 
 libdlog-dev_files = ""
 libdlog-dev_files += "dlog.manifest"
diff --git a/recipes-tizen/dlog/dlog_git.bb b/recipes-tizen/dlog/dlog_git.bb
index ef46419..79afe95 100644
--- a/recipes-tizen/dlog/dlog_git.bb
+++ b/recipes-tizen/dlog/dlog_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/dlog;tag=d31d0a621fdd6cfbc4a884cd928c2c6567bc41f2;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/core/system/dlog;tag=a08e5247c86df41b8d68438b782095208751ae9c;nobranch=1"
 
 BBCLASSEXTEND += " native "
 
-- 
2.7.4