PR#4: Split out the network-scripts - rpms/openvswitch

rpms / openvswitch

#4 Split out the network-scripts

Merged 5 years ago by tredaell. Opened 5 years ago by lkundrak.

rpms/ lkundrak/openvswitch lr/network-service into master

Split out the network-scripts

Lubomir Rintel • 5 years ago

5f366f1

openvswitch.spec

file modified

+18 -3

		`@@ -40,7 +40,7 @@`
		`Summary: Open vSwitch daemon/database/utilities`
		`URL: http://www.openvswitch.org/`
		`Version: 2.9.2`
		`- Release: 3%{?commit0:.%{date}git%{shortcommit0}}%{?dist}`
		`+ Release: 4%{?commit0:.%{date}git%{shortcommit0}}%{?dist}`

		`# Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the`
		`# lib/sflow*.[ch] files are SISSL`
		`@@ -153,6 +153,16 @@`
		`This provides shared library, libopenswitch.so and the openvswitch header`
		`files needed to build an external application.`

		`+ %package -n network-scripts-%{name}`
		`+ Summary: Open vSwitch legacy network service support`
		`+ License: ASL 2.0`
		`+ Requires: network-scripts`
		`+ Supplements: (%{name} and network-scripts)`
		`+`
		`+ %description -n network-scripts-%{name}`
		`+ This provides the ifup and ifdown scripts for use with the legacy network`
		`+ service.`
		`+`
		`%package ovn-central`
		`Summary: Open vSwitch - Open Virtual Network support`
		`License: ASL 2.0`
		`@@ -526,6 +536,10 @@`
		`%{_includedir}/ovn/*`
		`%exclude %{_libdir}/*.la`

		`+ %files -n network-scripts-%{name}`
		`+ %{_sysconfdir}/sysconfig/network-scripts/ifup-ovs`
		`+ %{_sysconfdir}/sysconfig/network-scripts/ifdown-ovs`
		`+`
		`%files`
		`%defattr(-,openvswitch,openvswitch)`
		`%dir %{_sysconfdir}/openvswitch`
		`@@ -543,8 +557,6 @@`
		`%{_unitdir}/ovs-vswitchd.service`
		`%{_unitdir}/ovs-delete-transient-ports.service`
		`%{_datadir}/openvswitch/scripts/openvswitch.init`
		`- %{_sysconfdir}/sysconfig/network-scripts/ifup-ovs`
		`- %{_sysconfdir}/sysconfig/network-scripts/ifdown-ovs`
		`%{_datadir}/openvswitch/bugtool-plugins/`
		`%{_datadir}/openvswitch/scripts/ovs-bugtool-*`
		`%{_datadir}/openvswitch/scripts/ovs-check-dead-ifs`
		`@@ -641,6 +653,9 @@`
		`%{_unitdir}/ovn-controller-vtep.service`

		`%changelog`
		`+ * Mon Aug 06 2018 Lubomir Rintel <lkundrak@v3.sk> - 2.9.2-4`
		`+ - Split out the network-scripts`
		`+`
		`* Wed Aug 01 2018 Timothy Redaelli <tredaelli@redhat.com> - 2.9.2-3`
		`- Build OVS as shared library`
		`- Build the C json native extension for Python (60x faster)`

lkundrak commented 5 years ago

The network-scripts are now removed from the RHEL 8 base installation (and
possibly Fedora too). Let's remove them, so that we don't end up in a situation
where we install unneeded files into an unowned directory.

The boolean weak dependency is utilized to make life easier for those still
relying on the legacy network service and to avoid breakage on upgrades.

lkundrak commented 5 years ago

Here's what the upgrade looks like:

Dependencies resolved.
================================================================================
 Package                       Arch     Version        Repository          Size
================================================================================
Upgrading:
 openvswitch                   x86_64   2.9.2-3.fc29   local-1532438164   4.2 M
Installing weak dependencies:
 network-scripts-openvswitch   x86_64   2.9.2-3.fc29   local-1532438164    13 k

Transaction Summary
================================================================================
Install  1 Package
Upgrade  1 Package

lkundrak commented 5 years ago

The network-scripts-<name> naming was chosen consistently with ppp and team.

rebased onto 5f366f1

5 years ago

lkundrak commented 5 years ago

This should ideally be fixed before Fedora 29.
Thanks.

Edited 5 years ago by lkundrak