From 8dffedd832966c1da0adbcff25be0bb435356d24 Mon Sep 17 00:00:00 2001 From: Yuta Doi Date: Mon, 26 Dec 2016 17:57:52 +0900 Subject: Update dlog from: c43bce370f4aaa09f48df4e2c1d2b99f133526d0 to : 76c667512e355bda5edd856f6b7041f9f8e392b0 [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: I1219ba0373aa936c8c16e1d9a8547cb677bd22f5 Signed-off-by: Yuta Doi --- .../recipes-others/dlog/dlog.inc | 83 +++++++++++++++++----- .../recipes-others/dlog/dlog_git.bb | 2 +- .../libsystemd-journal_is_now_in_libsystemd.patch | 24 ++++--- 3 files changed, 79 insertions(+), 30 deletions(-) diff --git a/meta-application-manager/recipes-others/dlog/dlog.inc b/meta-application-manager/recipes-others/dlog/dlog.inc index c94b2b7..1d4c1c3 100644 --- a/meta-application-manager/recipes-others/dlog/dlog.inc +++ b/meta-application-manager/recipes-others/dlog/dlog.inc @@ -38,7 +38,15 @@ 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 @@ -46,9 +54,6 @@ 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) @@ -65,13 +70,24 @@ 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 - oe_runmake ${PARALLEL_MAKE} + make ${PARALLEL_MAKE} \ + CFLAGS+=-DTZ_SYS_ETC=\\\"${sysconfdir}\\\" } -EXTRA_OECONF += " --disable-static" +EXTRA_OECONF += " \ + --disable-static \ + --enable-fatal_on \ + --enable-journal \ + --enable-debug_mode \ + TZ_SYS_ETC=${sysconfdir} \ +" do_install() { export RPM_BUILD_ROOT=${D} @@ -82,7 +98,8 @@ do_install() { rm -rf ${D} mkdir -p ${D} - + rm -rf ${D} + oe_runmake \ DESTDIR=${D} \ INSTALL_ROOT=${D} \ @@ -91,11 +108,34 @@ do_install() { rm -f ${D}${infodir}/dir find ${D} -regex ".*\.la$" | xargs rm -f -- find ${D} -regex ".*\.a$" | xargs rm -f -- - mkdir -p ${D}${sysconfdir}/dlog - cp platformlog.conf ${D}${sysconfdir}/dlog/platformlog.conf - cp dlogctrl ${D}${prefix}/bin/dlogctrl - - + 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 } pkg_postinst_libdlog() { @@ -116,21 +156,28 @@ PACKAGES += " dlogutil " PACKAGES += " libdlog-dev " libdlog_files = "" -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" +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" dlogutil_files = "" +dlogutil_files += "/usr/share/license/dlogutil" +dlogutil_files += "${prefix}/bin/dlogutil" dlogutil_files += "${prefix}/bin/dlogctrl" -MANIFESTFILES_${PN}util = "dlog.manifest" +dlogutil_files += "/var/log/dlog" +dlogutil_files += "/var/volatile/log/dlog" +MANIFESTFILES_${PN}util = "dlogutil.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}" diff --git a/meta-application-manager/recipes-others/dlog/dlog_git.bb b/meta-application-manager/recipes-others/dlog/dlog_git.bb index c24ced4..1e893fa 100644 --- a/meta-application-manager/recipes-others/dlog/dlog_git.bb +++ b/meta-application-manager/recipes-others/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=c43bce370f4aaa09f48df4e2c1d2b99f133526d0;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/core/system/dlog;tag=76c667512e355bda5edd856f6b7041f9f8e392b0;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-application-manager/recipes-others/dlog/files/libsystemd-journal_is_now_in_libsystemd.patch b/meta-application-manager/recipes-others/dlog/files/libsystemd-journal_is_now_in_libsystemd.patch index 347f470..1462a3a 100644 --- a/meta-application-manager/recipes-others/dlog/files/libsystemd-journal_is_now_in_libsystemd.patch +++ b/meta-application-manager/recipes-others/dlog/files/libsystemd-journal_is_now_in_libsystemd.patch @@ -1,11 +1,13 @@ ---- a/Makefile.am 2016-01-08 07:47:34.902312000 -0800 -+++ b/Makefile.am 2016-01-08 08:01:43.986280740 -0800 -@@ -10,7 +10,7 @@ - log.c \ - log-common.c - --libdlog_la_LIBADD = $(TZPLATFORM_CONFIG_LIBS) -lsystemd-journal -+libdlog_la_LIBADD = $(TZPLATFORM_CONFIG_LIBS) -lsystemd - - bin_PROGRAMS= dlogctrl - +diff --git a/configure.ac b/configure.ac +index 79d1046..18567d0 100755 +--- a/configure.ac ++++ b/configure.ac +@@ -21,7 +21,7 @@ AC_ARG_ENABLE(journal, AS_HELP_STRING([--enable-journal], [enable systemd journa + [with_systemd_journal=yes], + with_systemd_journal=no) + if test "x$with_systemd_journal" != "xno"; then +- PKG_CHECK_MODULES(systemd_journal, [libsystemd-journal], ++ PKG_CHECK_MODULES(systemd_journal, [libsystemd], + [AC_DEFINE(DLOG_BACKEND_JOURNAL, 1, [Define if systemd journal is selected]) + have_systemd_journal=yes], + have_systemd_journal=no) -- cgit 1.2.3-korg