From d1002da928722b80e2fd796aeb901eb3b205db29 Mon Sep 17 00:00:00 2001 From: slin14 Date: Tue, 9 Oct 2018 23:06:33 +0800 Subject: [PATCH] de-fuzz openvswitch patch 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 --- .../0003-run-services-as-root-user.patch | 2 +- .../meta_patches/0004-add-pmon-conf-files.patch | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/networking/openvswitch/centos/meta_patches/0003-run-services-as-root-user.patch b/networking/openvswitch/centos/meta_patches/0003-run-services-as-root-user.patch index 867568911..ae5e378a9 100644 --- a/networking/openvswitch/centos/meta_patches/0003-run-services-as-root-user.patch +++ b/networking/openvswitch/centos/meta_patches/0003-run-services-as-root-user.patch @@ -19,7 +19,7 @@ index 6950479..6fc2b67 100644 # 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 %endif diff --git a/networking/openvswitch/centos/meta_patches/0004-add-pmon-conf-files.patch b/networking/openvswitch/centos/meta_patches/0004-add-pmon-conf-files.patch index 6fe0dbbc7..7aa75c2d2 100644 --- a/networking/openvswitch/centos/meta_patches/0004-add-pmon-conf-files.patch +++ b/networking/openvswitch/centos/meta_patches/0004-add-pmon-conf-files.patch @@ -4,11 +4,11 @@ Date: Fri, 1 Jun 2018 19:49:33 -0500 Subject: [PATCH] add pmon conf files --- - SPECS/openvswitch.spec | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) + SPECS/openvswitch.spec | 6 ++++++ + 1 file changed, 6 insertions(+) diff --git a/SPECS/openvswitch.spec b/SPECS/openvswitch.spec -index 6fc2b67..57a3055 100644 +index b1e285d..16447e0 100644 --- a/SPECS/openvswitch.spec +++ b/SPECS/openvswitch.spec @@ -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 # other techniques, carefully crafted assembly instructions. As such it # 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 @@ -30,7 +30,7 @@ index 6fc2b67..57a3055 100644 # remove unpackaged files rm -f $RPM_BUILD_ROOT/%{_bindir}/ovs-benchmark \ $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-vsctl-bashcomp.bash %config(noreplace) %{_sysconfdir}/logrotate.d/openvswitch @@ -38,5 +38,6 @@ index 6fc2b67..57a3055 100644 %{_unitdir}/openvswitch.service %{_unitdir}/ovsdb-server.service %{_unitdir}/ovs-vswitchd.service -1.8.3.1 +-- +2.7.4