Hello community, here is the log from the commit of package openvswitch for openSUSE:Factory checked in at 2016-05-25 21:28:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openvswitch (Old) and /work/SRC/openSUSE:Factory/.openvswitch.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openvswitch" Changes: -------- --- /work/SRC/openSUSE:Factory/openvswitch/openvswitch.changes 2016-04-14 13:07:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.openvswitch.new/openvswitch.changes 2016-05-25 21:28:28.000000000 +0200 @@ -1,0 +2,43 @@ +Mon May 23 18:33:13 UTC 2016 - [email protected] + +- Keep %prep small for speedier `quilt setup`. Kill __DATE__ from + source. Drop all .la files that are in %_libdir. + +------------------------------------------------------------------- +Fri May 20 09:54:16 UTC 2016 - [email protected] + +- Add missing %dir directive for /var/log/openvswitch + +------------------------------------------------------------------- +Thu May 19 10:13:41 UTC 2016 - [email protected] + +- remove aarch64 conditional, no longer needed + +------------------------------------------------------------------- +Thu May 5 09:00:26 UTC 2016 - [email protected] + +- Multiple spec file and package fixes. + * Drop obsolete log-check-module-loop.patch patch. + * Drop conditional code for older openSUSE releases. This also removes + all of the sysvinit files which were pulled in when the package was + originally developed. + * Drop support for building the GUI. The GUI code has been removed in + 7868fbc6c97c2 ("ovsdbmonitor: Remove.") upstream commit and it does + not exist since v2.2.0 so drop the code in the spec file. + * Use the upstream systemd service files for the OVN components instead + of maintaining our own downstream. + * Drop the unofficial ipsec support. It hasn't been enabled in years. + * Drop support for building the upstream kernel module since it's being + shipped with the kernel package in latest releases. Restore the + %bcond_with kmp to make it easier to build the external kernel module + if needed. + * Fix some suse-missing-rclink rpmlint warnings for the ovn subpackage + * Base our service unit to the upstream one. + * Stop silently enabling the GRE protocol in iptables by default. + * Install the upstream sysconfig file to pass more information to the + openvswitch service unit. + * Use make install instead of %makeinstall + * Drop brcompat leftovers. + * spec-cleaner fixes + +------------------------------------------------------------------- Old: ---- Module.supported README.packager log-check-module-loop.patch openvswitch-ipsec.init openvswitch-switch.init openvswitch-testcontroller.init openvswitch-vtep.init ovn-controller-vtep.service ovn-controller.service ovn-northd.service ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openvswitch.spec ++++++ --- /var/tmp/diff_new_pack.1N6MZr/_old 2016-05-25 21:28:29.000000000 +0200 +++ /var/tmp/diff_new_pack.1N6MZr/_new 2016-05-25 21:28:29.000000000 +0200 @@ -18,10 +18,8 @@ # needssslcertforbuild -# IpSec build disabled temporarily (need to upgrade ipsec-tools): -%bcond_with ipsec -# Disable GUI building by default (heavy Qt4 dependencies): -%bcond_with gui +# Disable building the external kernel datapath by default +%bcond_with kmp Name: openvswitch Version: 2.5.0 @@ -32,21 +30,9 @@ Url: http://openvswitch.org/ Source0: http://openvswitch.org/releases/%{name}-%{version}.tar.gz Source1: preamble -Source2: openvswitch-switch.init -Source4: openvswitch-switch.logrotate -Source5: openvswitch-vtep.init -Source6: openvswitch-ipsec.init -Source7: openvswitch.service -Source8: openvswitch-testcontroller.init -Source10: Module.supported -Source11: Module.supported.updates -%if 0%{?suse_version} > 1110 -Source12: ovn-controller.service -Source13: ovn-controller-vtep.service -Source14: ovn-northd.service -%endif -Source99: README.packager -Patch2: log-check-module-loop.patch +Source2: openvswitch-switch.logrotate +Source3: openvswitch.service +Source89: Module.supported.updates BuildRequires: autoconf BuildRequires: automake BuildRequires: fdupes @@ -61,9 +47,6 @@ BuildRequires: pkg-config BuildRequires: python-devel BuildRequires: python-xml -%ifnarch aarch64 -BuildRequires: valgrind-devel -%endif Requires: logrotate Requires: openssl Requires: python @@ -73,6 +56,7 @@ Obsoletes: openvswitch-controller < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %py_requires +BuildRequires: valgrind-devel %description Open vSwitch is a production quality, multilayer virtual switch licensed under @@ -83,16 +67,12 @@ VMware’s vNetwork distributed vswitch or Cisco’s Nexus 1000V. %if %{with kmp} - %package kmp Summary: Open vSwitch kernel modules License: GPL-2.0+ Group: System/Kernel -BuildRequires: %kernel_module_package_buildreqs -%if %{with kernel_kmp} -BuildRequires: kernel-source -%endif -%suse_kernel_module_package -p %_sourcedir/preamble ec2 xenpae vmi um +BuildRequires: %{kernel_module_package_buildreqs} +%suse_kernel_module_package -p %{_sourcedir}/preamble ec2 xenpae vmi um %description -n %{name}-kmp Kernel modules supporting the openvswitch datapath. @@ -107,44 +87,20 @@ %description devel Devel libraries and headers for Open vSwitch. -%if %{with ipsec} - -%package ipsec -Summary: Open vSwitch GRE-over-IPsec support -License: Apache-2.0 -Group: Productivity/Networking/System -Requires: %{name} = %{version} -Requires: %{name}-switch = %{version} -Requires: ipsec-tools >= 0.8 -Requires: python -Requires: python-argparse -Requires: python-openvswitch = %{version} -Requires: racoon >= 0.8 - -%description ipsec -The ovs-monitor-ipsec script provides support for encrypting GRE -tunnels with IPsec. - -Open vSwitch is a full-featured software-based Ethernet switch. -%endif - %package switch Summary: Open vSwitch switch implementations License: Apache-2.0 Group: Productivity/Networking/System -Requires(pre): %fillup_prereq -Requires(pre): %insserv_prereq Requires: modutils Requires: openvswitch = %{version} Requires: procps Requires: python # ovs-ctl / ovs-pki use /usr/bin/uuidgen: Requires: util-linux -Suggests: openvswitch-kmp +Requires(post): %fillup_prereq Suggests: logrotate -%if 0%{?suse_version} > 1230 +Suggests: openvswitch-kmp %{?systemd_requires} -%endif %description switch openvswitch-switch provides the userspace components and utilities for @@ -152,7 +108,6 @@ Open vSwitch is a full-featured software-based Ethernet switch. -%if 0%{?suse_version} > 1110 %package ovn Summary: Open vSwitch - Open Virtual Network support License: Apache-2.0 @@ -166,7 +121,6 @@ abstraction. OVN complements the existing capabilities of OVS to add native support for virtual network abstractions, such as virtual L2 and L3 overlays and security groups. -%endif %package pki Summary: Open vSwitch public key infrastructure dependency package @@ -195,25 +149,6 @@ Open vSwitch is a full-featured software-based Ethernet switch. -%package brcompat -Summary: Open vSwitch bridge compatibility support (deprecated) -License: Apache-2.0 -Group: Productivity/Networking/System -Requires: openvswitch-switch = %{version} -Recommends: bridge-utils - -%description brcompat -openvswitch-brcompat provides a way for applications that use the -Linux bridge to gradually migrate to Open vSwitch. Programs that -ordinarily control the Linux bridge module, such as "brctl", instead -control the Open vSwitch kernel-based switch. Please note that this -feature is deprecated and will be removed soon. - -Once this package is installed, adding BRCOMPAT=yes in -/etc/default/openvswitch-switch enables bridge compatibility. - -Open vSwitch is a full-featured software-based Ethernet switch. - %package -n python-openvswitch Summary: Python bindings for Open vSwitch License: Python-2.0 @@ -236,33 +171,6 @@ %description -n python-openvswitch-test This package contains the full Python bindings for Open vSwitch database. -%if %{with gui} - -%package ovsdbmonitor -Summary: Open vSwitch graphical monitoring tool -License: Apache-2.0 -Group: Productivity/Networking/System -BuildRequires: python-pyside -BuildRequires: python-qt4-devel -BuildRequires: python-twisted -BuildRequires: python-zopeinterface -Requires: python-openvswitch -Requires: python-pyasn1 -Requires: python-pyside -Requires: python-qt4 -Requires: python-twisted -Requires: python-zopeinterface - -%description ovsdbmonitor -This package is a GUI tool for monitoring and troubleshooting local -or remote Open vSwitch installations. It presents GUI tables that -graphically represent an Open vSwitch kernel flow table (similar to -"ovs-dpctl dump-flows") and Open vSwitch database contents (similar -to "ovs-vsctl list <table>"). - -Open vSwitch is a full-featured software-based Ethernet switch. -%endif - %package test Summary: Open vSwitch test package License: Apache-2.0 @@ -281,53 +189,40 @@ %prep %setup -q -%patch2 -p0 +%build set -- * .travis* mkdir source mv "$@" source/ mkdir obj -%build pushd source +perl -i -pe 's{__(DATE|TIME)__}{""}g' include/openvswitch/util.h # only call boot.sh for distros with autoconf >= 2.64 -%if 0%{?suse_version} > 1110 - bash -x boot.sh -%endif +bash -x boot.sh popd %if %{with kmp} -%if %{with kernel_kmp} -for flavor in %flavors_to_build; do - mkdir -p $flavor - cp -a %{SOURCE10} $flavor/ - krel=$(make -s -C /usr/src/linux-obj/%_target_cpu/$flavor kernelrelease) - kernel_source_dir=$(readlink /lib/modules/$krel/source) - cp -a $kernel_source_dir/net/openvswitch/* $flavor/ - make %{?_smp_mflags} -C %{kernel_source $flavor} modules M=$PWD/$flavor -done -%else export EXTRA_CFLAGS='-DVERSION=\"%{version}\"' -for flavor in %flavors_to_build; do +for flavor in %{flavors_to_build}; do rm -rf obj/$flavor cp -r source obj/$flavor - cp -a %{SOURCE11} obj/$flavor/datapath/linux/Module.supported + cp -a %{SOURCE89} obj/$flavor/datapath/linux/Module.supported pushd obj/$flavor %configure \ - --with-logdir=/var/log/openvswitch \ - --with-linux=/usr/src/linux-obj/%_target_cpu/$flavor \ - --with-linux-source=/usr/src/linux + --with-logdir=%{_localstatedir}/log/openvswitch \ + --with-linux=%{_prefix}/src/linux-obj/%{_target_cpu}/$flavor \ + --with-linux-source=%{_prefix}/src/linux cd datapath/linux make %{?_smp_mflags} popd done %endif -%endif -ls source + pushd source %configure \ --disable-static \ --enable-shared \ - --with-logdir=/var/log/openvswitch + --with-logdir=%{_localstatedir}/log/openvswitch make %{?_smp_mflags} popd @@ -337,137 +232,78 @@ export INSTALL_MOD_PATH=%{buildroot} export INSTALL_MOD_DIR=updates export BRP_PESIGN_FILES="*.ko /lib/firmware" -for flavor in %flavors_to_build; do -%if %{with kernel_kmp} - make -C %{kernel_source $flavor} modules_install M=$PWD/$flavor -%else +for flavor in %{flavors_to_build}; do pushd obj/$flavor/datapath/linux - make -C /usr/src/linux-obj/%_target_cpu/$flavor modules_install M=$PWD + make -C %{_prefix}/src/linux-obj/%{_target_cpu}/$flavor modules_install M=$PWD popd -%endif done %endif + pushd source -%makeinstall -install -d -m 755 %{buildroot}/%{_datadir}/%{name}/scripts -install -d -m 755 %{buildroot}/%{_sysconfdir}/init.d -install -d -m 755 %{buildroot}%{_localstatedir}/adm/fillup-templates - -install -m 755 %{SOURCE2} \ - %{buildroot}/%{_sysconfdir}/init.d/%{name}-switch -install -m 755 %{SOURCE5} \ - %{buildroot}/%{_sysconfdir}/init.d/%{name}-vtep -install -m 755 %{SOURCE8} \ - %{buildroot}/%{_sysconfdir}/init.d/%{name}-testcontroller - -%if 0%{?suse_version} > 1230 -ln -sf %_sbindir/service %{buildroot}%{_sbindir}/rc%{name} -ln -sf %_sbindir/service %{buildroot}%{_sbindir}/rc%{name}-vtep -ln -sf %_sbindir/service %{buildroot}%{_sbindir}/rc%{name}-testcontroller -# Move the openvswitch-switch rc file to the scripts directory -# to prevent systemd from autogenerating a unit file for us (bsc#966762) -mv %{buildroot}/%{_sysconfdir}/init.d/%{name}-switch \ - %{buildroot}/%{_datadir}/%{name}/scripts/%{name}-switch -install -D -m 644 %{SOURCE7} \ - %{buildroot}%{_unitdir}/openvswitch.service -install -D -m 644 %{SOURCE12} \ - %{buildroot}%{_unitdir}/ovn-controller.service -install -D -m 644 %{SOURCE13} \ - %{buildroot}%{_unitdir}/ovn-controller-vtep.service -install -D -m 644 %{SOURCE14} \ - %{buildroot}%{_unitdir}/ovn-northd.service -%else -ln -sf %{_sysconfdir}/init.d/%{name}-switch %{buildroot}%{_sbindir}/rc%{name}-switch -ln -sf %{_sysconfdir}/init.d/%{name}-vtep %{buildroot}%{_sbindir}/rc%{name}-vtep -ln -sf %{_sysconfdir}/init.d/%{name}-testcontroller %{buildroot}%{_sbindir}/rc%{name}-testcontroller -%endif +make %{?_smp_mflags} DESTDIR=%{buildroot} install +for service in ovn-controller ovn-controller-vtep ovn-northd; do + install -D -m 644 rhel/usr_lib_systemd_system_${service}.service \ + %{buildroot}%{_unitdir}/${service}.service +done +# We use our own openvswitch.service +install -D -m 644 %{SOURCE3} %{buildroot}%{_unitdir}/%{name}.service + +ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name} +ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcovn-controller +ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcovn-controller-vtep +ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcovn-northd + +install -D -m 644 rhel/usr_share_openvswitch_scripts_systemd_sysconfig.template \ + %{buildroot}/%{_localstatedir}/adm/fillup-templates/sysconfig.openvswitch -install -d -m 755 %{buildroot}/%{_sysconfdir}/sysconfig install -d -m 755 %{buildroot}/%{_sysconfdir}/logrotate.d -install -d -m 755 %{buildroot}/var/log/openvswitch +install -d -m 755 %{buildroot}/%{_localstatedir}/log/openvswitch -install -m 644 %{SOURCE4} \ +install -m 644 %{SOURCE2} \ %{buildroot}/%{_sysconfdir}/logrotate.d/%{name}-switch install -d -m 755 %{buildroot}/%{_sysconfdir}/profile.d install -m 644 vswitchd/vswitch.ovsschema \ %{buildroot}/%{_datadir}/%{name}/vswitch.ovsschema - -%if %{with ipsec} -install -m 755 debian/ovs-monitor-ipsec \ - %{buildroot}/%{_datadir}/%{name}/ovs-monitor-ipsec -install -m 755 %{SOURCE6} \ - %{buildroot}/%{_sysconfdir}/init.d/%{name}-ipsec - ln -s %{_sysconfdir}/init.d/%{name}-ipsec %{buildroot}%{_sbindir}/rc%{name}-ipsec -%endif - popd mkdir -p %{buildroot}%{py_sitedir} mv %{buildroot}%{_datadir}/%{name}/python/* %{buildroot}%{py_sitedir} rmdir %{buildroot}%{_datadir}/%{name}/python +rm -f %buildroot/%_libdir/*.la + %fdupes %{buildroot}%{py_sitedir} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig - %pre switch -%if 0%{?suse_version} > 1230 %service_add_pre openvswitch.service -%endif %post switch -%{fillup_only -n openvswitch-switch} -%if 0%{?suse_version} > 1230 %service_add_post openvswitch.service -%endif +%{fillup_only -n openvswitch} %preun switch -%stop_on_removal openvswitch-switch -%if 0%{?suse_version} > 1230 %service_del_preun openvswitch.service -%endif %postun switch -%restart_on_update openvswitch-switch -%if 0%{?suse_version} > 1230 %service_del_postun openvswitch.service -%endif -%insserv_cleanup -%if 0%{?suse_version} > 1110 %pre ovn -%if 0%{?suse_version} > 1230 -%service_add_pre ovn-controller.service -%service_add_pre ovn-controller-vtep.service -%service_add_pre ovn-northd.service -%endif +%service_add_pre ovn-controller.service ovn-controller-vtep.service ovn-northd.service %post ovn /sbin/ldconfig -%if 0%{?suse_version} > 1230 -%service_add_post ovn-controller.service -%service_add_post ovn-controller-vtep.service -%service_add_post ovn-northd.service -%endif +%service_add_post ovn-controller.service ovn-controller-vtep.service ovn-northd.service %preun ovn -%if 0%{?suse_version} > 1230 -%service_del_preun ovn-controller.service -%service_del_preun ovn-controller-vtep.service -%service_del_preun ovn-northd.service -%endif +%service_del_preun ovn-controller.service ovn-controller-vtep.service ovn-northd.service %postun ovn -%if 0%{?suse_version} > 1230 -%service_del_postun ovn-controller.service -%service_del_postun ovn-controller-vtep.service -%service_del_postun ovn-northd.service -%endif +%service_del_postun ovn-controller.service ovn-controller-vtep.service ovn-northd.service /sbin/ldconfig -%endif %preun test %stop_on_removal openvswitch-testcontroller @@ -476,13 +312,7 @@ %restart_on_update openvswitch-testcontroller %post vtep -p /sbin/ldconfig - -%preun vtep -%stop_on_removal openvswitch-vtep - -%postun vtep -%restart_on_update openvswitch-vtep -/sbin/ldconfig +%postun vtep -p /sbin/ldconfig %files %defattr(-,root,root) @@ -535,8 +365,6 @@ %files vtep %defattr(-,root,root) %{_bindir}/vtep-ctl -%{_sysconfdir}/init.d/openvswitch-vtep -%{_sbindir}/rc%{name}-vtep %{_mandir}/man5/vtep.5.gz %{_mandir}/man8/vtep-ctl.8.gz %{_datadir}/openvswitch/scripts/ovs-vtep @@ -551,15 +379,6 @@ %defattr(-,root,root) %{py_sitedir}/ovstest/ -%if %{with ipsec} - -%files ipsec -%defattr(-,root,root) -%{_datadir}/openvswitch/ovs-monitor-ipsec -%{_sysconfdir}/init.d/openvswitch-ipsec -%{_sbindir}/rc%{name}-ipsec -%endif - %files switch %defattr(-,root,root) %{_bindir}/ovs-docker @@ -586,17 +405,11 @@ %{_mandir}/man1/ovsdb-server.1.gz %{_mandir}/man5/ovs-vswitchd.conf.db.5.gz %{_mandir}/man8/ovs-ctl.8.gz -%if 0%{?suse_version} > 1230 %{_sbindir}/rc%{name} %{_unitdir}/openvswitch.service -%{_datadir}/openvswitch/scripts/openvswitch-switch -%else -%{_sbindir}/rc%{name}-switch -%{_sysconfdir}/init.d/openvswitch-switch -%endif -%dir /var/log/openvswitch +%{_localstatedir}/adm/fillup-templates/sysconfig.openvswitch +%dir %{_localstatedir}/log/openvswitch -%if 0%{?suse_version} > 1110 %files ovn %defattr(-,root,root) %{_bindir}/ovn-controller @@ -619,12 +432,12 @@ %{_mandir}/man8/ovn-sbctl.8* %config %{_datadir}/openvswitch/ovn-nb.ovsschema %config %{_datadir}/openvswitch/ovn-sb.ovsschema -%if 0%{?suse_version} > 1230 +%{_sbindir}/rcovn-controller +%{_sbindir}/rcovn-controller-vtep +%{_sbindir}/rcovn-northd %{_unitdir}/ovn-controller.service %{_unitdir}/ovn-controller-vtep.service %{_unitdir}/ovn-northd.service -%endif -%endif %files test %defattr(-,root,root) @@ -636,25 +449,15 @@ %{_mandir}/man8/ovs-l3ping.8.gz %{_mandir}/man8/ovs-vlan-test.8.gz %{_mandir}/man8/ovs-testcontroller.8.gz -%{_sysconfdir}/init.d/openvswitch-testcontroller -%{_sbindir}/rc%{name}-testcontroller %files devel %defattr(-,root,root) %{_libdir}/libofproto.so -%{_libdir}/libofproto.la %{_libdir}/libopenvswitch.so -%{_libdir}/libopenvswitch.la -%if 0%{?suse_version} > 1110 %{_libdir}/libovn.so -%exclude %{_libdir}/libovn.la -%endif %{_libdir}/libovsdb.so -%{_libdir}/libovsdb.la %{_libdir}/libsflow.so -%{_libdir}/libsflow.la %{_libdir}/libvtep.so -%{_libdir}/libvtep.la %{_includedir}/openflow/ %{_includedir}/openvswitch/ %{_libdir}/pkgconfig/*.pc ++++++ openvswitch.service ++++++ --- /var/tmp/diff_new_pack.1N6MZr/_old 2016-05-25 21:28:29.000000000 +0200 +++ /var/tmp/diff_new_pack.1N6MZr/_new 2016-05-25 21:28:29.000000000 +0200 @@ -5,8 +5,10 @@ [Service] Type=oneshot -ExecStart=/usr/share/openvswitch/scripts/openvswitch-switch start -ExecStop=/usr/share/openvswitch/scripts/openvswitch-switch stop +EnvironmentFile=-/etc/sysconfig/openvswitch +ExecStart=/usr/share/openvswitch/scripts/ovs-ctl start \ + --system-id=random $OPTIONS +ExecStop=/usr/share/openvswitch/scripts/ovs-ctl stop RemainAfterExit=yes [Install]
