do not compile openvswitch - use module provided by RHEL kernel

because the module does not compile anymore (too many RHEL kernel changes).

diff --git a/Makefile b/Makefile
index 54d308a7956e0acce70ecd1b1115ad143e983e7c..78a95e2d4b11f804b8a62a41a95dbcae712415bb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -64,8 +64,8 @@ RR272XDIR=rr272x_1x-linux-src-v1.5
 ISCSITARGETDIR=iscsitarget-1.4.20.2
 ISCSITARGETSRC=${ISCSITARGETDIR}.tar.gz
 
-OVSDIR=openvswitch-2.3.2
-OVSSRC=${OVSDIR}.tar.gz
+#OVSDIR=openvswitch-2.3.2
+#OVSSRC=${OVSDIR}.tar.gz
 
 SPLDIR=pkg-spl
 SPLSRC=pkg-spl.tar.gz
@@ -126,15 +126,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 i40e.ko ixgbe.ko bnx2.ko cnic.ko bnx2x.ko iscsi_trgt.ko aacraid.ko megaraid_sas.ko rr272x_1x.ko arcmsr.ko openvswitch.ko hpsa.ko ${SPL_MODULES} ${ZFS_MODULES}
+data: .compile_mark ${KERNEL_CFG} aoe.ko e1000e.ko igb.ko i40e.ko ixgbe.ko bnx2.ko cnic.ko bnx2x.ko iscsi_trgt.ko aacraid.ko megaraid_sas.ko rr272x_1x.ko arcmsr.ko hpsa.ko ${SPL_MODULES} ${ZFS_MODULES}
        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 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 i40e driver
@@ -316,16 +316,16 @@ 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
+#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
 
 ${SPL_MODULES}: .compile_mark ${SPLSRC}
        rm -rf ${SPLDIR}
@@ -392,7 +392,7 @@ distclean: clean
 
 .PHONY: clean
 clean:
-       rm -rf *~ .compile_mark ${KERNEL_CFG} ${KERNEL_SRC} tmp data proxmox-ve/data *.deb ${AOEDIR} aoe.ko ${headers_tmp} fwdata fwlist.tmp *.ko ${I40EDIR} ${IXGBEDIR} ${E1000EDIR} e1000e.ko ${IGBDIR} igb.ko fwlist-${KVNAME} iscsi_trgt.ko ${ISCSITARGETDIR} ${BNX2DIR} bnx2.ko cnic.ko bnx2x.ko aacraid.ko ${AACRAIDDIR} megaraid_sas.ko ${MEGARAID_DIR} rr272x_1x.ko ${RR272XDIR} ${ARECADIR}.ko ${ARECADIR} ${OVSDIR} openvswitch.ko ${ZFSDIR} ${SPLDIR} ${SPL_MODULES} ${ZFS_MODULES} hpsa.ko ${HPSADIR}
+       rm -rf *~ .compile_mark ${KERNEL_CFG} ${KERNEL_SRC} tmp data proxmox-ve/data *.deb ${AOEDIR} aoe.ko ${headers_tmp} fwdata fwlist.tmp *.ko ${I40EDIR} ${IXGBEDIR} ${E1000EDIR} e1000e.ko ${IGBDIR} igb.ko fwlist-${KVNAME} iscsi_trgt.ko ${ISCSITARGETDIR} ${BNX2DIR} bnx2.ko cnic.ko bnx2x.ko aacraid.ko ${AACRAIDDIR} megaraid_sas.ko ${MEGARAID_DIR} rr272x_1x.ko ${RR272XDIR} ${ARECADIR}.ko ${ARECADIR} ${ZFSDIR} ${SPLDIR} ${SPL_MODULES} ${ZFS_MODULES} hpsa.ko ${HPSADIR}
 
 
 

diff --git a/changelog.Debian b/changelog.Debian
index 38bb8da4ff67d74838c88132630b39f1587f73a4..b64fb14d133205374c24648b27d7c2a97a87cf68 100644 (file)
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -15,7 +15,9 @@ pve-kernel-2.6.32 (2.6.32-178) unstable; urgency=low
   * update netxtreme2 to 7.14.05
   
   * update aacraid sources to aacraid-linux-src-1.2.1-50667.tgz
-  
+
+  * use openvswitch from RHEL kernel
+
  -- Proxmox Support Team <support@proxmox.com>  Fri, 16 Sep 2016 06:53:07 +0200
 
 pve-kernel-2.6.32 (2.6.32-177) unstable; urgency=low