-RELEASE=2.2
+RELEASE=3.0
KERNEL_VER=2.6.32
-PKGREL=80
+PKGREL=103
# also include firmware of previous versrion into
# the fw package: fwlist-2.6.32-PREV-pve
-KREL=16
+KREL=21
-RHKVER=279.9.1.el6
-OVZVER=042stab062.2
+RHKVER=358.6.2.el6
+OVZVER=042stab078.22
KERNELSRCRPM=vzkernel-${KERNEL_VER}-${OVZVER}.src.rpm
KERNEL_CFG_ORG=config-${KERNEL_VER}-${OVZVER}.x86_64
FW_VER=1.0
-FW_REL=21
+FW_REL=23
FW_DEB=pve-firmware_${FW_VER}-${FW_REL}_all.deb
AOEDIR=aoe6-77
AOESRC=${AOEDIR}.tar.gz
-E1000EDIR=e1000e-2.1.4
+E1000EDIR=e1000e-2.3.2
E1000ESRC=${E1000EDIR}.tar.gz
-IGBDIR=igb-4.0.17
+IGBDIR=igb-4.2.16
IGBSRC=${IGBDIR}.tar.gz
-IXGBEDIR=ixgbe-3.11.33
+IXGBEDIR=ixgbe-3.14.5
IXGBESRC=${IXGBEDIR}.tar.gz
+BNX2DIR=netxtreme2-7.4.27
+BNX2SRC=${BNX2DIR}.tar.gz
+
+AACRAIDSRC=aacraid-1.2.1-29900.src.rpm
+AACRAIDDIR=aacraid-1.2.1
+
#ARECADIR=arcmsr.1.20.0X.15-110330
#ARECASRC=${ARECADIR}.zip
dpkg-deb --build proxmox-ve/data ${PVE_DEB}
check_gcc:
- gcc --version|grep "4.4.5" || false
+ gcc --version|grep "4.7.2" || false
${DST_DEB}: data control.in postinst.in
mkdir -p data/DEBIAN
./find-firmware.pl data/lib/modules/${KVNAME} >fwlist.tmp
mv fwlist.tmp $@
-data: .compile_mark ${KERNEL_CFG} aoe.ko e1000e.ko igb.ko ixgbe.ko iscsi_trgt.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
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 e1000e.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/e1000e/
# install latest ibg driver
install -m 644 igb.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/igb/
+ # install bnx2 drivers
+ install -m 644 bnx2.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/
+ install -m 644 cnic.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/
+ install -m 644 bnx2x.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/bnx2x/
+ # install aacraid drivers
+ install -m 644 aacraid.ko tmp/lib/modules/${KVNAME}/kernel/drivers/scsi/aacraid/
# install areca driver
#install -m 644 arcmsr.ko tmp/lib/modules/${KVNAME}/kernel/drivers/scsi/arcmsr/
# install iscsitarget module
rm -rf ${KERNEL_SRC}
cp -a ${KERNEL_SRC}.org ${KERNEL_SRC}
cd ${KERNEL_SRC}; patch -p1 <../bootsplash-3.1.9-2.6.31-rh.patch
- cd ${KERNEL_SRC}; patch -p1 <../${RHKERSRCDIR}/patch-042stab062
+ cd ${KERNEL_SRC}; patch -p1 <../${RHKERSRCDIR}/patch-042stab078
cd ${KERNEL_SRC}; patch -p1 <../do-not-use-barrier-on-ext3.patch
cd ${KERNEL_SRC}; patch -p1 <../bridge-patch.diff
+ cd ${KERNEL_SRC}; patch -p1 <../0001-bridge-disable-querier.patch
+ cd ${KERNEL_SRC}; patch -p1 <../0002-bridge-disable-querier.patch
+ cd ${KERNEL_SRC}; patch -p1 <../0003-bridge-disable-querier.patch
+ cd ${KERNEL_SRC}; patch -p1 <../0004-bridge-disable-querier.patch
+ cd ${KERNEL_SRC}; patch -p1 <../0005-bridge-disable-querier.patch
+ cd ${KERNEL_SRC}; patch -p1 <../0001-bridge-only-expire-the-mdb-entry-when-query-is-recei.patch
+ cd ${KERNEL_SRC}; patch -p1 <../0002-bridge-send-query-as-soon-as-leave-is-received.patch
cd ${KERNEL_SRC}; patch -p1 <../fix-aspm-policy.patch
- cd ${KERNEL_SRC}; patch -p1 <../optimize-cfq-parameters.patch
+ cd ${KERNEL_SRC}; patch -p1 <../kbuild-generate-mudules-builtin.patch
+ cd ${KERNEL_SRC}; patch -p1 <../add-tiocgdev-ioctl.patch
+ cd ${KERNEL_SRC}; patch -p1 <../fix-ipoib-add-missing-lock.patch
sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'
touch $@
cd ${RHKERSRCDIR};rpm2cpio ../${KERNELSRCRPM} |cpio -i
touch $@
+aacraid.ko: .compile_mark ${AACRAIDSRC}
+ rm -rf ${AACRAIDDIR}
+ mkdir ${AACRAIDDIR}
+ cd ${AACRAIDDIR};rpm2cpio ../${AACRAIDSRC} |cpio -i
+ cd ${AACRAIDDIR};tar xzf aacraid_source.tgz
+ mkdir -p /lib/modules/${KVNAME}
+ ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
+ make -C ${TOP}/${KERNEL_SRC} M=${TOP}/${AACRAIDDIR} modules
+ cp ${AACRAIDDIR}/aacraid.ko .
+
aoe.ko aoe: .compile_mark ${AOESRC}
# aoe driver updates
rm -rf ${AOEDIR} aoe.ko
cd ${IXGBEDIR}/src; make CFLAGS_EXTRA="-DIXGBE_NO_LRO" BUILD_KERNEL=${KVNAME}
cp ${IXGBEDIR}/src/ixgbe.ko ixgbe.ko
+bnx2.ko cnic.ko bnx2x.ko: ${BNX2SRC}
+ rm -rf ${BNX2DIR}
+ tar xf ${BNX2SRC}
+ mkdir -p /lib/modules/${KVNAME}
+ ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
+ cd ${BNX2DIR}; make -C bnx2/src KVER=${KVNAME}
+ cd ${BNX2DIR}; make -C bnx2x/src KVER=${KVNAME}
+ cp `find ${BNX2DIR} -name bnx2.ko -o -name cnic.ko -o -name bnx2x.ko` .
+
#arcmsr.ko: .compile_mark ${ARECASRC}
# rm -rf ${ARECADIR}
# unzip ${ARECASRC}
linux-firmware.git/WHENCE:
git clone git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git linux-firmware.git
-${FW_DEB} fw: control.firmware linux-firmware.git/WHENCE changelog.firmware fwlist-2.6.18-2-pve fwlist-2.6.24-12-pve fwlist-2.6.32-3-pve fwlist-2.6.32-4-pve fwlist-2.6.32-5-pve fwlist-2.6.32-6-pve fwlist-2.6.35-1-pve fwlist-2.6.32-13-pve fwlist-2.6.32-14-pve fwlist-2.6.32-15-pve fwlist-${KVNAME}
+${FW_DEB} fw: control.firmware linux-firmware.git/WHENCE changelog.firmware fwlist-2.6.18-2-pve fwlist-2.6.24-12-pve fwlist-2.6.32-3-pve fwlist-2.6.32-4-pve fwlist-2.6.32-5-pve fwlist-2.6.32-6-pve fwlist-2.6.35-1-pve fwlist-2.6.32-13-pve fwlist-2.6.32-14-pve fwlist-2.6.32-15-pve fwlist-2.6.32-20-pve fwlist-${KVNAME}
rm -rf fwdata
mkdir -p fwdata/lib/firmware
./assemble-firmware.pl fwlist-${KVNAME} fwdata/lib/firmware
./assemble-firmware.pl fwlist-2.6.32-13-pve fwdata/lib/firmware
./assemble-firmware.pl fwlist-2.6.32-14-pve fwdata/lib/firmware
./assemble-firmware.pl fwlist-2.6.32-15-pve fwdata/lib/firmware
+ ./assemble-firmware.pl fwlist-2.6.32-16-pve fwdata/lib/firmware
+ ./assemble-firmware.pl fwlist-2.6.32-20-pve fwdata/lib/firmware
install -d fwdata/usr/share/doc/pve-firmware
cp linux-firmware.git/WHENCE fwdata/usr/share/doc/pve-firmware/README
install -d fwdata/usr/share/doc/pve-firmware/licenses
.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 ${IXGBEDIR} ${E1000EDIR} e1000e.ko ${IGBDIR} igb.ko fwlist-${KVNAME} iscsi_trgt.ko ${ISCSITARGETDIR}
+ rm -rf *~ .compile_mark ${KERNEL_CFG} ${KERNEL_SRC} tmp data proxmox-ve/data *.deb ${AOEDIR} aoe.ko ${headers_tmp} fwdata fwlist.tmp *.ko ${IXGBEDIR} ${E1000EDIR} e1000e.ko ${IGBDIR} igb.ko fwlist-${KVNAME} iscsi_trgt.ko ${ISCSITARGETDIR} ${BNX2DIR} bnx2.ko cnic.ko bnx2x.ko aacraid.ko ${AACRAIDDIR}
+
projects / pve-kernel-2.6.32.git / blobdiff