SHA256
1
0
forked from pool/openvswitch
Dominique Leuenberger 2018-03-24 15:16:30 +00:00 committed by Git OBS Bridge
commit 1d727eac19
2 changed files with 23 additions and 8 deletions

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Thu Mar 22 10:39:10 UTC 2018 - mchandras@suse.de
- Fix file permissions in /etc/openvswitch for upgrades (951d79e638ec)
-------------------------------------------------------------------
Wed Mar 21 21:03:21 UTC 2018 - dmueller@suse.com
- set rundir to %_rundir
-------------------------------------------------------------------
Thu Mar 1 10:39:54 UTC 2018 - mchandras@suse.de

View File

@ -341,9 +341,10 @@ popd
cp -a %{SOURCE89} obj/$flavor/datapath/linux/Module.supported
pushd obj/$flavor
%configure \
--with-logdir=%{_localstatedir}/log/openvswitch \
--with-linux=%{_prefix}/src/linux-obj/%{_target_cpu}/$flavor \
--with-linux-source=%{_prefix}/src/linux
--with-logdir=%{_localstatedir}/log/openvswitch \
--with-rundir=%{_rundir}/openvswitch \
--with-linux=%{_prefix}/src/linux-obj/%{_target_cpu}/$flavor \
--with-linux-source=%{_prefix}/src/linux
cd datapath/linux
make %{?_smp_mflags}
popd
@ -371,6 +372,7 @@ pushd source
--enable-shared \
--enable-ssl \
${dpdk_opt} \
--with-rundir=%{_rundir}/openvswitch \
--with-logdir=%{_localstatedir}/log/openvswitch
make %{?_smp_mflags}
popd
@ -573,6 +575,13 @@ export DISABLE_RESTART_ON_UPDATE=yes
%postun vtep -p /sbin/ldconfig
%files
%defattr(-,openvswitch,openvswitch)
%dir %{_sysconfdir}/openvswitch
%{_sysconfdir}/openvswitch/default.conf
%config %ghost %{_sysconfdir}/openvswitch/conf.db
%ghost %{_sysconfdir}/openvswitch/.conf.db.~lock~
%config %ghost %{_sysconfdir}/openvswitch/system-id.conf
%defattr(-,root,root)
%{_bindir}/ovs-appctl
%{_bindir}/ovs-docker
%{_bindir}/ovs-dpctl
@ -612,10 +621,6 @@ export DISABLE_RESTART_ON_UPDATE=yes
%{_mandir}/man8/ovs-vswitchd.8%{ext_man}
%{_sysconfdir}/bash_completion.d/ovs-appctl-bashcomp.bash
%{_sysconfdir}/bash_completion.d/ovs-vsctl-bashcomp.bash
%dir %{_sysconfdir}/openvswitch
%config(noreplace) %{_sysconfdir}/openvswitch/default.conf
%config %ghost %{_sysconfdir}/openvswitch/conf.db
%config %ghost %{_sysconfdir}/openvswitch/system-id.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/openvswitch
%{_sbindir}/rcovsdb-server
%{_sbindir}/rcovs-vswitchd
@ -624,7 +629,7 @@ export DISABLE_RESTART_ON_UPDATE=yes
%{_unitdir}/ovs-vswitchd.service
%{_unitdir}/ovsdb-server.service
%{_fillupdir}/sysconfig.openvswitch
%dir %{_localstatedir}/log/openvswitch
%attr(755,-,-) %dir %{_localstatedir}/log/openvswitch
%if %{with dpdk}
%{_prefix}/lib/udev/rules.d/91-vfio.rules
%endif