Accepting request 408658 from home:markoschandras:network
- Add missing licenses (bsc#988513) - Misc spec file cleanups highlighted by the spec-cleaner tool. - Allow aarch64 builds for openvswitch-dpdk - Add missing bug references to 2.5.0 release. old: network/openvswitch new: home:markoschandras:network/openvswitch rev None Index: openvswitch-dpdk.changes =================================================================== --- openvswitch-dpdk.changes (revision 98) +++ openvswitch-dpdk.changes (revision 46) @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Jul 12 10:41:14 UTC 2016 - mchandras@suse.de + +- Add missing licenses (bsc#988513) +- Misc spec file cleanups highlighted by the spec-cleaner tool. +- Allow aarch64 builds for openvswitch-dpdk + +------------------------------------------------------------------- Mon Jul 4 12:08:06 UTC 2016 - mchandras@suse.de - Allow the OvS daemon to run as non-root (bsc#987545) @@ -197,6 +204,8 @@ - Added: ovn-northd.service - TODO: Explicit DPDK support not yet added to spec. - Spec file work and cleanup. +- Includes fixes (or obsoletes) the following issues: + * bsc#948840, bsc#941466, bsc#936780, bnc#935750, bnc#867964 ------------------------------------------------------------------- Tue Mar 1 08:43:19 UTC 2016 - kmroz@suse.com Index: openvswitch-dpdk.spec =================================================================== --- openvswitch-dpdk.spec (revision 98) +++ openvswitch-dpdk.spec (revision 46) @@ -14,10 +14,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - # needssslcertforbuild + # Disable building the external kernel datapath by default %bcond_with kmp # DPDK build disabled by default. It's enabled in the @@ -26,14 +25,16 @@ # The testsuite is somewhat fragile for continuous testing in OBS # but keep it here as an option %bcond_with check - # Do NOT edit this auto generated file! Edit openvswitch.spec instead # and run 'pre_checkin.sh' before committing Name: openvswitch-dpdk Version: 2.5.0 Release: 0 Summary: An open source, production quality, multilayer virtual switch (DPDK) -License: Apache-2.0 +# All code is Apache-2.0 except +# - lib/sflow* which is SISSL +# - utilities/bugtool which is LGPL-2.1 +License: Apache-2.0 and LGPL-2.1 and SISSL Group: Productivity/Networking/System Url: http://openvswitch.org/ Source0: http://openvswitch.org/releases/openvswitch-%{version}.tar.gz @@ -43,35 +44,26 @@ Source89: Module.supported.updates # PATCH-FIX-UPSTREAM openvswitch-2.5.0-detect-dpdk-installation.patch Patch0: openvswitch-%{version}-detect-dpdk-installation.patch -Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch +Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch BuildRequires: autoconf BuildRequires: automake -%if %{with dpdk} -# We need to be a bit strict with the dpdk version since -# it's very possible for DPDK to change it's API between -# releases. OVS currently requires 2.2.0. We may have to -# provide multiple versions of dpdk if OVS and DPDK get -# out of sync too often. -BuildRequires: dpdk-devel = 2.2.0 -ExclusiveArch: x86_64 %ix86 -%endif BuildRequires: fdupes BuildRequires: gcc BuildRequires: glibc-devel BuildRequires: graphviz BuildRequires: libcap-ng-devel -BuildRequires: libopenssl-devel BuildRequires: libtool BuildRequires: make BuildRequires: openssl BuildRequires: perl -BuildRequires: pkg-config +BuildRequires: pkgconfig # Needed by the testsuite BuildRequires: procps BuildRequires: python-devel BuildRequires: python-xml +BuildRequires: valgrind-devel +BuildRequires: pkgconfig(openssl) Requires: logrotate -Requires: openssl Requires: python Provides: openvswitch-common = %{version} Obsoletes: openvswitch-common < %{version} @@ -79,10 +71,16 @@ Obsoletes: openvswitch-controller < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %py_requires -BuildRequires: valgrind-devel -# We can't have openvswitch and openvswitch-dpdk in parallel %if %{with dpdk} +# We need to be a bit strict with the dpdk version since +# it's very possible for DPDK to change it's API between +# releases. OVS currently requires 2.2.0. We may have to +# provide multiple versions of dpdk if OVS and DPDK get +# out of sync too often. +BuildRequires: dpdk-devel = 2.2.0 +# We can't have openvswitch and openvswitch-dpdk in parallel Conflicts: openvswitch +ExclusiveArch: aarch64 x86_64 %{ix86} %endif %description @@ -131,15 +129,15 @@ # ovs-ctl / ovs-pki use /usr/bin/uuidgen: Requires: util-linux Requires(post): %fillup_prereq +Suggests: logrotate Provides: openvswitch-any-switch = %{version} +%{?systemd_requires} %if %{with dpdk} Conflicts: openvswitch-switch %endif -Suggests: logrotate %if %{with kmp} Suggests: openvswitch-kmp %endif -%{?systemd_requires} %description switch openvswitch-switch provides the userspace components and utilities for @@ -246,7 +244,7 @@ Open vSwitch is a full-featured software-based Ethernet switch. %prep -%setup -n openvswitch-%{version} -q +%setup -q -n openvswitch-%{version} %patch0 -p1 %patch1 -p1 @@ -290,6 +288,7 @@ --disable-static \ --enable-libcapng \ --enable-shared \ + --enable-ssl \ ${dpdk_opt} \ --with-logdir=%{_localstatedir}/log/openvswitch make %{?_smp_mflags} @@ -301,7 +300,7 @@ # Recheck tests before we declare them broken. If that fails, dump # the log and exit. >2.5.0 uses the RECHECK env variable so this # needs to be taken into consideration for future releases. -if make check TESTSUITEFLAGS="%{_smp_mflags}" || +if make check TESTSUITEFLAGS="%{?_smp_mflags}" || make check TESTSUITEFLAGS='--recheck'; then :; else cat tests/testsuite.log @@ -358,7 +357,7 @@ mv %{buildroot}%{_datadir}/openvswitch/python/* %{buildroot}%{py_sitedir} rmdir %{buildroot}%{_datadir}/openvswitch/python -rm -f %buildroot/%_libdir/*.la +find %{buildroot} -type f -name "*.la" -delete -print # Remove unpackaged files for the dpdk case %if %{with dpdk} @@ -438,26 +437,26 @@ %{_libdir}/libopenvswitch.so.* %{_libdir}/libovsdb.so.* %{_libdir}/libsflow.so.* -%{_mandir}/man1/ovs-benchmark.1.gz -%{_mandir}/man1/ovsdb-client.1.gz -%{_mandir}/man8/ovs-appctl.8.gz -%{_mandir}/man8/ovs-bugtool.8.gz -%{_mandir}/man8/ovs-ofctl.8.gz -%{_mandir}/man8/ovs-vlan-bug-workaround.8.gz -%{_mandir}/man8/ovs-parse-backtrace.8.gz -%{_mandir}/man8/ovs-dpctl-top.8.gz +%{_mandir}/man1/ovs-benchmark.1%{ext_man} +%{_mandir}/man1/ovsdb-client.1%{ext_man} +%{_mandir}/man8/ovs-appctl.8%{ext_man} +%{_mandir}/man8/ovs-bugtool.8%{ext_man} +%{_mandir}/man8/ovs-ofctl.8%{ext_man} +%{_mandir}/man8/ovs-vlan-bug-workaround.8%{ext_man} +%{_mandir}/man8/ovs-parse-backtrace.8%{ext_man} +%{_mandir}/man8/ovs-dpctl-top.8%{ext_man} %{_sysconfdir}/bash_completion.d/ovs-appctl-bashcomp.bash %files pki %defattr(-,root,root) -%{_mandir}/man8/ovs-pki.8.gz +%{_mandir}/man8/ovs-pki.8%{ext_man} %{_bindir}/ovs-pki %files vtep %defattr(-,root,root) %{_bindir}/vtep-ctl -%{_mandir}/man5/vtep.5.gz -%{_mandir}/man8/vtep-ctl.8.gz +%{_mandir}/man5/vtep.5%{ext_man} +%{_mandir}/man8/vtep-ctl.8%{ext_man} %{_datadir}/openvswitch/scripts/ovs-vtep %{_datadir}/openvswitch/vtep.ovsschema %{_libdir}/libvtep.so.* @@ -489,15 +488,15 @@ %{_datadir}/openvswitch/vswitch.ovsschema %{_sysconfdir}/bash_completion.d/ovs-vsctl-bashcomp.bash %config(noreplace) %{_sysconfdir}/logrotate.d/openvswitch-switch -%{_mandir}/man8/ovs-dpctl.8.gz -%{_mandir}/man1/ovs-tcpundump.1.gz -%{_mandir}/man1/ovs-pcap.1.gz -%{_mandir}/man8/ovs-vsctl.8.gz -%{_mandir}/man1/ovsdb-tool.1.gz -%{_mandir}/man8/ovs-vswitchd.8.gz -%{_mandir}/man1/ovsdb-server.1.gz -%{_mandir}/man5/ovs-vswitchd.conf.db.5.gz -%{_mandir}/man8/ovs-ctl.8.gz +%{_mandir}/man8/ovs-dpctl.8%{ext_man} +%{_mandir}/man1/ovs-tcpundump.1%{ext_man} +%{_mandir}/man1/ovs-pcap.1%{ext_man} +%{_mandir}/man8/ovs-vsctl.8%{ext_man} +%{_mandir}/man1/ovsdb-tool.1%{ext_man} +%{_mandir}/man8/ovs-vswitchd.8%{ext_man} +%{_mandir}/man1/ovsdb-server.1%{ext_man} +%{_mandir}/man5/ovs-vswitchd.conf.db.5%{ext_man} +%{_mandir}/man8/ovs-ctl.8%{ext_man} %{_sbindir}/rcopenvswitch %{_unitdir}/openvswitch.service %{_localstatedir}/adm/fillup-templates/sysconfig.openvswitch @@ -538,10 +537,10 @@ %{_bindir}/ovs-l3ping %{_bindir}/ovs-vlan-test %{_bindir}/ovs-testcontroller -%{_mandir}/man8/ovs-test.8.gz -%{_mandir}/man8/ovs-l3ping.8.gz -%{_mandir}/man8/ovs-vlan-test.8.gz -%{_mandir}/man8/ovs-testcontroller.8.gz +%{_mandir}/man8/ovs-test.8%{ext_man} +%{_mandir}/man8/ovs-l3ping.8%{ext_man} +%{_mandir}/man8/ovs-vlan-test.8%{ext_man} +%{_mandir}/man8/ovs-testcontroller.8%{ext_man} %files devel %defattr(-,root,root) Index: openvswitch.changes =================================================================== --- openvswitch.changes (revision 98) +++ openvswitch.changes (revision 46) @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Jul 12 10:41:14 UTC 2016 - mchandras@suse.de + +- Add missing licenses (bsc#988513) +- Misc spec file cleanups highlighted by the spec-cleaner tool. +- Allow aarch64 builds for openvswitch-dpdk + +------------------------------------------------------------------- Mon Jul 4 12:08:06 UTC 2016 - mchandras@suse.de - Allow the OvS daemon to run as non-root (bsc#987545) @@ -197,6 +204,8 @@ - Added: ovn-northd.service - TODO: Explicit DPDK support not yet added to spec. - Spec file work and cleanup. +- Includes fixes (or obsoletes) the following issues: + * bsc#948840, bsc#941466, bsc#936780, bnc#935750, bnc#867964 ------------------------------------------------------------------- Tue Mar 1 08:43:19 UTC 2016 - kmroz@suse.com Index: openvswitch.spec =================================================================== --- openvswitch.spec (revision 98) +++ openvswitch.spec (revision 46) @@ -14,10 +14,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - # needssslcertforbuild + # Disable building the external kernel datapath by default %bcond_with kmp # DPDK build disabled by default. It's enabled in the @@ -26,12 +25,14 @@ # The testsuite is somewhat fragile for continuous testing in OBS # but keep it here as an option %bcond_with check - Name: openvswitch Version: 2.5.0 Release: 0 Summary: An open source, production quality, multilayer virtual switch -License: Apache-2.0 +# All code is Apache-2.0 except +# - lib/sflow* which is SISSL +# - utilities/bugtool which is LGPL-2.1 +License: Apache-2.0 and LGPL-2.1 and SISSL Group: Productivity/Networking/System Url: http://openvswitch.org/ Source0: http://openvswitch.org/releases/openvswitch-%{version}.tar.gz @@ -41,35 +42,26 @@ Source89: Module.supported.updates # PATCH-FIX-UPSTREAM openvswitch-2.5.0-detect-dpdk-installation.patch Patch0: openvswitch-%{version}-detect-dpdk-installation.patch -Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch +Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch BuildRequires: autoconf BuildRequires: automake -%if %{with dpdk} -# We need to be a bit strict with the dpdk version since -# it's very possible for DPDK to change it's API between -# releases. OVS currently requires 2.2.0. We may have to -# provide multiple versions of dpdk if OVS and DPDK get -# out of sync too often. -BuildRequires: dpdk-devel = 2.2.0 -ExclusiveArch: x86_64 %ix86 -%endif BuildRequires: fdupes BuildRequires: gcc BuildRequires: glibc-devel BuildRequires: graphviz BuildRequires: libcap-ng-devel -BuildRequires: libopenssl-devel BuildRequires: libtool BuildRequires: make BuildRequires: openssl BuildRequires: perl -BuildRequires: pkg-config +BuildRequires: pkgconfig # Needed by the testsuite BuildRequires: procps BuildRequires: python-devel BuildRequires: python-xml +BuildRequires: valgrind-devel +BuildRequires: pkgconfig(openssl) Requires: logrotate -Requires: openssl Requires: python Provides: openvswitch-common = %{version} Obsoletes: openvswitch-common < %{version} @@ -77,10 +69,16 @@ Obsoletes: openvswitch-controller < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %py_requires -BuildRequires: valgrind-devel -# We can't have openvswitch and openvswitch-dpdk in parallel %if %{with dpdk} +# We need to be a bit strict with the dpdk version since +# it's very possible for DPDK to change it's API between +# releases. OVS currently requires 2.2.0. We may have to +# provide multiple versions of dpdk if OVS and DPDK get +# out of sync too often. +BuildRequires: dpdk-devel = 2.2.0 +# We can't have openvswitch and openvswitch-dpdk in parallel Conflicts: openvswitch +ExclusiveArch: aarch64 x86_64 %{ix86} %endif %description @@ -129,15 +127,15 @@ # ovs-ctl / ovs-pki use /usr/bin/uuidgen: Requires: util-linux Requires(post): %fillup_prereq +Suggests: logrotate Provides: openvswitch-any-switch = %{version} +%{?systemd_requires} %if %{with dpdk} Conflicts: openvswitch-switch %endif -Suggests: logrotate %if %{with kmp} Suggests: openvswitch-kmp %endif -%{?systemd_requires} %description switch openvswitch-switch provides the userspace components and utilities for @@ -244,7 +242,7 @@ Open vSwitch is a full-featured software-based Ethernet switch. %prep -%setup -n openvswitch-%{version} -q +%setup -q -n openvswitch-%{version} %patch0 -p1 %patch1 -p1 @@ -288,6 +286,7 @@ --disable-static \ --enable-libcapng \ --enable-shared \ + --enable-ssl \ ${dpdk_opt} \ --with-logdir=%{_localstatedir}/log/openvswitch make %{?_smp_mflags} @@ -299,7 +298,7 @@ # Recheck tests before we declare them broken. If that fails, dump # the log and exit. >2.5.0 uses the RECHECK env variable so this # needs to be taken into consideration for future releases. -if make check TESTSUITEFLAGS="%{_smp_mflags}" || +if make check TESTSUITEFLAGS="%{?_smp_mflags}" || make check TESTSUITEFLAGS='--recheck'; then :; else cat tests/testsuite.log @@ -356,7 +355,7 @@ mv %{buildroot}%{_datadir}/openvswitch/python/* %{buildroot}%{py_sitedir} rmdir %{buildroot}%{_datadir}/openvswitch/python -rm -f %buildroot/%_libdir/*.la +find %{buildroot} -type f -name "*.la" -delete -print # Remove unpackaged files for the dpdk case %if %{with dpdk} @@ -436,26 +435,26 @@ %{_libdir}/libopenvswitch.so.* %{_libdir}/libovsdb.so.* %{_libdir}/libsflow.so.* -%{_mandir}/man1/ovs-benchmark.1.gz -%{_mandir}/man1/ovsdb-client.1.gz -%{_mandir}/man8/ovs-appctl.8.gz -%{_mandir}/man8/ovs-bugtool.8.gz -%{_mandir}/man8/ovs-ofctl.8.gz -%{_mandir}/man8/ovs-vlan-bug-workaround.8.gz -%{_mandir}/man8/ovs-parse-backtrace.8.gz -%{_mandir}/man8/ovs-dpctl-top.8.gz +%{_mandir}/man1/ovs-benchmark.1%{ext_man} +%{_mandir}/man1/ovsdb-client.1%{ext_man} +%{_mandir}/man8/ovs-appctl.8%{ext_man} +%{_mandir}/man8/ovs-bugtool.8%{ext_man} +%{_mandir}/man8/ovs-ofctl.8%{ext_man} +%{_mandir}/man8/ovs-vlan-bug-workaround.8%{ext_man} +%{_mandir}/man8/ovs-parse-backtrace.8%{ext_man} +%{_mandir}/man8/ovs-dpctl-top.8%{ext_man} %{_sysconfdir}/bash_completion.d/ovs-appctl-bashcomp.bash %files pki %defattr(-,root,root) -%{_mandir}/man8/ovs-pki.8.gz +%{_mandir}/man8/ovs-pki.8%{ext_man} %{_bindir}/ovs-pki %files vtep %defattr(-,root,root) %{_bindir}/vtep-ctl -%{_mandir}/man5/vtep.5.gz -%{_mandir}/man8/vtep-ctl.8.gz +%{_mandir}/man5/vtep.5%{ext_man} +%{_mandir}/man8/vtep-ctl.8%{ext_man} %{_datadir}/openvswitch/scripts/ovs-vtep %{_datadir}/openvswitch/vtep.ovsschema %{_libdir}/libvtep.so.* @@ -487,15 +486,15 @@ %{_datadir}/openvswitch/vswitch.ovsschema %{_sysconfdir}/bash_completion.d/ovs-vsctl-bashcomp.bash %config(noreplace) %{_sysconfdir}/logrotate.d/openvswitch-switch -%{_mandir}/man8/ovs-dpctl.8.gz -%{_mandir}/man1/ovs-tcpundump.1.gz -%{_mandir}/man1/ovs-pcap.1.gz -%{_mandir}/man8/ovs-vsctl.8.gz -%{_mandir}/man1/ovsdb-tool.1.gz -%{_mandir}/man8/ovs-vswitchd.8.gz -%{_mandir}/man1/ovsdb-server.1.gz -%{_mandir}/man5/ovs-vswitchd.conf.db.5.gz -%{_mandir}/man8/ovs-ctl.8.gz +%{_mandir}/man8/ovs-dpctl.8%{ext_man} +%{_mandir}/man1/ovs-tcpundump.1%{ext_man} +%{_mandir}/man1/ovs-pcap.1%{ext_man} +%{_mandir}/man8/ovs-vsctl.8%{ext_man} +%{_mandir}/man1/ovsdb-tool.1%{ext_man} +%{_mandir}/man8/ovs-vswitchd.8%{ext_man} +%{_mandir}/man1/ovsdb-server.1%{ext_man} +%{_mandir}/man5/ovs-vswitchd.conf.db.5%{ext_man} +%{_mandir}/man8/ovs-ctl.8%{ext_man} %{_sbindir}/rcopenvswitch %{_unitdir}/openvswitch.service %{_localstatedir}/adm/fillup-templates/sysconfig.openvswitch @@ -536,10 +535,10 @@ %{_bindir}/ovs-l3ping %{_bindir}/ovs-vlan-test %{_bindir}/ovs-testcontroller -%{_mandir}/man8/ovs-test.8.gz -%{_mandir}/man8/ovs-l3ping.8.gz -%{_mandir}/man8/ovs-vlan-test.8.gz -%{_mandir}/man8/ovs-testcontroller.8.gz +%{_mandir}/man8/ovs-test.8%{ext_man} +%{_mandir}/man8/ovs-l3ping.8%{ext_man} +%{_mandir}/man8/ovs-vlan-test.8%{ext_man} +%{_mandir}/man8/ovs-testcontroller.8%{ext_man} %files devel %defattr(-,root,root) OBS-URL: https://build.opensuse.org/request/show/408658 OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=99
This commit is contained in:
Git OBS Bridge
parent
358bfa9806
commit
2aa52784e3
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 12 10:41:14 UTC 2016 - mchandras@suse.de
|
||||
|
||||
- Add missing licenses (bsc#988513)
|
||||
- Misc spec file cleanups highlighted by the spec-cleaner tool.
|
||||
- Allow aarch64 builds for openvswitch-dpdk
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 4 12:08:06 UTC 2016 - mchandras@suse.de
|
||||
|
||||
@ -197,6 +204,8 @@ Thu Mar 3 13:47:04 UTC 2016 - kmroz@suse.com
|
||||
- Added: ovn-northd.service
|
||||
- TODO: Explicit DPDK support not yet added to spec.
|
||||
- Spec file work and cleanup.
|
||||
- Includes fixes (or obsoletes) the following issues:
|
||||
* bsc#948840, bsc#941466, bsc#936780, bnc#935750, bnc#867964
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 1 08:43:19 UTC 2016 - kmroz@suse.com
|
||||
|
||||
@ -14,10 +14,9 @@
|
||||
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
# needssslcertforbuild
|
||||
|
||||
|
||||
# Disable building the external kernel datapath by default
|
||||
%bcond_with kmp
|
||||
# DPDK build disabled by default. It's enabled in the
|
||||
@ -26,14 +25,16 @@
|
||||
# The testsuite is somewhat fragile for continuous testing in OBS
|
||||
# but keep it here as an option
|
||||
%bcond_with check
|
||||
|
||||
# Do NOT edit this auto generated file! Edit openvswitch.spec instead
|
||||
# and run 'pre_checkin.sh' before committing
|
||||
Name: openvswitch-dpdk
|
||||
Version: 2.5.0
|
||||
Release: 0
|
||||
Summary: An open source, production quality, multilayer virtual switch (DPDK)
|
||||
License: Apache-2.0
|
||||
# All code is Apache-2.0 except
|
||||
# - lib/sflow* which is SISSL
|
||||
# - utilities/bugtool which is LGPL-2.1
|
||||
License: Apache-2.0 and LGPL-2.1 and SISSL
|
||||
Group: Productivity/Networking/System
|
||||
Url: http://openvswitch.org/
|
||||
Source0: http://openvswitch.org/releases/openvswitch-%{version}.tar.gz
|
||||
@ -43,35 +44,26 @@ Source3: openvswitch.service
|
||||
Source89: Module.supported.updates
|
||||
# PATCH-FIX-UPSTREAM openvswitch-2.5.0-detect-dpdk-installation.patch
|
||||
Patch0: openvswitch-%{version}-detect-dpdk-installation.patch
|
||||
Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
|
||||
Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
%if %{with dpdk}
|
||||
# We need to be a bit strict with the dpdk version since
|
||||
# it's very possible for DPDK to change it's API between
|
||||
# releases. OVS currently requires 2.2.0. We may have to
|
||||
# provide multiple versions of dpdk if OVS and DPDK get
|
||||
# out of sync too often.
|
||||
BuildRequires: dpdk-devel = 2.2.0
|
||||
ExclusiveArch: x86_64 %ix86
|
||||
%endif
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: gcc
|
||||
BuildRequires: glibc-devel
|
||||
BuildRequires: graphviz
|
||||
BuildRequires: libcap-ng-devel
|
||||
BuildRequires: libopenssl-devel
|
||||
BuildRequires: libtool
|
||||
BuildRequires: make
|
||||
BuildRequires: openssl
|
||||
BuildRequires: perl
|
||||
BuildRequires: pkg-config
|
||||
BuildRequires: pkgconfig
|
||||
# Needed by the testsuite
|
||||
BuildRequires: procps
|
||||
BuildRequires: python-devel
|
||||
BuildRequires: python-xml
|
||||
BuildRequires: valgrind-devel
|
||||
BuildRequires: pkgconfig(openssl)
|
||||
Requires: logrotate
|
||||
Requires: openssl
|
||||
Requires: python
|
||||
Provides: openvswitch-common = %{version}
|
||||
Obsoletes: openvswitch-common < %{version}
|
||||
@ -79,10 +71,16 @@ Provides: openvswitch-controller = %{version}
|
||||
Obsoletes: openvswitch-controller < %{version}
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%py_requires
|
||||
BuildRequires: valgrind-devel
|
||||
# We can't have openvswitch and openvswitch-dpdk in parallel
|
||||
%if %{with dpdk}
|
||||
# We need to be a bit strict with the dpdk version since
|
||||
# it's very possible for DPDK to change it's API between
|
||||
# releases. OVS currently requires 2.2.0. We may have to
|
||||
# provide multiple versions of dpdk if OVS and DPDK get
|
||||
# out of sync too often.
|
||||
BuildRequires: dpdk-devel = 2.2.0
|
||||
# We can't have openvswitch and openvswitch-dpdk in parallel
|
||||
Conflicts: openvswitch
|
||||
ExclusiveArch: aarch64 x86_64 %{ix86}
|
||||
%endif
|
||||
|
||||
%description
|
||||
@ -131,15 +129,15 @@ Requires: python
|
||||
# ovs-ctl / ovs-pki use /usr/bin/uuidgen:
|
||||
Requires: util-linux
|
||||
Requires(post): %fillup_prereq
|
||||
Suggests: logrotate
|
||||
Provides: openvswitch-any-switch = %{version}
|
||||
%{?systemd_requires}
|
||||
%if %{with dpdk}
|
||||
Conflicts: openvswitch-switch
|
||||
%endif
|
||||
Suggests: logrotate
|
||||
%if %{with kmp}
|
||||
Suggests: openvswitch-kmp
|
||||
%endif
|
||||
%{?systemd_requires}
|
||||
|
||||
%description switch
|
||||
openvswitch-switch provides the userspace components and utilities for
|
||||
@ -246,7 +244,7 @@ performance and connectivity issues in Open vSwitch setup.
|
||||
Open vSwitch is a full-featured software-based Ethernet switch.
|
||||
|
||||
%prep
|
||||
%setup -n openvswitch-%{version} -q
|
||||
%setup -q -n openvswitch-%{version}
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
@ -290,6 +288,7 @@ dpdk_opt="--with-dpdk"
|
||||
--disable-static \
|
||||
--enable-libcapng \
|
||||
--enable-shared \
|
||||
--enable-ssl \
|
||||
${dpdk_opt} \
|
||||
--with-logdir=%{_localstatedir}/log/openvswitch
|
||||
make %{?_smp_mflags}
|
||||
@ -301,7 +300,7 @@ pushd source
|
||||
# Recheck tests before we declare them broken. If that fails, dump
|
||||
# the log and exit. >2.5.0 uses the RECHECK env variable so this
|
||||
# needs to be taken into consideration for future releases.
|
||||
if make check TESTSUITEFLAGS="%{_smp_mflags}" ||
|
||||
if make check TESTSUITEFLAGS="%{?_smp_mflags}" ||
|
||||
make check TESTSUITEFLAGS='--recheck'; then :;
|
||||
else
|
||||
cat tests/testsuite.log
|
||||
@ -358,7 +357,7 @@ mkdir -p %{buildroot}%{py_sitedir}
|
||||
mv %{buildroot}%{_datadir}/openvswitch/python/* %{buildroot}%{py_sitedir}
|
||||
rmdir %{buildroot}%{_datadir}/openvswitch/python
|
||||
|
||||
rm -f %buildroot/%_libdir/*.la
|
||||
find %{buildroot} -type f -name "*.la" -delete -print
|
||||
|
||||
# Remove unpackaged files for the dpdk case
|
||||
%if %{with dpdk}
|
||||
@ -438,26 +437,26 @@ rm -rf %{buildroot}%{py_sitedir}
|
||||
%{_libdir}/libopenvswitch.so.*
|
||||
%{_libdir}/libovsdb.so.*
|
||||
%{_libdir}/libsflow.so.*
|
||||
%{_mandir}/man1/ovs-benchmark.1.gz
|
||||
%{_mandir}/man1/ovsdb-client.1.gz
|
||||
%{_mandir}/man8/ovs-appctl.8.gz
|
||||
%{_mandir}/man8/ovs-bugtool.8.gz
|
||||
%{_mandir}/man8/ovs-ofctl.8.gz
|
||||
%{_mandir}/man8/ovs-vlan-bug-workaround.8.gz
|
||||
%{_mandir}/man8/ovs-parse-backtrace.8.gz
|
||||
%{_mandir}/man8/ovs-dpctl-top.8.gz
|
||||
%{_mandir}/man1/ovs-benchmark.1%{ext_man}
|
||||
%{_mandir}/man1/ovsdb-client.1%{ext_man}
|
||||
%{_mandir}/man8/ovs-appctl.8%{ext_man}
|
||||
%{_mandir}/man8/ovs-bugtool.8%{ext_man}
|
||||
%{_mandir}/man8/ovs-ofctl.8%{ext_man}
|
||||
%{_mandir}/man8/ovs-vlan-bug-workaround.8%{ext_man}
|
||||
%{_mandir}/man8/ovs-parse-backtrace.8%{ext_man}
|
||||
%{_mandir}/man8/ovs-dpctl-top.8%{ext_man}
|
||||
%{_sysconfdir}/bash_completion.d/ovs-appctl-bashcomp.bash
|
||||
|
||||
%files pki
|
||||
%defattr(-,root,root)
|
||||
%{_mandir}/man8/ovs-pki.8.gz
|
||||
%{_mandir}/man8/ovs-pki.8%{ext_man}
|
||||
%{_bindir}/ovs-pki
|
||||
|
||||
%files vtep
|
||||
%defattr(-,root,root)
|
||||
%{_bindir}/vtep-ctl
|
||||
%{_mandir}/man5/vtep.5.gz
|
||||
%{_mandir}/man8/vtep-ctl.8.gz
|
||||
%{_mandir}/man5/vtep.5%{ext_man}
|
||||
%{_mandir}/man8/vtep-ctl.8%{ext_man}
|
||||
%{_datadir}/openvswitch/scripts/ovs-vtep
|
||||
%{_datadir}/openvswitch/vtep.ovsschema
|
||||
%{_libdir}/libvtep.so.*
|
||||
@ -489,15 +488,15 @@ rm -rf %{buildroot}%{py_sitedir}
|
||||
%{_datadir}/openvswitch/vswitch.ovsschema
|
||||
%{_sysconfdir}/bash_completion.d/ovs-vsctl-bashcomp.bash
|
||||
%config(noreplace) %{_sysconfdir}/logrotate.d/openvswitch-switch
|
||||
%{_mandir}/man8/ovs-dpctl.8.gz
|
||||
%{_mandir}/man1/ovs-tcpundump.1.gz
|
||||
%{_mandir}/man1/ovs-pcap.1.gz
|
||||
%{_mandir}/man8/ovs-vsctl.8.gz
|
||||
%{_mandir}/man1/ovsdb-tool.1.gz
|
||||
%{_mandir}/man8/ovs-vswitchd.8.gz
|
||||
%{_mandir}/man1/ovsdb-server.1.gz
|
||||
%{_mandir}/man5/ovs-vswitchd.conf.db.5.gz
|
||||
%{_mandir}/man8/ovs-ctl.8.gz
|
||||
%{_mandir}/man8/ovs-dpctl.8%{ext_man}
|
||||
%{_mandir}/man1/ovs-tcpundump.1%{ext_man}
|
||||
%{_mandir}/man1/ovs-pcap.1%{ext_man}
|
||||
%{_mandir}/man8/ovs-vsctl.8%{ext_man}
|
||||
%{_mandir}/man1/ovsdb-tool.1%{ext_man}
|
||||
%{_mandir}/man8/ovs-vswitchd.8%{ext_man}
|
||||
%{_mandir}/man1/ovsdb-server.1%{ext_man}
|
||||
%{_mandir}/man5/ovs-vswitchd.conf.db.5%{ext_man}
|
||||
%{_mandir}/man8/ovs-ctl.8%{ext_man}
|
||||
%{_sbindir}/rcopenvswitch
|
||||
%{_unitdir}/openvswitch.service
|
||||
%{_localstatedir}/adm/fillup-templates/sysconfig.openvswitch
|
||||
@ -538,10 +537,10 @@ rm -rf %{buildroot}%{py_sitedir}
|
||||
%{_bindir}/ovs-l3ping
|
||||
%{_bindir}/ovs-vlan-test
|
||||
%{_bindir}/ovs-testcontroller
|
||||
%{_mandir}/man8/ovs-test.8.gz
|
||||
%{_mandir}/man8/ovs-l3ping.8.gz
|
||||
%{_mandir}/man8/ovs-vlan-test.8.gz
|
||||
%{_mandir}/man8/ovs-testcontroller.8.gz
|
||||
%{_mandir}/man8/ovs-test.8%{ext_man}
|
||||
%{_mandir}/man8/ovs-l3ping.8%{ext_man}
|
||||
%{_mandir}/man8/ovs-vlan-test.8%{ext_man}
|
||||
%{_mandir}/man8/ovs-testcontroller.8%{ext_man}
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root)
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 12 10:41:14 UTC 2016 - mchandras@suse.de
|
||||
|
||||
- Add missing licenses (bsc#988513)
|
||||
- Misc spec file cleanups highlighted by the spec-cleaner tool.
|
||||
- Allow aarch64 builds for openvswitch-dpdk
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 4 12:08:06 UTC 2016 - mchandras@suse.de
|
||||
|
||||
@ -197,6 +204,8 @@ Thu Mar 3 13:47:04 UTC 2016 - kmroz@suse.com
|
||||
- Added: ovn-northd.service
|
||||
- TODO: Explicit DPDK support not yet added to spec.
|
||||
- Spec file work and cleanup.
|
||||
- Includes fixes (or obsoletes) the following issues:
|
||||
* bsc#948840, bsc#941466, bsc#936780, bnc#935750, bnc#867964
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 1 08:43:19 UTC 2016 - kmroz@suse.com
|
||||
|
||||
@ -14,10 +14,9 @@
|
||||
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
# needssslcertforbuild
|
||||
|
||||
|
||||
# Disable building the external kernel datapath by default
|
||||
%bcond_with kmp
|
||||
# DPDK build disabled by default. It's enabled in the
|
||||
@ -26,12 +25,14 @@
|
||||
# The testsuite is somewhat fragile for continuous testing in OBS
|
||||
# but keep it here as an option
|
||||
%bcond_with check
|
||||
|
||||
Name: openvswitch
|
||||
Version: 2.5.0
|
||||
Release: 0
|
||||
Summary: An open source, production quality, multilayer virtual switch
|
||||
License: Apache-2.0
|
||||
# All code is Apache-2.0 except
|
||||
# - lib/sflow* which is SISSL
|
||||
# - utilities/bugtool which is LGPL-2.1
|
||||
License: Apache-2.0 and LGPL-2.1 and SISSL
|
||||
Group: Productivity/Networking/System
|
||||
Url: http://openvswitch.org/
|
||||
Source0: http://openvswitch.org/releases/openvswitch-%{version}.tar.gz
|
||||
@ -41,35 +42,26 @@ Source3: openvswitch.service
|
||||
Source89: Module.supported.updates
|
||||
# PATCH-FIX-UPSTREAM openvswitch-2.5.0-detect-dpdk-installation.patch
|
||||
Patch0: openvswitch-%{version}-detect-dpdk-installation.patch
|
||||
Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
|
||||
Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
%if %{with dpdk}
|
||||
# We need to be a bit strict with the dpdk version since
|
||||
# it's very possible for DPDK to change it's API between
|
||||
# releases. OVS currently requires 2.2.0. We may have to
|
||||
# provide multiple versions of dpdk if OVS and DPDK get
|
||||
# out of sync too often.
|
||||
BuildRequires: dpdk-devel = 2.2.0
|
||||
ExclusiveArch: x86_64 %ix86
|
||||
%endif
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: gcc
|
||||
BuildRequires: glibc-devel
|
||||
BuildRequires: graphviz
|
||||
BuildRequires: libcap-ng-devel
|
||||
BuildRequires: libopenssl-devel
|
||||
BuildRequires: libtool
|
||||
BuildRequires: make
|
||||
BuildRequires: openssl
|
||||
BuildRequires: perl
|
||||
BuildRequires: pkg-config
|
||||
BuildRequires: pkgconfig
|
||||
# Needed by the testsuite
|
||||
BuildRequires: procps
|
||||
BuildRequires: python-devel
|
||||
BuildRequires: python-xml
|
||||
BuildRequires: valgrind-devel
|
||||
BuildRequires: pkgconfig(openssl)
|
||||
Requires: logrotate
|
||||
Requires: openssl
|
||||
Requires: python
|
||||
Provides: openvswitch-common = %{version}
|
||||
Obsoletes: openvswitch-common < %{version}
|
||||
@ -77,10 +69,16 @@ Provides: openvswitch-controller = %{version}
|
||||
Obsoletes: openvswitch-controller < %{version}
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%py_requires
|
||||
BuildRequires: valgrind-devel
|
||||
# We can't have openvswitch and openvswitch-dpdk in parallel
|
||||
%if %{with dpdk}
|
||||
# We need to be a bit strict with the dpdk version since
|
||||
# it's very possible for DPDK to change it's API between
|
||||
# releases. OVS currently requires 2.2.0. We may have to
|
||||
# provide multiple versions of dpdk if OVS and DPDK get
|
||||
# out of sync too often.
|
||||
BuildRequires: dpdk-devel = 2.2.0
|
||||
# We can't have openvswitch and openvswitch-dpdk in parallel
|
||||
Conflicts: openvswitch
|
||||
ExclusiveArch: aarch64 x86_64 %{ix86}
|
||||
%endif
|
||||
|
||||
%description
|
||||
@ -129,15 +127,15 @@ Requires: python
|
||||
# ovs-ctl / ovs-pki use /usr/bin/uuidgen:
|
||||
Requires: util-linux
|
||||
Requires(post): %fillup_prereq
|
||||
Suggests: logrotate
|
||||
Provides: openvswitch-any-switch = %{version}
|
||||
%{?systemd_requires}
|
||||
%if %{with dpdk}
|
||||
Conflicts: openvswitch-switch
|
||||
%endif
|
||||
Suggests: logrotate
|
||||
%if %{with kmp}
|
||||
Suggests: openvswitch-kmp
|
||||
%endif
|
||||
%{?systemd_requires}
|
||||
|
||||
%description switch
|
||||
openvswitch-switch provides the userspace components and utilities for
|
||||
@ -244,7 +242,7 @@ performance and connectivity issues in Open vSwitch setup.
|
||||
Open vSwitch is a full-featured software-based Ethernet switch.
|
||||
|
||||
%prep
|
||||
%setup -n openvswitch-%{version} -q
|
||||
%setup -q -n openvswitch-%{version}
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
@ -288,6 +286,7 @@ dpdk_opt="--with-dpdk"
|
||||
--disable-static \
|
||||
--enable-libcapng \
|
||||
--enable-shared \
|
||||
--enable-ssl \
|
||||
${dpdk_opt} \
|
||||
--with-logdir=%{_localstatedir}/log/openvswitch
|
||||
make %{?_smp_mflags}
|
||||
@ -299,7 +298,7 @@ pushd source
|
||||
# Recheck tests before we declare them broken. If that fails, dump
|
||||
# the log and exit. >2.5.0 uses the RECHECK env variable so this
|
||||
# needs to be taken into consideration for future releases.
|
||||
if make check TESTSUITEFLAGS="%{_smp_mflags}" ||
|
||||
if make check TESTSUITEFLAGS="%{?_smp_mflags}" ||
|
||||
make check TESTSUITEFLAGS='--recheck'; then :;
|
||||
else
|
||||
cat tests/testsuite.log
|
||||
@ -356,7 +355,7 @@ mkdir -p %{buildroot}%{py_sitedir}
|
||||
mv %{buildroot}%{_datadir}/openvswitch/python/* %{buildroot}%{py_sitedir}
|
||||
rmdir %{buildroot}%{_datadir}/openvswitch/python
|
||||
|
||||
rm -f %buildroot/%_libdir/*.la
|
||||
find %{buildroot} -type f -name "*.la" -delete -print
|
||||
|
||||
# Remove unpackaged files for the dpdk case
|
||||
%if %{with dpdk}
|
||||
@ -436,26 +435,26 @@ rm -rf %{buildroot}%{py_sitedir}
|
||||
%{_libdir}/libopenvswitch.so.*
|
||||
%{_libdir}/libovsdb.so.*
|
||||
%{_libdir}/libsflow.so.*
|
||||
%{_mandir}/man1/ovs-benchmark.1.gz
|
||||
%{_mandir}/man1/ovsdb-client.1.gz
|
||||
%{_mandir}/man8/ovs-appctl.8.gz
|
||||
%{_mandir}/man8/ovs-bugtool.8.gz
|
||||
%{_mandir}/man8/ovs-ofctl.8.gz
|
||||
%{_mandir}/man8/ovs-vlan-bug-workaround.8.gz
|
||||
%{_mandir}/man8/ovs-parse-backtrace.8.gz
|
||||
%{_mandir}/man8/ovs-dpctl-top.8.gz
|
||||
%{_mandir}/man1/ovs-benchmark.1%{ext_man}
|
||||
%{_mandir}/man1/ovsdb-client.1%{ext_man}
|
||||
%{_mandir}/man8/ovs-appctl.8%{ext_man}
|
||||
%{_mandir}/man8/ovs-bugtool.8%{ext_man}
|
||||
%{_mandir}/man8/ovs-ofctl.8%{ext_man}
|
||||
%{_mandir}/man8/ovs-vlan-bug-workaround.8%{ext_man}
|
||||
%{_mandir}/man8/ovs-parse-backtrace.8%{ext_man}
|
||||
%{_mandir}/man8/ovs-dpctl-top.8%{ext_man}
|
||||
%{_sysconfdir}/bash_completion.d/ovs-appctl-bashcomp.bash
|
||||
|
||||
%files pki
|
||||
%defattr(-,root,root)
|
||||
%{_mandir}/man8/ovs-pki.8.gz
|
||||
%{_mandir}/man8/ovs-pki.8%{ext_man}
|
||||
%{_bindir}/ovs-pki
|
||||
|
||||
%files vtep
|
||||
%defattr(-,root,root)
|
||||
%{_bindir}/vtep-ctl
|
||||
%{_mandir}/man5/vtep.5.gz
|
||||
%{_mandir}/man8/vtep-ctl.8.gz
|
||||
%{_mandir}/man5/vtep.5%{ext_man}
|
||||
%{_mandir}/man8/vtep-ctl.8%{ext_man}
|
||||
%{_datadir}/openvswitch/scripts/ovs-vtep
|
||||
%{_datadir}/openvswitch/vtep.ovsschema
|
||||
%{_libdir}/libvtep.so.*
|
||||
@ -487,15 +486,15 @@ rm -rf %{buildroot}%{py_sitedir}
|
||||
%{_datadir}/openvswitch/vswitch.ovsschema
|
||||
%{_sysconfdir}/bash_completion.d/ovs-vsctl-bashcomp.bash
|
||||
%config(noreplace) %{_sysconfdir}/logrotate.d/openvswitch-switch
|
||||
%{_mandir}/man8/ovs-dpctl.8.gz
|
||||
%{_mandir}/man1/ovs-tcpundump.1.gz
|
||||
%{_mandir}/man1/ovs-pcap.1.gz
|
||||
%{_mandir}/man8/ovs-vsctl.8.gz
|
||||
%{_mandir}/man1/ovsdb-tool.1.gz
|
||||
%{_mandir}/man8/ovs-vswitchd.8.gz
|
||||
%{_mandir}/man1/ovsdb-server.1.gz
|
||||
%{_mandir}/man5/ovs-vswitchd.conf.db.5.gz
|
||||
%{_mandir}/man8/ovs-ctl.8.gz
|
||||
%{_mandir}/man8/ovs-dpctl.8%{ext_man}
|
||||
%{_mandir}/man1/ovs-tcpundump.1%{ext_man}
|
||||
%{_mandir}/man1/ovs-pcap.1%{ext_man}
|
||||
%{_mandir}/man8/ovs-vsctl.8%{ext_man}
|
||||
%{_mandir}/man1/ovsdb-tool.1%{ext_man}
|
||||
%{_mandir}/man8/ovs-vswitchd.8%{ext_man}
|
||||
%{_mandir}/man1/ovsdb-server.1%{ext_man}
|
||||
%{_mandir}/man5/ovs-vswitchd.conf.db.5%{ext_man}
|
||||
%{_mandir}/man8/ovs-ctl.8%{ext_man}
|
||||
%{_sbindir}/rcopenvswitch
|
||||
%{_unitdir}/openvswitch.service
|
||||
%{_localstatedir}/adm/fillup-templates/sysconfig.openvswitch
|
||||
@ -536,10 +535,10 @@ rm -rf %{buildroot}%{py_sitedir}
|
||||
%{_bindir}/ovs-l3ping
|
||||
%{_bindir}/ovs-vlan-test
|
||||
%{_bindir}/ovs-testcontroller
|
||||
%{_mandir}/man8/ovs-test.8.gz
|
||||
%{_mandir}/man8/ovs-l3ping.8.gz
|
||||
%{_mandir}/man8/ovs-vlan-test.8.gz
|
||||
%{_mandir}/man8/ovs-testcontroller.8.gz
|
||||
%{_mandir}/man8/ovs-test.8%{ext_man}
|
||||
%{_mandir}/man8/ovs-l3ping.8%{ext_man}
|
||||
%{_mandir}/man8/ovs-vlan-test.8%{ext_man}
|
||||
%{_mandir}/man8/ovs-testcontroller.8%{ext_man}
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user