Hello community, here is the log from the commit of package openvswitch for openSUSE:Factory checked in at 2013-09-26 14:45:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2013-05-27 09:55:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.openvswitch.new/openvswitch.changes 2013-09-26 14:45:47.000000000 +0200 @@ -1,0 +2,36 @@ +Tue Sep 24 13:17:25 UTC 2013 - bwiedem...@suse.com + +- add vlan_apichange.patch to compensate kernel API changes + between 3.8 and 3.11 in commits f646968f and 86a9bad3 + +------------------------------------------------------------------- +Fri Sep 13 15:25:40 UTC 2013 - dmuel...@suse.com + +- update to 1.11.0: + * http://openvswitch.org/releases/NEWS-1.11.0 +- remove accept-newer-kernel-versions.diff + +------------------------------------------------------------------- +Fri Sep 13 10:09:18 UTC 2013 - dmuel...@suse.com + +- sign modules for secure boot (bnc#839838) + +------------------------------------------------------------------- +Tue Jul 2 17:08:11 UTC 2013 - tpaszkow...@novell.com + +- Build openvswitch kernel module for xen kernel flavor. + +------------------------------------------------------------------- +Sun Jun 16 05:30:24 UTC 2013 - vu...@suse.com + +- Add openvswitch-ipsec.init, Module.supported, + Module.supported.updates and README.packager as sources: they + were not listed as such. +- Install openvswitch-ipsec.init if we build ipsec support. + +------------------------------------------------------------------- +Thu Jun 6 14:28:07 UTC 2013 - tpaszkow...@novell.com + +- mark openvswitch module shipped with package as supported + +------------------------------------------------------------------- Old: ---- accept-newer-kernel-versions.diff openvswitch-1.10.0.tar.gz New: ---- Module.supported.updates openvswitch-1.11.0.tar.gz vlan_apichange.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openvswitch.spec ++++++ --- /var/tmp/diff_new_pack.vt0pB5/_old 2013-09-26 14:45:52.000000000 +0200 +++ /var/tmp/diff_new_pack.vt0pB5/_new 2013-09-26 14:45:52.000000000 +0200 @@ -16,7 +16,8 @@ # -# Enable KMP building by default: +# needssslcertforbuild + %bcond_without kmp # Don't build in-kernel module, the shipped one is more feature rich: %bcond_with kernel_kmp @@ -26,8 +27,8 @@ %bcond_with gui Name: openvswitch -Version: 1.10.0 -Release: 0 +Version: 1.11.0 +Release: 0.<RELEASE13> Summary: An open source, production quality, multilayer virtual switch License: Apache-2.0 Group: Productivity/Networking/System @@ -39,8 +40,12 @@ Source4: openvswitch-switch.logrotate Source5: openvswitch-controller.init Source6: openvswitch-controller.sysconfig +Source7: openvswitch-ipsec.init +Source10: Module.supported +Source11: Module.supported.updates +Source99: README.packager Patch0: sle11-device-ops-backport.diff -Patch1: accept-newer-kernel-versions.diff +Patch1: vlan_apichange.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: fdupes @@ -72,21 +77,25 @@ VMware’s vNetwork distributed vswitch or Cisco’s Nexus 1000V. %if %{with kmp} + %package kmp + Summary: Open vSwitch kernel modules Group: System/Kernel BuildRequires: %kernel_module_package_buildreqs %if %{with kernel_kmp} BuildRequires: kernel-source %endif -%suse_kernel_module_package -p %_sourcedir/preamble ec2 xen xenpae vmi um +%suse_kernel_module_package -p %_sourcedir/preamble ec2 xenpae vmi um %description -n %{name}-kmp Kernel modules supporting the openvswitch datapath %endif %if %{with ipsec} + %package ipsec + Summary: Open vSwitch GRE-over-IPsec support Group: Productivity/Networking/System Requires: %{name} = %{version} @@ -105,6 +114,7 @@ %endif %package switch + Summary: Open vSwitch switch implementations Group: Productivity/Networking/System Requires(pre): %fillup_prereq @@ -124,6 +134,7 @@ Open vSwitch is a full-featured software-based Ethernet switch. %package pki + Summary: Open vSwitch public key infrastructure dependency package Group: Productivity/Networking/System Requires: openvswitch = %{version} @@ -136,6 +147,7 @@ Open vSwitch is a full-featured software-based Ethernet switch. %package controller + Summary: Open vSwitch controller implementation Group: Productivity/Networking/System Requires: openvswitch = %{version} @@ -147,6 +159,7 @@ Open vSwitch is a full-featured software-based Ethernet switch. %package brcompat + Summary: Open vSwitch bridge compatibility support (deprecated) Group: Productivity/Networking/System Requires: openvswitch-switch = %{version} @@ -165,6 +178,7 @@ Open vSwitch is a full-featured software-based Ethernet switch. %package -n python-openvswitch + Summary: Python bindings for Open vSwitch Group: Productivity/Networking/System Requires: python @@ -173,6 +187,7 @@ This package contains the full Python bindings for Open vSwitch database. %package -n python-openvswitch-test + Summary: Python bindings for Open vSwitch Group: Productivity/Networking/System Requires: python @@ -181,7 +196,9 @@ This package contains the full Python bindings for Open vSwitch database. %if %{with gui} + %package ovsdbmonitor + Summary: Open vSwitch graphical monitoring tool Group: Productivity/Networking/System BuildRequires: python-pyside @@ -206,6 +223,7 @@ %endif %package test + Summary: Open vSwitch test package Group: Productivity/Networking/System Requires: python @@ -222,9 +240,7 @@ %prep %setup -q %patch0 -%if 0%{?suse_version} > 1230 -%patch1 -%endif +%patch1 -p1 set -- * mkdir source @@ -242,7 +258,7 @@ %if %{with kernel_kmp} for flavor in %flavors_to_build; do mkdir -p $flavor - cp -a $RPM_SOURCE_DIR/Module.supported $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/ @@ -253,6 +269,7 @@ 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 pushd obj/$flavor %configure \ --with-logdir=/var/log \ @@ -273,8 +290,10 @@ %install %if %{with kmp} +export NO_BRP_STALE_LINK_ERROR=yes 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 @@ -313,9 +332,13 @@ install -d -m 755 %{buildroot}/%{_datadir}/%{name}/scripts 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 %{SOURCE7} \ + %{buildroot}/%{_sysconfdir}/init.d/%{name}-ipsec + ln -s %{_sysconfdir}/init.d/%{name}-ipsec %{buildroot}%{_sbindir}/rc%{name}-ipsec %endif popd @@ -370,6 +393,7 @@ %{_datadir}/openvswitch/scripts/ovs-bugtool-vsctl-show %{_datadir}/openvswitch/scripts/ovs-bugtool-memory-show %{_datadir}/openvswitch/scripts/ovs-bugtool-ovs-ofctl-dump-flows +%{_datadir}/openvswitch/scripts/ovs-bugtool-ovs-appctl-dpif %{_datadir}/openvswitch/scripts/ovs-bugtool-ovs-ofctl-show %{_mandir}/man1/ovs-benchmark.1.gz %{_mandir}/man1/ovsdb-client.1.gz @@ -402,9 +426,12 @@ %{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 @@ -446,6 +473,7 @@ %{_mandir}/man8/ovs-vlan-test.8.gz %if %{with gui} + %files ovsdbmonitor %defattr(-,root,root) %{_bindir}/ovsdbmonitor ++++++ Module.supported.updates ++++++ updates/openvswitch.ko ++++++ openvswitch-1.10.0.tar.gz -> openvswitch-1.11.0.tar.gz ++++++ ++++ 121140 lines of diff (skipped) ++++++ vlan_apichange.patch ++++++ Index: openvswitch-1.11.0/datapath/vlan.h =================================================================== --- openvswitch-1.11.0.orig/datapath/vlan.h +++ openvswitch-1.11.0/datapath/vlan.h @@ -62,6 +62,11 @@ static inline u16 vlan_get_tci(struct sk return skb->vlan_tci; } +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0) +#define __vlan_hwaccel_put_tag(x,y) __vlan_hwaccel_put_tag(x, htons(ETH_P_8021Q), y) +#define NETIF_F_HW_VLAN_TX NETIF_F_HW_VLAN_CTAG_TX_BIT +#endif + static inline void vlan_set_tci(struct sk_buff *skb, u16 vlan_tci) { #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33) Index: openvswitch-1.11.0/datapath/datapath.c =================================================================== --- openvswitch-1.11.0.orig/datapath/datapath.c +++ openvswitch-1.11.0/datapath/datapath.c @@ -62,8 +62,8 @@ #include "vport-internal_dev.h" #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) || \ - LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0) -#error Kernels before 2.6.18 or after 3.8 are not supported by this version of Open vSwitch. + LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0) +#error Kernels before 2.6.18 or after 3.12 are not supported by this version of Open vSwitch. #endif #define REHASH_FLOW_INTERVAL (10 * 60 * HZ) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
