15e737c47b
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>
28 lines
890 B
Diff
28 lines
890 B
Diff
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] [PATCH 02/10] WRS: 0003-spec-expand-_udevrulesdir-macro.patch
|
|
|
|
Conflicts:
|
|
SPECS/systemd.spec
|
|
---
|
|
SPECS/systemd.spec | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/SPECS/systemd.spec b/SPECS/systemd.spec
|
|
index 3b2aa7f..6e1d7e1 100644
|
|
--- a/SPECS/systemd.spec
|
|
+++ b/SPECS/systemd.spec
|
|
@@ -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.*
|
|
|
|
-install -m 0644 %{SOURCE5} $RPM_BUILD_ROOT/%{_udevrulesdir}/
|
|
+install -m 0644 %{SOURCE5} $RPM_BUILD_ROOT/usr/lib/udev/rules.d/
|
|
|
|
%pre
|
|
getent group cdrom >/dev/null 2>&1 || groupadd -r -g 11 cdrom >/dev/null 2>&1 || :
|
|
--
|
|
2.7.4
|
|
|