[Tizen-submit] 16483: Changes to Tizen:IVI:Release/dlog

noreply at tizen.org noreply at tizen.org
Thu Oct 24 15:34:16 GMT 2013


Hi,
Rusty Lynch have made the following changes to dlog in project Tizen:IVI:Release. Please review and accept ASAP.

Thank You,

[This message was auto-generated]

---

Request: #16483

  submit:       Tizen:IVI:Release:build/dlog(cleanup) -> Tizen:IVI:Release


Message:
Submitter: Rusty Lynch <rusty.lynch at intel.com>
Comments: Add a build config option for turning on journal logging
Git project: platform/core/system/dlog
Tag: submit/tizen/20131024.153312
Commit: ac126309162b9bd470402571d7b7030dc3111d8c Update changelog

State:   new        2013-10-24T15:35:43 tizenrobot
Comment: <no comment>
changes files:
--------------
--- dlog.changes
+++ dlog.changes
@@ -0,0 +1,4 @@
+* Thu Oct 24 2013 Rusty Lynch <rusty.lynch at intel.com> accepted/tizen/20130912.093307 at a3f532e
+- Fix init to not depend on /dev/log* if journal is enabled
+- Add an RPM build config to select libdlog backend
+

spec files:
-----------
--- dlog.spec
+++ dlog.spec
@@ -1,8 +1,10 @@
+%bcond_with dlog_to_systemd_journal
+
 Name:       dlog
 Summary:    Logging service
 Version:    0.4.1
 Release:    15
-VCS:        platform/core/system/dlog#submit/tizen/20130912.075707-0-gcce8b392205534654719a423abe7ac27890d1324
+VCS:        platform/core/system/dlog#submit/tizen/20131024.153312-0-gac126309162b9bd470402571d7b7030dc3111d8c
 Group:      System/Libraries
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
@@ -10,7 +12,9 @@
 Source102:  dlog-radio.service
 Source103:  dlog.manifest
 
+%if %{with dlog_to_systemd_journal}
 BuildRequires: pkgconfig(libsystemd-journal)
+%endif
 
 %description
 dlog API library
@@ -44,8 +48,14 @@
 cp %{SOURCE103} .
 
 %build
-%autogen --disable-static
-%configure --disable-static --without-systemd-journal
+%autogen
+%configure --disable-static \
+%if %{with dlog_to_systemd_journal}
+--with-systemd-journal
+%else
+--without-systemd-journal
+%endif
+
 make %{?jobs:-j%jobs}
 
 %install

other changes:
--------------

++++++ dlog-0.4.1.tar.gz
--- log.c
+++ log.c
@@ -179,6 +179,9 @@
 	pthread_mutex_lock(&log_init_lock);
 	/* configuration */
 	__configure();
+#ifdef HAVE_SYSTEMD_JOURNAL
+	write_to_log = __write_to_log_sd_journal;
+#else
 	/* open device */
 	log_fds[LOG_ID_MAIN] = open("/dev/"LOG_MAIN, O_WRONLY);
 	log_fds[LOG_ID_RADIO] = open("/dev/"LOG_RADIO, O_WRONLY);
@@ -187,17 +190,14 @@
 	if (log_fds[LOG_ID_MAIN] < 0 || log_fds[LOG_ID_RADIO] < 0) {
 		write_to_log = __write_to_log_null;
 	} else {
-#ifdef HAVE_SYSTEMD_JOURNAL
-		write_to_log = __write_to_log_sd_journal;
-#else
 		write_to_log = __write_to_log_kernel;
-#endif
 	}
 
 	if (log_fds[LOG_ID_SYSTEM] < 0)
 		log_fds[LOG_ID_SYSTEM] = log_fds[LOG_ID_MAIN];
 	if (log_fds[LOG_ID_APPS] < 0)
 		log_fds[LOG_ID_APPS] = log_fds[LOG_ID_MAIN];
+#endif

Please refer to OBS webUI for more details about this SR.


More information about the Tizen-submit mailing list