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>
29 lines
894 B
Diff
29 lines
894 B
Diff
From 6f9a8e792bad1f4bb8d9dad4f2430d89a1058d0c Mon Sep 17 00:00:00 2001
|
|
From: Scott Little <scott.little@windriver.com>
|
|
Date: Mon, 2 Oct 2017 17:53:00 -0400
|
|
Subject: [PATCH] WRS: 0005-spec-millisec-in-syslog-date.patch
|
|
|
|
Conflicts:
|
|
SPECS/systemd.spec
|
|
---
|
|
SPECS/systemd.spec | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
diff --git a/SPECS/systemd.spec b/SPECS/systemd.spec
|
|
index 6a04c16..845d1dd 100644
|
|
--- a/SPECS/systemd.spec
|
|
+++ b/SPECS/systemd.spec
|
|
@@ -653,6 +653,9 @@ Patch0611: 0611-sd-journal-make-sure-it-s-safe-to-call-sd_journal_pr.patch
|
|
Patch0612: 0612-journalctl-Periodically-call-sd_journal_process-in-j.patch
|
|
Patch0613: 0613-sd-journal-when-picking-up-a-new-file-compare-inode-.patch
|
|
|
|
+#WRS Patches
|
|
+Patch0701: 0701-inject-millisec-in-syslog-date.patch
|
|
+
|
|
%global num_patches %{lua: c=0; for i,p in ipairs(patches) do c=c+1; end; print(c);}
|
|
|
|
BuildRequires: libcap-devel
|
|
--
|
|
2.7.4
|
|
|