46ce43a77d
Story: 2003768 Task: 27594 Package systemd-config is added to config customized config file of systemd. Several patches are converted to config files. These config files are based on systemd-219-57.el7.src.rpm. BuildRequires in system-config is set to equal "219-57.el7", to avoid system-config is missed check when do upgrade. So when do systemd upgrade, system-config need be upgraded also. "0003-spec-expand-_udevrulesdir-macro.patch" is removed which seems not needed. Test: Pass build and multi node deploy test. Confirmed related config file is the same as before. Change-Id: I879dc276f3280911d844cfa605c56ba03caabdad Signed-off-by: Shuicheng Lin <shuicheng.lin@intel.com>
27 lines
881 B
Diff
27 lines
881 B
Diff
From 193fcf879dbee168238227e2123d63f5bf8a135d Mon Sep 17 00:00:00 2001
|
|
From: slin14 <shuicheng.lin@intel.com>
|
|
Date: Thu, 9 Aug 2018 18:38:18 +0800
|
|
Subject: [PATCH] fix build error for unused variable
|
|
|
|
Signed-off-by: slin14 <shuicheng.lin@intel.com>
|
|
---
|
|
src/journal/journald-syslog.c | 2 --
|
|
1 file changed, 2 deletions(-)
|
|
|
|
diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c
|
|
index 33062ea..fd4e070 100644
|
|
--- a/src/journal/journald-syslog.c
|
|
+++ b/src/journal/journald-syslog.c
|
|
@@ -165,8 +165,6 @@ void server_forward_syslog(Server *s, int priority, const char *identifier, cons
|
|
char header_priority[DECIMAL_STR_MAX(priority) + 3], header_time[64],
|
|
header_pid[sizeof("[]: ")-1 + DECIMAL_STR_MAX(pid_t) + 1];
|
|
int n = 0;
|
|
- time_t t;
|
|
- struct tm *tm;
|
|
char *ident_buf = NULL;
|
|
|
|
assert(s);
|
|
--
|
|
2.7.4
|
|
|