starlingx/integ
Code Issues Proposed changes

de-fuzz fuzzy patch in systemd

Browse Source 
Fuzzy patch will cause potential build failure issue. Correct the
line number in patch file to de-fuzz it.

Story: 2004660
Task: 33558
Change-Id: Iccc880025c791d38835e9cd535eab657529c6f47
Signed-off-by: Shuicheng Lin <shuicheng.lin@intel.com>
This commit is contained in:
Shuicheng Lin 2019-06-02 10:15:00 +08:00
parent 05bf7be027
commit 8948026e7c
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
base/systemd/centos/meta_patches/Protect-sections-of-systemd-post-from-running-on-pat.patch
View File

@ -1,7 +1,7 @@
From e54be64fa16349c94826b17a4dc206a7513f0d9c Mon Sep 17 00:00:00 2001 From e54be64fa16349c94826b17a4dc206a7513f0d9c Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com> From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 17:53:00 -0400 Date: Mon, 2 Oct 2017 17:53:00 -0400
Subject: [PATCH] [PATCH 03/10] WRS: Subject: [PATCH] WRS:
0004-Protect-sections-of-systemd-post-from-running-on-pat.patch 0004-Protect-sections-of-systemd-post-from-running-on-pat.patch
--- ---
@ -12,7 +12,7 @@ diff --git a/SPECS/systemd.spec b/SPECS/systemd.spec
index 6e1d7e1..6a04c16 100644 index 6e1d7e1..6a04c16 100644
--- a/SPECS/systemd.spec --- a/SPECS/systemd.spec
+++ b/SPECS/systemd.spec +++ b/SPECS/systemd.spec
@@ -1213,6 +1213,7 @@ fi @@ -1221,6 +1221,7 @@ fi
rm -f /etc/sysconfig/i18n >/dev/null 2>&1 || : rm -f /etc/sysconfig/i18n >/dev/null 2>&1 || :
rm -f /etc/sysconfig/keyboard >/dev/null 2>&1 || : rm -f /etc/sysconfig/keyboard >/dev/null 2>&1 || :
@ -20,7 +20,7 @@ index 6e1d7e1..6a04c16 100644
# Migrate HOSTNAME= from /etc/sysconfig/network # Migrate HOSTNAME= from /etc/sysconfig/network
if [ -e /etc/sysconfig/network -a ! -e /etc/hostname ]; then if [ -e /etc/sysconfig/network -a ! -e /etc/hostname ]; then
unset HOSTNAME unset HOSTNAME
@@ -1220,6 +1221,7 @@ if [ -e /etc/sysconfig/network -a ! -e /etc/hostname ]; then @@ -1228,6 +1229,7 @@ if [ -e /etc/sysconfig/network -a ! -e /etc/hostname ]; then
[ -n "$HOSTNAME" ] && echo $HOSTNAME > /etc/hostname 2>&1 || : [ -n "$HOSTNAME" ] && echo $HOSTNAME > /etc/hostname 2>&1 || :
fi fi
sed -i '/^HOSTNAME=/d' /etc/sysconfig/network >/dev/null 2>&1 || : sed -i '/^HOSTNAME=/d' /etc/sysconfig/network >/dev/null 2>&1 || :
@ -28,7 +28,7 @@ index 6e1d7e1..6a04c16 100644
# Migrate the old systemd-setup-keyboard X11 configuration fragment # Migrate the old systemd-setup-keyboard X11 configuration fragment
if [ ! -e /etc/X11/xorg.conf.d/00-keyboard.conf ] ; then if [ ! -e /etc/X11/xorg.conf.d/00-keyboard.conf ] ; then
@@ -1228,6 +1230,7 @@ else @@ -1236,6 +1238,7 @@ else
rm -f /etc/X11/xorg.conf.d/00-system-setup-keyboard.conf >/dev/null 2>&1 || : rm -f /etc/X11/xorg.conf.d/00-system-setup-keyboard.conf >/dev/null 2>&1 || :
fi fi
@ -36,7 +36,7 @@ index 6e1d7e1..6a04c16 100644
# sed-fu to add myhostname to the hosts line of /etc/nsswitch.conf # sed-fu to add myhostname to the hosts line of /etc/nsswitch.conf
# Only do that when installing, not when updating. # Only do that when installing, not when updating.
if [ $1 -eq 1 -a -f /etc/nsswitch.conf ] ; then if [ $1 -eq 1 -a -f /etc/nsswitch.conf ] ; then
@@ -1237,6 +1240,7 @@ if [ $1 -eq 1 -a -f /etc/nsswitch.conf ] ; then @@ -1245,6 +1248,7 @@ if [ $1 -eq 1 -a -f /etc/nsswitch.conf ] ; then
s/[[:blank:]]*$/ myhostname/ s/[[:blank:]]*$/ myhostname/
' /etc/nsswitch.conf >/dev/null 2>&1 || : ' /etc/nsswitch.conf >/dev/null 2>&1 || :
fi fi
@ -44,6 +44,6 @@ index 6e1d7e1..6a04c16 100644
%posttrans %posttrans
# Convert old /etc/sysconfig/desktop settings # Convert old /etc/sysconfig/desktop settings
-- --
2.7.4 2.7.4

2
base/systemd/centos/meta_patches/fix-build-error-for-CentOS76.patch
View File

@ -12,7 +12,7 @@ diff --git a/SPECS/systemd.spec b/SPECS/systemd.spec
index f794c3b..8e3715b 100644 index f794c3b..8e3715b 100644
--- a/SPECS/systemd.spec --- a/SPECS/systemd.spec
+++ b/SPECS/systemd.spec +++ b/SPECS/systemd.spec
@@ -707,6 +707,7 @@ Patch0664: 0664-Make-sure-the-mount-units-pulled-by-RequiresMountsFo.patch @@ -715,6 +715,7 @@ Patch0672: 0672-sd-bus-if-we-receive-an-invalid-dbus-message-ignore-.patch
#WRS Patches #WRS Patches
Patch0701: 0701-inject-millisec-in-syslog-date.patch Patch0701: 0701-inject-millisec-in-syslog-date.patch
Patch0702: 0702-fix-build-error-for-unused-variable.patch Patch0702: 0702-fix-build-error-for-unused-variable.patch

8
base/systemd/centos/meta_patches/fix-build-error-for-unused-variable.patch
View File

@ -12,14 +12,14 @@ diff --git a/SPECS/systemd.spec b/SPECS/systemd.spec
index ffd0770..3f7cc10 100644 index ffd0770..3f7cc10 100644
--- a/SPECS/systemd.spec --- a/SPECS/systemd.spec
+++ b/SPECS/systemd.spec +++ b/SPECS/systemd.spec
@@ -706,6 +706,7 @@ Patch0664: 0664-Make-sure-the-mount-units-pulled-by-RequiresMountsFo.patch @@ -714,6 +714,7 @@ Patch0672: 0672-sd-bus-if-we-receive-an-invalid-dbus-message-ignore-.patch
#WRS Patches #WRS Patches
Patch0701: 0701-inject-millisec-in-syslog-date.patch Patch0701: 0701-inject-millisec-in-syslog-date.patch
+Patch0702: 0702-fix-build-error-for-unused-variable.patch +Patch0702: 0702-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);} %global num_patches %{lua: c=0; for i,p in ipairs(patches) do c=c+1; end; print(c);}
-- --
2.7.4 2.7.4

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

@ -11,16 +11,16 @@ diff --git a/SPECS/systemd.spec b/SPECS/systemd.spec
index 6a04c16..845d1dd 100644 index 6a04c16..845d1dd 100644
--- a/SPECS/systemd.spec --- a/SPECS/systemd.spec
+++ b/SPECS/systemd.spec +++ b/SPECS/systemd.spec
@@ -704,6 +704,9 @@ Patch0662: 0662-cryptsetup-generator-don-t-return-error-if-target-di.patch @@ -712,6 +712,9 @@ Patch0670: 0670-Refuse-dbus-message-paths-longer-than-BUS_PATH_SIZE_.patch
Patch0663: 0663-cryptsetup-generator-allow-whitespace-characters-in-.patch Patch0671: 0671-Allocate-temporary-strings-to-hold-dbus-paths-on-the.patch
Patch0664: 0664-Make-sure-the-mount-units-pulled-by-RequiresMountsFo.patch Patch0672: 0672-sd-bus-if-we-receive-an-invalid-dbus-message-ignore-.patch
+#WRS Patches +#WRS Patches
+Patch0701: 0701-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);} %global num_patches %{lua: c=0; for i,p in ipairs(patches) do c=c+1; end; print(c);}
BuildRequires: libcap-devel BuildRequires: libcap-devel
-- --
2.7.4 2.7.4