starlingx/integ
Code Issues Proposed changes

de-fuzz openvswitch patch

Browse Source 
With rpm version < 4.13, patch cmd will create .orig file for fuzzy
patch in default. And this .orig file may lead to rpmbuild failure
"error: Installed (but unpackaged) file(s) found:"

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

Story: 2003917
Task: 26961

Change-Id: I68860e2207b41fa6204bab0600271b7166aa39d3
Signed-off-by: slin14 <shuicheng.lin@intel.com>
This commit is contained in:
slin14 2018-10-09 23:06:33 +08:00
parent 05170d50d8
commit d1002da928
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
networking/openvswitch/centos/meta_patches/0003-run-services-as-root-user.patch
View File

@ -19,7 +19,7 @@ index 6950479..6fc2b67 100644
# OVS (including OVN) backports (0 - 300) # OVS (including OVN) backports (0 - 300)
@@ -507,24 +508,6 @@ rm -rf $RPM_BUILD_ROOT @@ -508,24 +509,6 @@ rm -rf $RPM_BUILD_ROOT
fi fi
%endif %endif

13
networking/openvswitch/centos/meta_patches/0004-add-pmon-conf-files.patch
View File

@ -4,11 +4,11 @@ Date: Fri, 1 Jun 2018 19:49:33 -0500
Subject: [PATCH] add pmon conf files Subject: [PATCH] add pmon conf files
--- ---
SPECS/openvswitch.spec | 8 +++++++- SPECS/openvswitch.spec | 6 ++++++
1 file changed, 7 insertions(+), 1 deletion(-) 1 file changed, 6 insertions(+)
diff --git a/SPECS/openvswitch.spec b/SPECS/openvswitch.spec diff --git a/SPECS/openvswitch.spec b/SPECS/openvswitch.spec
index 6fc2b67..57a3055 100644 index b1e285d..16447e0 100644
--- a/SPECS/openvswitch.spec --- a/SPECS/openvswitch.spec
+++ b/SPECS/openvswitch.spec +++ b/SPECS/openvswitch.spec
@@ -76,6 +76,9 @@ Source504: arm64-armv8a-linuxapp-gcc-config @@ -76,6 +76,9 @@ Source504: arm64-armv8a-linuxapp-gcc-config
@ -21,7 +21,7 @@ index 6fc2b67..57a3055 100644
# The DPDK is designed to optimize througput of network traffic using, among # The DPDK is designed to optimize througput of network traffic using, among
# other techniques, carefully crafted assembly instructions. As such it # other techniques, carefully crafted assembly instructions. As such it
# needs extensive work to port it to other architectures. # needs extensive work to port it to other architectures.
@@ -429,6 +432,8 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/openvswitch/system-id.conf @@ -430,6 +433,8 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/openvswitch/system-id.conf
%endif %endif
%endif %endif
@ -30,7 +30,7 @@ index 6fc2b67..57a3055 100644
# remove unpackaged files # remove unpackaged files
rm -f $RPM_BUILD_ROOT/%{_bindir}/ovs-benchmark \ rm -f $RPM_BUILD_ROOT/%{_bindir}/ovs-benchmark \
$RPM_BUILD_ROOT/%{_bindir}/ovs-docker \ $RPM_BUILD_ROOT/%{_bindir}/ovs-docker \
@@ -631,6 +636,7 @@ rm -rf $RPM_BUILD_ROOT @@ -632,6 +637,7 @@ rm -rf $RPM_BUILD_ROOT
%{_sysconfdir}/bash_completion.d/ovs-appctl-bashcomp.bash %{_sysconfdir}/bash_completion.d/ovs-appctl-bashcomp.bash
%{_sysconfdir}/bash_completion.d/ovs-vsctl-bashcomp.bash %{_sysconfdir}/bash_completion.d/ovs-vsctl-bashcomp.bash
%config(noreplace) %{_sysconfdir}/logrotate.d/openvswitch %config(noreplace) %{_sysconfdir}/logrotate.d/openvswitch
@ -38,5 +38,6 @@ index 6fc2b67..57a3055 100644
%{_unitdir}/openvswitch.service %{_unitdir}/openvswitch.service
%{_unitdir}/ovsdb-server.service %{_unitdir}/ovsdb-server.service
%{_unitdir}/ovs-vswitchd.service %{_unitdir}/ovs-vswitchd.service
1.8.3.1 --
2.7.4