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>
27 lines
1.2 KiB
Diff
27 lines
1.2 KiB
Diff
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] [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 ba61963..f690034 100644
|
|
--- a/rules/60-persistent-storage.rules
|
|
+++ b/rules/60-persistent-storage.rules
|
|
@@ -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}"
|
|
-ENV{DEVTYPE}=="disk", ENV{ID_SAS_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_SAS_PATH}"
|
|
ENV{DEVTYPE}=="partition", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PATH}-part%n"
|
|
-ENV{DEVTYPE}=="partition", ENV{ID_SAS_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_SAS_PATH}-part%n"
|
|
|
|
# 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"
|
|
--
|
|
2.7.4
|
|
|