starlingx/integ
Code Issues Proposed changes

rebase systemd patch to CentOS7.5

Browse Source 
Story: 2003389
Task: 24466

Change-Id: Ifeffa7003d762cfed93b77326edf4ec48df6b46f
Signed-off-by: slin14 <shuicheng.lin@intel.com>
This commit is contained in:
slin14 2018-08-10 23:41:25 +08:00 committed by chenyan
parent 2c63c1c83f
commit 6e38b731ec
21 changed files with 127 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
base/systemd/centos/meta_patches/0001-update-package-versioning-for-TIS-format.patch
View File

@ -1,8 +1,7 @@
From 844630caa811b9fb1a2944385ce31726aff1df00 Mon Sep 17 00:00:00 2001
From e1b3591beb36a45f7cc4bf9340dd640b359955b7 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 01/10] WRS:
0001-update-package-versioning-for-TIS-format.patch
Subject: [PATCH] WRS: 0001-update-package-versioning-for-TIS-format.patch
Conflicts:
SPECS/systemd.spec
@ -11,18 +10,18 @@ Conflicts:
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SPECS/systemd.spec b/SPECS/systemd.spec
index 4dce0a3..955cc4b 100644
index 6bdbb74..3b2aa7f 100644
--- a/SPECS/systemd.spec
+++ b/SPECS/systemd.spec
@@ -7,7 +7,7 @@
Name: systemd
Url: http://www.freedesktop.org/wiki/Software/systemd
Version: 219
-Release: 42%{?dist}.1
+Release: 42.el7_4.1%{?_tis_dist}.%{tis_patch_ver}
-Release: 57%{?dist}
+Release: 57.el7%{?_tis_dist}.%{tis_patch_ver}
# For a breakdown of the licensing, see README
License: LGPLv2+ and MIT and GPLv2+
Summary: A System and Service Manager
--
1.9.1
2.7.4

16
base/systemd/centos/meta_patches/0005-spec-millisec-in-syslog-date.patch
View File

@ -1,7 +1,7 @@
From aa4dff1eedf5e685c83de9b4d996d8106e27c3b7 Mon Sep 17 00:00:00 2001
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 04/10] WRS: 0005-spec-millisec-in-syslog-date.patch
Subject: [PATCH] WRS: 0005-spec-millisec-in-syslog-date.patch
Conflicts:
SPECS/systemd.spec
@ -10,19 +10,19 @@ Conflicts:
1 file changed, 3 insertions(+)
diff --git a/SPECS/systemd.spec b/SPECS/systemd.spec
index 912d31e..d7a20d5 100644
index 6a04c16..845d1dd 100644
--- a/SPECS/systemd.spec
+++ b/SPECS/systemd.spec
@@ -539,6 +539,9 @@ Patch0497: 0497-rules-move-cpu-hotplug-rule-to-separate-file.patch
Patch0498: 0498-Revert-rules-move-cpu-hotplug-rule-to-separate-file.patch
Patch0499: 0499-Revert-udev-net_id-add-support-for-phys_port_name-at.patch
@@ -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
+Patch0501: 0501-inject-millisec-in-syslog-date.patch
+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
--
1.9.1
2.7.4

14
base/systemd/centos/meta_patches/0007-Add-patch-for-journald-config.patch
View File

@ -1,24 +1,24 @@
From 0691fdfd899f5af3be9e74dfd33b728ba45cd778 Mon Sep 17 00:00:00 2001
From 4fadd91b4153c4e7a462585e78139ee530b6b292 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 06/10] WRS: 0007-Add-patch-for-journald-config.patch
Subject: [PATCH 1/7] WRS: 0007-Add-patch-for-journald-config.patch
---
SPECS/systemd.spec | 1 +
1 file changed, 1 insertion(+)
diff --git a/SPECS/systemd.spec b/SPECS/systemd.spec
index 93a4b72..48ac1bb 100644
index 845d1dd..6c277f9 100644
--- a/SPECS/systemd.spec
+++ b/SPECS/systemd.spec
@@ -541,6 +541,7 @@ Patch0499: 0499-Revert-udev-net_id-add-support-for-phys_port_name-at.patch
@@ -655,6 +655,7 @@ Patch0613: 0613-sd-journal-when-picking-up-a-new-file-compare-inode-.patch
#WRS Patches
Patch0501: 0501-inject-millisec-in-syslog-date.patch
+Patch0503: 0503-Configure-journald-to-forward-to-syslog.patch
Patch0701: 0701-inject-millisec-in-syslog-date.patch
+Patch0703: 0703-Configure-journald-to-forward-to-syslog.patch
%global num_patches %{lua: c=0; for i,p in ipairs(patches) do c=c+1; end; print(c);}
--
1.9.1
2.7.4

17
base/systemd/centos/meta_patches/0008-Add-patch-for-journald-config-rate-limit.patch
View File

@ -1,8 +1,7 @@
From e41bc69bcbf880196212524803e96521f5aa7c66 Mon Sep 17 00:00:00 2001
From 1f00385b6b64616f894aab1f31d41e3fdcb73055 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 07/10] WRS:
0008-Add-patch-for-journald-config-rate-limit.patch
Subject: [PATCH 2/7] WRS: 0008-Add-patch-for-journald-config-rate-limit.patch
Conflicts:
SPECS/systemd.spec
@ -11,17 +10,17 @@ Conflicts:
1 file changed, 1 insertion(+)
diff --git a/SPECS/systemd.spec b/SPECS/systemd.spec
index 48ac1bb..332514c 100644
index 6c277f9..ff9c519 100644
--- a/SPECS/systemd.spec
+++ b/SPECS/systemd.spec
@@ -542,6 +542,7 @@ Patch0499: 0499-Revert-udev-net_id-add-support-for-phys_port_name-at.patch
@@ -656,6 +656,7 @@ Patch0613: 0613-sd-journal-when-picking-up-a-new-file-compare-inode-.patch
#WRS Patches
Patch0501: 0501-inject-millisec-in-syslog-date.patch
Patch0503: 0503-Configure-journald-to-forward-to-syslog.patch
+Patch0504: 0504-Configure-journald-rate-limit.patch
Patch0701: 0701-inject-millisec-in-syslog-date.patch
Patch0703: 0703-Configure-journald-to-forward-to-syslog.patch
+Patch0704: 0704-Configure-journald-rate-limit.patch
%global num_patches %{lua: c=0; for i,p in ipairs(patches) do c=c+1; end; print(c);}
--
1.9.1
2.7.4

18
base/systemd/centos/meta_patches/0009-Add-patch-to-remove-ID_SAS_PATH-rule.patch
View File

@ -1,24 +1,24 @@
From 022b18e4db4116905207c0603b60e932e4a7dacb Mon Sep 17 00:00:00 2001
From fddd11d477de4eced32cf40c0524a11a24994fa1 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 08/10] WRS: 0009-Add-patch-to-remove-ID_SAS_PATH-rule.patch
Subject: [PATCH 3/7] WRS: 0009-Add-patch-to-remove-ID_SAS_PATH-rule.patch
---
SPECS/systemd.spec | 1 +
1 file changed, 1 insertion(+)
diff --git a/SPECS/systemd.spec b/SPECS/systemd.spec
index 332514c..33f3128 100644
index ff9c519..e9fc3a4 100644
--- a/SPECS/systemd.spec
+++ b/SPECS/systemd.spec
@@ -543,6 +543,7 @@ Patch0501: 0501-inject-millisec-in-syslog-date.patch
Patch0501: 0501-inject-millisec-in-syslog-date.patch
Patch0503: 0503-Configure-journald-to-forward-to-syslog.patch
Patch0504: 0504-Configure-journald-rate-limit.patch
+Patch0505: 0505-remove-id-sas-path-symlink.patch
@@ -657,6 +657,7 @@ Patch0613: 0613-sd-journal-when-picking-up-a-new-file-compare-inode-.patch
Patch0701: 0701-inject-millisec-in-syslog-date.patch
Patch0703: 0703-Configure-journald-to-forward-to-syslog.patch
Patch0704: 0704-Configure-journald-rate-limit.patch
+Patch0705: 0705-remove-id-sas-path-symlink.patch
%global num_patches %{lua: c=0; for i,p in ipairs(patches) do c=c+1; end; print(c);}
--
1.9.1
2.7.4

18
base/systemd/centos/meta_patches/0010-fix-ACL-warnings-from-systemd-tmpfiles-set.patch
View File

@ -1,24 +1,24 @@
From e188f1148982166624ae72f8fac70775a2bc8d73 Mon Sep 17 00:00:00 2001
From f651db58b668b32e1f365eaeb35bcff12bcbc5ad Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 17:53:00 -0400
Subject: 0010-fix-ACL-warnings-from-systemd-tmpfiles-set.patch
Subject: [PATCH 4/7] 0010-fix-ACL-warnings-from-systemd-tmpfiles-set.patch
---
SPECS/systemd.spec | 1 +
1 file changed, 1 insertion(+)
diff --git a/SPECS/systemd.spec b/SPECS/systemd.spec
index 33f3128..a8e1846 100644
index e9fc3a4..e79f10e 100644
--- a/SPECS/systemd.spec
+++ b/SPECS/systemd.spec
@@ -544,6 +544,7 @@ Patch0502: 0502-udev-path_id-introduce-support-for-NVMe-devices-4169.patch
Patch0503: 0503-Configure-journald-to-forward-to-syslog.patch
Patch0504: 0504-Configure-journald-rate-limit.patch
Patch0505: 0505-remove-id-sas-path-symlink.patch
+Patch0506: 0506-fix-ACL-warnings-from-systemd-tmpfiles-set.patch
@@ -658,6 +658,7 @@ Patch0701: 0701-inject-millisec-in-syslog-date.patch
Patch0703: 0703-Configure-journald-to-forward-to-syslog.patch
Patch0704: 0704-Configure-journald-rate-limit.patch
Patch0705: 0705-remove-id-sas-path-symlink.patch
+Patch0706: 0706-fix-ACL-warnings-from-systemd-tmpfiles-set.patch
%global num_patches %{lua: c=0; for i,p in ipairs(patches) do c=c+1; end; print(c);}
--
1.9.1
2.7.4

18
base/systemd/centos/meta_patches/0011-Add-patch-for-moving-vartmp-to-tmpfs.patch
View File

@ -1,24 +1,24 @@
From 4457eecec7e750c2e60f2bc33a0f7c4c70955a86 Mon Sep 17 00:00:00 2001
From 776961a3addc58b47e9b10bc29d07ae31f2853f8 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 10/10] WRS: 0011-Add-patch-for-moving-vartmp-to-tmpfs.patch
Subject: [PATCH 5/7] WRS: 0011-Add-patch-for-moving-vartmp-to-tmpfs.patch
---
SPECS/systemd.spec | 1 +
1 file changed, 1 insertion(+)
diff --git a/SPECS/systemd.spec b/SPECS/systemd.spec
index a8e1846..e36e410 100644
index e79f10e..acc059f 100644
--- a/SPECS/systemd.spec
+++ b/SPECS/systemd.spec
@@ -545,6 +545,7 @@ Patch0503: 0503-Configure-journald-to-forward-to-syslog.patch
Patch0504: 0504-Configure-journald-rate-limit.patch
Patch0505: 0505-remove-id-sas-path-symlink.patch
Patch0506: 0506-fix-ACL-warnings-from-systemd-tmpfiles-set.patch
+Patch0507: 0507-move-vartmp-to-tmpfs.patch
@@ -659,6 +659,7 @@ Patch0703: 0703-Configure-journald-to-forward-to-syslog.patch
Patch0704: 0704-Configure-journald-rate-limit.patch
Patch0705: 0705-remove-id-sas-path-symlink.patch
Patch0706: 0706-fix-ACL-warnings-from-systemd-tmpfiles-set.patch
+Patch0707: 0707-move-vartmp-to-tmpfs.patch
%global num_patches %{lua: c=0; for i,p in ipairs(patches) do c=c+1; end; print(c);}
--
1.9.1
2.7.4

18
base/systemd/centos/meta_patches/0012-Add-patch-for-restricting-tmpfs-size.patch
View File

@ -1,24 +1,24 @@
From 508f3f3f6b114fe081cc2c0594912fd6451d1045 Mon Sep 17 00:00:00 2001
From 2d2e804d3d48f47c207a6a58d6932e1119f61f93 Mon Sep 17 00:00:00 2001
From: Kam Nasim <kam.nasim@windriver.com>
Date: Thu, 12 Oct 2017 18:22:33 -0400
Subject: meta patch for restricting tmpfs size
Subject: [PATCH 6/7] meta patch for restricting tmpfs size
---
SPECS/systemd.spec | 1 +
1 file changed, 1 insertion(+)
diff --git a/SPECS/systemd.spec b/SPECS/systemd.spec
index 9e5ac92..66df00b 100644
index acc059f..6152e33 100644
--- a/SPECS/systemd.spec
+++ b/SPECS/systemd.spec
@@ -462,6 +462,7 @@ Patch0504: 0504-Configure-journald-rate-limit.patch
Patch0505: 0505-remove-id-sas-path-symlink.patch
Patch0506: 0506-fix-ACL-warnings-from-systemd-tmpfiles-set.patch
Patch0507: 0507-move-vartmp-to-tmpfs.patch
+Patch0508: 0508-set-a-1GB-size-restriction-on-tpmfs.patch
@@ -660,6 +660,7 @@ Patch0704: 0704-Configure-journald-rate-limit.patch
Patch0705: 0705-remove-id-sas-path-symlink.patch
Patch0706: 0706-fix-ACL-warnings-from-systemd-tmpfiles-set.patch
Patch0707: 0707-move-vartmp-to-tmpfs.patch
+Patch0708: 0708-set-a-1GB-size-restriction-on-tpmfs.patch
%global num_patches %{lua: c=0; for i,p in ipairs(patches) do c=c+1; end; print(c);}
--
1.8.3.1
2.7.4

18
base/systemd/centos/meta_patches/0013-fix-systemd-tmpfiles-ACL-warnings.patch
View File

@ -1,24 +1,24 @@
From 9c5837d4d7a60653e418157e3a9552ddcc36d29e Mon Sep 17 00:00:00 2001
From 151218c66280ec3984daf0a476e7b5cac69d305a Mon Sep 17 00:00:00 2001
From: Andy Ning <andy.ning@windriver.com>
Date: Wed, 28 Mar 2018 14:20:39 -0400
Subject: fix systemd tmpfiles ACL warnings
Subject: [PATCH 7/7] fix systemd tmpfiles ACL warnings
---
SPECS/systemd.spec | 1 +
1 file changed, 1 insertion(+)
diff --git a/SPECS/systemd.spec b/SPECS/systemd.spec
index 55e44a5..f1dea1e 100644
index 6152e33..ffd0770 100644
--- a/SPECS/systemd.spec
+++ b/SPECS/systemd.spec
@@ -547,6 +547,7 @@ Patch0505: 0505-remove-id-sas-path-symlink.patch
Patch0506: 0506-fix-ACL-warnings-from-systemd-tmpfiles-set.patch
Patch0507: 0507-move-vartmp-to-tmpfs.patch
Patch0508: 0508-set-a-1GB-size-restriction-on-tpmfs.patch
+Patch0509: 0509-fix-systemd-tmpfiles-ACL-warnings.patch
@@ -661,6 +661,7 @@ Patch0705: 0705-remove-id-sas-path-symlink.patch
Patch0706: 0706-fix-ACL-warnings-from-systemd-tmpfiles-set.patch
Patch0707: 0707-move-vartmp-to-tmpfs.patch
Patch0708: 0708-set-a-1GB-size-restriction-on-tpmfs.patch
+Patch0709: 0709-fix-systemd-tmpfiles-ACL-warnings.patch
%global num_patches %{lua: c=0; for i,p in ipairs(patches) do c=c+1; end; print(c);}
--
1.8.3.1
2.7.4

25
base/systemd/centos/meta_patches/0014-fix-build-error-for-unused-variable.patch Normal file
View File

@ -0,0 +1,25 @@
From 6aead74fb56ae75cc16be507165d3fc75c38fac0 Mon Sep 17 00:00:00 2001
From: slin14 <shuicheng.lin@intel.com>
Date: Thu, 9 Aug 2018 18:40:36 +0800
Subject: [PATCH] Add 0710-fix-build-error-for-unused-variable.patch
Signed-off-by: slin14 <shuicheng.lin@intel.com>
---
SPECS/systemd.spec | 1 +
1 file changed, 1 insertion(+)
diff --git a/SPECS/systemd.spec b/SPECS/systemd.spec
index ffd0770..3f7cc10 100644
--- a/SPECS/systemd.spec
+++ b/SPECS/systemd.spec
@@ -662,6 +662,7 @@ Patch0706: 0706-fix-ACL-warnings-from-systemd-tmpfiles-set.patch
Patch0707: 0707-move-vartmp-to-tmpfs.patch
Patch0708: 0708-set-a-1GB-size-restriction-on-tpmfs.patch
Patch0709: 0709-fix-systemd-tmpfiles-ACL-warnings.patch
+Patch0710: 0710-fix-build-error-for-unused-variable.patch
%global num_patches %{lua: c=0; for i,p in ipairs(patches) do c=c+1; end; print(c);}
--
2.7.4

1
base/systemd/centos/meta_patches/PATCH_ORDER
View File

@ -9,3 +9,4 @@
0011-Add-patch-for-moving-vartmp-to-tmpfs.patch
0012-Add-patch-for-restricting-tmpfs-size.patch
0013-fix-systemd-tmpfiles-ACL-warnings.patch
0014-fix-build-error-for-unused-variable.patch

0
base/systemd/centos/patches/0501-inject-millisec-in-syslog-date.patch → base/systemd/centos/patches/0701-inject-millisec-in-syslog-date.patch
View File

0
base/systemd/centos/patches/0503-Configure-journald-to-forward-to-syslog.patch → base/systemd/centos/patches/0703-Configure-journald-to-forward-to-syslog.patch
View File

0
base/systemd/centos/patches/0504-Configure-journald-rate-limit.patch → base/systemd/centos/patches/0704-Configure-journald-rate-limit.patch
View File

0
base/systemd/centos/patches/0505-remove-id-sas-path-symlink.patch → base/systemd/centos/patches/0705-remove-id-sas-path-symlink.patch
View File

0
base/systemd/centos/patches/0506-fix-ACL-warnings-from-systemd-tmpfiles-set.patch → base/systemd/centos/patches/0706-fix-ACL-warnings-from-systemd-tmpfiles-set.patch
View File

0
base/systemd/centos/patches/0507-move-vartmp-to-tmpfs.patch → base/systemd/centos/patches/0707-move-vartmp-to-tmpfs.patch
View File

0
base/systemd/centos/patches/0508-set-a-1GB-size-restriction-on-tpmfs.patch → base/systemd/centos/patches/0708-set-a-1GB-size-restriction-on-tpmfs.patch
View File

0
base/systemd/centos/patches/0509-fix-systemd-tmpfiles-ACL-warnings.patch → base/systemd/centos/patches/0709-fix-systemd-tmpfiles-ACL-warnings.patch
View File

26
base/systemd/centos/patches/0710-fix-build-error-for-unused-variable.patch Normal file
View File

@ -0,0 +1,26 @@
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

2
base/systemd/centos/srpm_path
View File

@ -1 +1 @@
mirror:Source/systemd-219-42.el7_4.1.src.rpm
mirror:Source/systemd-219-57.el7.src.rpm