starlingx/integ
Code Issues Proposed changes

de-fuzz systemd patches

Browse Source 
When do Centos 7.5 upgraded, some patches didn't resolve and cause
the fuzzy in the line numbers of the patches. And it may cause
.orig file is created when do patch. And this .orig file will lead
to rpm packaging failure due to the unexpected and unpackaged .orig
file.

Please visit below link to get more detail info:
https://bugs.launchpad.net/starlingx/+bug/1794611

Solution:
  Safest solution is to de-fuzz our patches.

Story: 2003389
Task: 26755

Change-Id: Iba5ccb26f65b61bcd602c36a6f61a2e93ca5d637
Signed-off-by: slin14 <shuicheng.lin@intel.com>
This commit is contained in:
slin14 2018-09-28 07:33:45 +08:00
parent 3975ba05c7
commit 15e737c47b
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
base/systemd/centos/meta_patches/0003-spec-expand-_udevrulesdir-macro.patch
View File

@ -1,7 +1,7 @@
From 23df5b4d09b03dd32ac8b38d9b6d42d9fb91977f Mon Sep 17 00:00:00 2001
From f38825338641e2773b83bd24c824987ebe68f8d3 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 02/10] WRS: 0003-spec-expand-_udevrulesdir-macro.patch
Subject: [PATCH] [PATCH 02/10] WRS: 0003-spec-expand-_udevrulesdir-macro.patch
Conflicts:
SPECS/systemd.spec
@ -10,10 +10,10 @@ Conflicts:
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SPECS/systemd.spec b/SPECS/systemd.spec
index 955cc4b..5474181 100644
index 3b2aa7f..6e1d7e1 100644
--- a/SPECS/systemd.spec
+++ b/SPECS/systemd.spec
@@ -912,7 +912,7 @@ rm -f %{buildroot}%{_prefix}/lib/systemd/network/*
@@ -1030,7 +1030,7 @@ rm -f %{buildroot}%{_prefix}/lib/systemd/network/*
rm -f %{buildroot}%{_mandir}/man5/sysusers.d.5.gz
rm -f %{buildroot}%{_mandir}/man8/systemd-sysusers.*
@ -23,5 +23,5 @@ index 955cc4b..5474181 100644
%pre
getent group cdrom >/dev/null 2>&1 || groupadd -r -g 11 cdrom >/dev/null 2>&1 || :
--
1.9.1
2.7.4

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

@ -1,7 +1,7 @@
From 573c0da6014e782b5b598c054e8b6fc90e3cb780 Mon Sep 17 00:00:00 2001
From e54be64fa16349c94826b17a4dc206a7513f0d9c 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 03/10] WRS:
Subject: [PATCH] [PATCH 03/10] WRS:
0004-Protect-sections-of-systemd-post-from-running-on-pat.patch
---
@ -9,10 +9,10 @@ Subject: [PATCH 03/10] WRS:
1 file changed, 4 insertions(+)
diff --git a/SPECS/systemd.spec b/SPECS/systemd.spec
index 5474181..912d31e 100644
index 6e1d7e1..6a04c16 100644
--- a/SPECS/systemd.spec
+++ b/SPECS/systemd.spec
@@ -1041,6 +1041,7 @@ fi
@@ -1159,6 +1159,7 @@ fi
rm -f /etc/sysconfig/i18n >/dev/null 2>&1 || :
rm -f /etc/sysconfig/keyboard >/dev/null 2>&1 || :
@ -20,7 +20,7 @@ index 5474181..912d31e 100644
# Migrate HOSTNAME= from /etc/sysconfig/network
if [ -e /etc/sysconfig/network -a ! -e /etc/hostname ]; then
unset HOSTNAME
@@ -1048,6 +1049,7 @@ if [ -e /etc/sysconfig/network -a ! -e /etc/hostname ]; then
@@ -1166,6 +1167,7 @@ if [ -e /etc/sysconfig/network -a ! -e /etc/hostname ]; then
[ -n "$HOSTNAME" ] && echo $HOSTNAME > /etc/hostname 2>&1 || :
fi
sed -i '/^HOSTNAME=/d' /etc/sysconfig/network >/dev/null 2>&1 || :
@ -28,7 +28,7 @@ index 5474181..912d31e 100644
# Migrate the old systemd-setup-keyboard X11 configuration fragment
if [ ! -e /etc/X11/xorg.conf.d/00-keyboard.conf ] ; then
@@ -1056,6 +1058,7 @@ else
@@ -1174,6 +1176,7 @@ else
rm -f /etc/X11/xorg.conf.d/00-system-setup-keyboard.conf >/dev/null 2>&1 || :
fi
@ -36,7 +36,7 @@ index 5474181..912d31e 100644
# sed-fu to add myhostname to the hosts line of /etc/nsswitch.conf
# Only do that when installing, not when updating.
if [ $1 -eq 1 -a -f /etc/nsswitch.conf ] ; then
@@ -1065,6 +1068,7 @@ if [ $1 -eq 1 -a -f /etc/nsswitch.conf ] ; then
@@ -1183,6 +1186,7 @@ if [ $1 -eq 1 -a -f /etc/nsswitch.conf ] ; then
s/[[:blank:]]*$/ myhostname/
' /etc/nsswitch.conf >/dev/null 2>&1 || :
fi
@ -45,5 +45,5 @@ index 5474181..912d31e 100644
%posttrans
# Convert old /etc/sysconfig/desktop settings
--
1.9.1
2.7.4

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

@ -1,17 +1,17 @@
From f322cd1a7678c6e50ac1a842b887ea1fc3e21627 Mon Sep 17 00:00:00 2001
From 3bc9bedbcc6dedd5b68875ce572884c686abce65 Mon Sep 17 00:00:00 2001
From: Irina Mihai <irina.mihai@windriver.com>
Date: Mon, 15 May 2017 18:58:48 +0000
Subject: [PATCH] Remove ID_SAS_PATH rule
Subject: [PATCH] [PATCH] Remove ID_SAS_PATH rule
---
rules/60-persistent-storage.rules | 2 --
1 file changed, 2 deletions(-)
diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules
index 06e3329..3f2c1c1 100644
index ba61963..f690034 100644
--- a/rules/60-persistent-storage.rules
+++ b/rules/60-persistent-storage.rules
@@ -64,9 +64,7 @@ KERNEL=="mspblk[0-9]p[0-9]", ENV{ID_NAME}=="?*", ENV{ID_SERIAL}=="?*", SYMLINK+=
@@ -65,9 +65,7 @@ KERNEL=="mspblk[0-9]p[0-9]", ENV{ID_NAME}=="?*", ENV{ID_SERIAL}=="?*", SYMLINK+=
# by-path (parent device path)
ENV{DEVTYPE}=="disk", DEVPATH!="*/virtual/*", IMPORT{builtin}="path_id"
ENV{DEVTYPE}=="disk", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PATH}"
@ -22,5 +22,5 @@ index 06e3329..3f2c1c1 100644
# skip unpartitioned removable media devices from drivers which do not send "change" events
ENV{DEVTYPE}=="disk", KERNEL!="sd*|sr*", ATTR{removable}=="1", GOTO="persistent_storage_end"
--
1.8.3.1
2.7.4