summaryrefslogtreecommitdiff
path: root/rhel
diff options
context:
space:
mode:
authorBen Pfaff <blp@ovn.org>2019-09-27 09:21:57 -0700
committerBen Pfaff <blp@ovn.org>2019-09-30 13:13:26 -0700
commit05bf1dbb98b0635a51f75e268ef8aed27601401d (patch)
treed636da9a9475bf0514cc24fd53a33cc236ac95d7 /rhel
parent817db730190e19df7f1519b384fefab6d90b52fa (diff)
downloadopenvswitch-05bf1dbb98b0635a51f75e268ef8aed27601401d.tar.gz
ovn: Remove remaining pieces.
A preceding commit removed the last remaining dependencies on OVN code, so remove the OVN code. Acked-by: Han Zhou <hzhou8@ebay.com> Signed-off-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'rhel')
-rw-r--r--rhel/.gitignore1
-rw-r--r--rhel/openvswitch-fedora.spec.in11
-rw-r--r--rhel/openvswitch.spec.in6
3 files changed, 1 insertions, 17 deletions
diff --git a/rhel/.gitignore b/rhel/.gitignore
index e6f72859f..a9c047f83 100644
--- a/rhel/.gitignore
+++ b/rhel/.gitignore
@@ -4,5 +4,4 @@ kmod-openvswitch-rhel6.spec
openvswitch-kmod-fedora.spec
openvswitch.spec
openvswitch-fedora.spec
-ovn-fedora.spec
usr_lib_systemd_system_ovs-vswitchd.service
diff --git a/rhel/openvswitch-fedora.spec.in b/rhel/openvswitch-fedora.spec.in
index fc113c9f1..229bb2214 100644
--- a/rhel/openvswitch-fedora.spec.in
+++ b/rhel/openvswitch-fedora.spec.in
@@ -272,17 +272,6 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/ovs-parse-backtrace \
$RPM_BUILD_ROOT%{_sbindir}/ovs-vlan-bug-workaround \
$RPM_BUILD_ROOT%{_mandir}/man8/ovs-vlan-bug-workaround.8
-# remove ovn unpackages files
-rm -f $RPM_BUILD_ROOT%{_bindir}/ovn*
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/ovn*
-rm -f $RPM_BUILD_ROOT%{_mandir}/man5/ovn*
-rm -f $RPM_BUILD_ROOT%{_mandir}/man7/ovn*
-rm -f $RPM_BUILD_ROOT%{_mandir}/man8/ovn*
-rm -f $RPM_BUILD_ROOT%{_datadir}/openvswitch/ovn*
-rm -f $RPM_BUILD_ROOT%{_datadir}/openvswitch/scripts/ovn*
-rm -f $RPM_BUILD_ROOT%{_includedir}/ovn/*
-rm -f $RPM_BUILD_ROOT%{_libdir}/libovn*
-
%check
%if %{with check}
touch resolv.conf
diff --git a/rhel/openvswitch.spec.in b/rhel/openvswitch.spec.in
index 7f27fedd6..27935f81e 100644
--- a/rhel/openvswitch.spec.in
+++ b/rhel/openvswitch.spec.in
@@ -101,11 +101,7 @@ rm \
$RPM_BUILD_ROOT/usr/share/man/man8/ovs-test.8 \
$RPM_BUILD_ROOT/usr/share/man/man8/ovs-l3ping.8 \
$RPM_BUILD_ROOT/usr/sbin/ovs-vlan-bug-workaround \
- $RPM_BUILD_ROOT/usr/share/man/man8/ovs-vlan-bug-workaround.8 \
- $RPM_BUILD_ROOT/usr/bin/ovn-* \
- $RPM_BUILD_ROOT/usr/share/man/man?/ovn-* \
- $RPM_BUILD_ROOT/usr/share/openvswitch/ovn-* \
- $RPM_BUILD_ROOT/usr/share/openvswitch/scripts/ovn*
+ $RPM_BUILD_ROOT/usr/share/man/man8/ovs-vlan-bug-workaround.8
(cd "$RPM_BUILD_ROOT" && rm -rf usr/%{_lib}/*.la)
(cd "$RPM_BUILD_ROOT" && rm -rf usr/include)