include latest stable OVS openvswitch.ko module

diff --git a/Makefile b/Makefile
index a8a37f8777956742559cf90bdd1743f0026696cd..20ee34633e79676b3dc9d1929c21c0ef0300908a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -57,6 +57,9 @@ RR272XDIR=rr272x_1x-linux-src-v1.5
 ISCSITARGETDIR=iscsitarget-1.4.20.2
 ISCSITARGETSRC=${ISCSITARGETDIR}.tar.gz
 
+OVSDIR=openvswitch-2.3.0
+OVSSRC=${OVSDIR}.tar.gz
+
 DST_DEB=${PACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
 HDR_DEB=${HDRPACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
 PVEPKG=proxmox-ve-${KERNEL_VER}
@@ -107,13 +110,15 @@ fwlist-${KVNAME} fwtest: data
        cmp fwlist.tmp fwlist-2.6.32-20-pve
        mv fwlist.tmp $@
 
-data: .compile_mark ${KERNEL_CFG} aoe.ko e1000e.ko igb.ko ixgbe.ko bnx2.ko cnic.ko bnx2x.ko iscsi_trgt.ko aacraid.ko megaraid_sas.ko rr272x_1x.ko arcmsr.ko
+data: .compile_mark ${KERNEL_CFG} aoe.ko e1000e.ko igb.ko ixgbe.ko bnx2.ko cnic.ko bnx2x.ko iscsi_trgt.ko aacraid.ko megaraid_sas.ko rr272x_1x.ko arcmsr.ko openvswitch.ko
        rm -rf data tmp; mkdir -p tmp/lib/modules/${KVNAME}
        mkdir tmp/boot
        install -m 644 ${KERNEL_CFG} tmp/boot/config-${KVNAME}
        install -m 644 ${KERNEL_SRC}/System.map tmp/boot/System.map-${KVNAME}
        install -m 644 ${KERNEL_SRC}/arch/x86_64/boot/bzImage tmp/boot/vmlinuz-${KVNAME}
        cd ${KERNEL_SRC}; make INSTALL_MOD_PATH=../tmp/ modules_install
+       # install OVS driver
+       install -m 644 openvswitch.ko tmp/lib/modules/${KVNAME}/kernel/net/openvswitch/openvswitch.ko
        # install latest aoe driver
        install -m 644 aoe.ko tmp/lib/modules/${KVNAME}/kernel/drivers/block/aoe/aoe.ko
        # install latest ixgbe driver
@@ -269,6 +274,17 @@ arcmsr.ko: .compile_mark ${ARECASRC}
        cd ${ARECADIR}; make -C ${TOP}/${KERNEL_SRC} SUBDIRS=${TOP}/${ARECADIR} modules
        cp ${ARECADIR}/arcmsr.ko arcmsr.ko
 
+openvswitch.ko: .compile_mark ${OVSSRC}
+       rm -rf ${OVSDIR}
+       tar xf ${OVSSRC}
+       mkdir -p /lib/modules/${KVNAME}
+       ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
+       cd ${OVSDIR}; ln -s ../ovspatches/ patches; quilt push -a
+       cd ${OVSDIR}; ./boot.sh
+       cd ${OVSDIR}; ./configure --with-linux=${TOP}/${KERNEL_SRC}
+       cd ${OVSDIR}; make -C datapath/linux
+       cp ${OVSDIR}/datapath/linux/openvswitch.ko openvswitch.ko
+
 iscsi_trgt.ko: .compile_mark ${ISCSITARGETSRC}
        rm -rf ${ISCSITARGETDIR}
        tar xf ${ISCSITARGETSRC}

diff --git a/README b/README
index 3b361ccf3d9a89c4151549d67ce5546ca63425bb..685a905a9890b657309dea2c58fa8f59feaccbc3 100644 (file)
--- a/README
+++ b/README
@@ -11,6 +11,8 @@ Additional/Updated Modules:
 
 - we use bootsplash to display the boot logo.
 
+- inclused latest stable OVS openvswitch.ko module
+
 - include latest AoE driver (http://support.coraid.com/support/linux)
 
 - include latest ixgbe driver from intel/sourceforge

diff --git a/openvswitch-2.3.0.tar.gz b/openvswitch-2.3.0.tar.gz
new file mode 100644 (file)
index 0000000..6090fb2
Binary files /dev/null and b/openvswitch-2.3.0.tar.gz differ

diff --git a/ovspatches/ovs-compile.patch b/ovspatches/ovs-compile.patch
new file mode 100644 (file)
index 0000000..74843c1
--- /dev/null
+++ b/ovspatches/ovs-compile.patch
@@ -0,0 +1,38 @@
+Index: newovs/acinclude.m4
+===================================================================
+--- newovs.orig/acinclude.m4   2014-08-14 22:34:33.000000000 +0200
++++ newovs/acinclude.m4        2014-09-18 06:50:07.000000000 +0200
+@@ -257,6 +257,7 @@
+   OVS_GREP_IFELSE([$KSRC/include/linux/netdevice.h], [can_checksum_protocol])
+   OVS_GREP_IFELSE([$KSRC/include/linux/netdevice.h], [netdev_features_t])
+   OVS_GREP_IFELSE([$KSRC/include/linux/netdevice.h], [pcpu_sw_netstats])
++  OVS_GREP_IFELSE([$KSRC/include/net/net_namespace.h], [pernet_operations])
+ 
+   OVS_GREP_IFELSE([$KSRC/include/linux/random.h], [prandom_u32])
+ 
+Index: newovs/datapath/linux/compat/net_namespace.c
+===================================================================
+--- newovs.orig/datapath/linux/compat/net_namespace.c  2014-07-14 12:28:51.000000000 +0200
++++ newovs/datapath/linux/compat/net_namespace.c       2014-09-18 06:52:24.000000000 +0200
+@@ -3,7 +3,7 @@
+ #include <net/net_namespace.h>
+ #include <net/netns/generic.h>
+ 
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33)
++#ifndef HAVE_PERNET_OPERATIONS
+ 
+ int compat_init_net(struct net *net, struct rpl_pernet_operations *pnet)
+ {
+Index: newovs/datapath/linux/compat/include/net/net_namespace.h
+===================================================================
+--- newovs.orig/datapath/linux/compat/include/net/net_namespace.h      2014-07-14 12:28:51.000000000 +0200
++++ newovs/datapath/linux/compat/include/net/net_namespace.h   2014-09-18 06:55:31.000000000 +0200
+@@ -3,7 +3,7 @@
+ 
+ #include_next <net/net_namespace.h>
+ 
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33)
++#ifndef HAVE_PERNET_OPERATIONS
+ /* for 2.6.32* */
+ struct rpl_pernet_operations {
+       int (*init)(struct net *net);

diff --git a/ovspatches/series b/ovspatches/series
new file mode 100644 (file)
index 0000000..abb3193
--- /dev/null
+++ b/ovspatches/series
@@ -0,0 +1 @@
+ovs-compile.patch