Hello community, here is the log from the commit of package openvswitch for openSUSE:Factory checked in at 2016-09-16 11:01:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-dpdk.changes 2016-09-11 00:53:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.openvswitch.new/openvswitch-dpdk.changes 2016-09-16 11:01:03.000000000 +0200 @@ -1,0 +2,21 @@ +Tue Sep 6 10:11:49 UTC 2016 - [email protected] + +- Add new DPDK_OPTIONS environment variable to hold the dpdk + vswitchd options so that the systemd unit files can be used to + launch an ovs-vswitcd DPDK capable instance instead of doing + it manually. (bsc#987265) + * 0001-ovs-ctl-Add-new-DPDK_OPTIONS-environment-variable.patch + +------------------------------------------------------------------- +Sun Aug 14 11:05:59 CEST 2016 - [email protected] + +- enable openvswitch-dpdk on aarch64 since dpdk + builds on aarch64 now + +------------------------------------------------------------------- +Sun Aug 7 21:11:51 CEST 2016 - [email protected] + +- remove aarch from openvswitch-dpdk until we have a dpdk + that builds for aarch64 + +------------------------------------------------------------------- @@ -21 +42 @@ - automatically based on %bcond_with* macros. + automatically based on %bcond_with* macros (bsc#989335). openvswitch.changes: same change New: ---- 0001-ovs-ctl-Add-new-DPDK_OPTIONS-environment-variable.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openvswitch-dpdk.spec ++++++ --- /var/tmp/diff_new_pack.blUMdq/_old 2016-09-16 11:01:05.000000000 +0200 +++ /var/tmp/diff_new_pack.blUMdq/_new 2016-09-16 11:01:05.000000000 +0200 @@ -42,9 +42,12 @@ Source2: openvswitch-switch.logrotate Source3: openvswitch.service Source89: Module.supported.updates -# PATCH-FIX-UPSTREAM openvswitch-2.5.0-detect-dpdk-installation.patch +# PATCH-FIX-UPSTREAM: openvswitch-2.5.0-detect-dpdk-installation.patch (fate#319170) Patch0: openvswitch-%{version}-detect-dpdk-installation.patch +# PATCH-FIX-UPSTREAM: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch +# PATCH-FIX-SUSE: 0001-ovs-ctl-Add-new-DPDK_OPTIONS-environment-variable.patch (bsc#987265) +Patch2: 0001-ovs-ctl-Add-new-DPDK_OPTIONS-environment-variable.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: fdupes @@ -247,6 +250,7 @@ %setup -q -n openvswitch-%{version} %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build set -- * .travis* ++++++ openvswitch.spec ++++++ --- /var/tmp/diff_new_pack.blUMdq/_old 2016-09-16 11:01:05.000000000 +0200 +++ /var/tmp/diff_new_pack.blUMdq/_new 2016-09-16 11:01:05.000000000 +0200 @@ -40,9 +40,12 @@ Source2: openvswitch-switch.logrotate Source3: openvswitch.service Source89: Module.supported.updates -# PATCH-FIX-UPSTREAM openvswitch-2.5.0-detect-dpdk-installation.patch +# PATCH-FIX-UPSTREAM: openvswitch-2.5.0-detect-dpdk-installation.patch (fate#319170) Patch0: openvswitch-%{version}-detect-dpdk-installation.patch +# PATCH-FIX-UPSTREAM: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch +# PATCH-FIX-SUSE: 0001-ovs-ctl-Add-new-DPDK_OPTIONS-environment-variable.patch (bsc#987265) +Patch2: 0001-ovs-ctl-Add-new-DPDK_OPTIONS-environment-variable.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: fdupes @@ -245,6 +248,7 @@ %setup -q -n openvswitch-%{version} %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build set -- * .travis* ++++++ 0001-ovs-ctl-Add-new-DPDK_OPTIONS-environment-variable.patch ++++++ >From 49e6a7ece028a2a429ee7672e4225788e8bbb4a9 Mon Sep 17 00:00:00 2001 From: Markos Chandras <[email protected]> Date: Tue, 6 Sep 2016 11:06:56 +0100 Subject: [PATCH] ovs-ctl: Add new DPDK_OPTIONS environment variable Add new DPDK_OPTIONS environment variable to hold the dpdk vswitchd options so that the systemd unit files can be used to launch an ovs-vswitcd DPDK capable instance instead of doing it manually. A similar patch has been submitted upstream http://openvswitch.org/pipermail/dev/2016-July/074150.html but got rejected because the master (2.6 at the time) has been fixed in a different way and DPDK options are now part of the ovsdb. Signed-off-by: Markos Chandras <[email protected]> --- rhel/usr_share_openvswitch_scripts_systemd_sysconfig.template | 3 +++ utilities/ovs-ctl.in | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/rhel/usr_share_openvswitch_scripts_systemd_sysconfig.template b/rhel/usr_share_openvswitch_scripts_systemd_sysconfig.template index 3050a07..8779c1e 100644 --- a/rhel/usr_share_openvswitch_scripts_systemd_sysconfig.template +++ b/rhel/usr_share_openvswitch_scripts_systemd_sysconfig.template @@ -21,3 +21,6 @@ # --ovsdb-server-wrapper=valgrind # OPTIONS="" +# DPDK options to be passed along with --dpdk to ovs-vswitchd. For example: +# DPDK_OPTIONS="-c 0x1 -n 4" +DPDK_OPTIONS="" diff --git a/utilities/ovs-ctl.in b/utilities/ovs-ctl.in index 0082bed..cec399c 100755 --- a/utilities/ovs-ctl.in +++ b/utilities/ovs-ctl.in @@ -215,7 +215,9 @@ start_forwarding () { fi # Start ovs-vswitchd. - set ovs-vswitchd unix:"$DB_SOCK" + set ovs-vswitchd + [ -z "$DPDK_OPTIONS" ] || set -- "$@" "--dpdk" $DPDK_OPTIONS "--" + set "$@" unix:"$DB_SOCK" set "$@" -vconsole:emer -vsyslog:err -vfile:info if test X"$MLOCKALL" != Xno; then set "$@" --mlockall -- 2.9.3
