RELEASE=2.0
KERNEL_VER=2.6.32
-PKGREL=43
+PKGREL=63
# also include firmware of previous versrion into
# the fw package: fwlist-2.6.32-PREV-pve
-KREL=6
+KREL=10
-RHKVER=131.6.1.el6
-OVZVER=042stab033.1
+RHKVER=220.4.1.el6
+OVZVER=042stab049.6
KERNELSRCRPM=vzkernel-${KERNEL_VER}-${OVZVER}.src.rpm
KERNEL_CFG_ORG=config-${KERNEL_VER}-${OVZVER}.x86_64
FW_VER=1.0
-FW_REL=13
+FW_REL=15
FW_DEB=pve-firmware_${FW_VER}-${FW_REL}_all.deb
AOEDIR=aoe6-77
AOESRC=${AOEDIR}.tar.gz
-E1000EDIR=e1000e-1.4.4
+E1000EDIR=e1000e-1.9.5
E1000ESRC=${E1000EDIR}.tar.gz
-IGBDIR=igb-3.0.22
+IGBDIR=igb-3.3.6
IGBSRC=${IGBDIR}.tar.gz
-IXGBEDIR=ixgbe-3.3.9
+IXGBEDIR=ixgbe-3.7.17
IXGBESRC=${IXGBEDIR}.tar.gz
-#BNX2DIR=netxtreme2-6.2.23
-#BNX2SRC=${BNX2DIR}.tar.gz
+#ARECADIR=arcmsr.1.20.0X.15-110330
+#ARECASRC=${ARECADIR}.zip
-ARECADIR=arcmsr.1.20.0X.15-110330
-ARECASRC=${ARECADIR}.zip
+ISCSITARGETDIR=iscsitarget-1.4.20.2
+ISCSITARGETSRC=${ISCSITARGETDIR}.tar.gz
DST_DEB=${PACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
HDR_DEB=${HDRPACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
./find-firmware.pl data/lib/modules/${KVNAME} >fwlist.tmp
mv fwlist.tmp $@
-data: .compile_mark ${KERNEL_CFG} arcmsr.ko aoe.ko e1000e.ko igb.ko ixgbe.ko
+data: .compile_mark ${KERNEL_CFG} aoe.ko e1000e.ko igb.ko ixgbe.ko iscsi_trgt.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 areca driver
- install -m 644 arcmsr.ko tmp/lib/modules/${KVNAME}/kernel/drivers/scsi/arcmsr/
+ #install -m 644 arcmsr.ko tmp/lib/modules/${KVNAME}/kernel/drivers/scsi/arcmsr/
+ # install iscsitarget module
+ install -m 644 -D iscsi_trgt.ko tmp/lib/modules/${KVNAME}/kernel/drivers/scsi/iscsi_trgt.ko
# remove firmware
rm -rf tmp/lib/firmware
# strip debug info
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-042stab033
+ cd ${KERNEL_SRC}; patch -p1 <../${RHKERSRCDIR}/patch-042stab049
cd ${KERNEL_SRC}; patch -p1 <../do-not-use-barrier-on-ext3.patch
- cd ${KERNEL_SRC}; patch -p1 <../SCSI-aacraid-Add-PMC-Sierra-SRC-based-controller.patch
- cd ${KERNEL_SRC}; patch -p1 <../fix-register-corruption-in-pvclock-scale-delta.patch
cd ${KERNEL_SRC}; patch -p1 <../bridge-patch.diff
- # backport dlm fixes form linux 3.y (those are include in RHEL 6.2)
- cd ${KERNEL_SRC}; patch -p1 <../dlm-Make-DLM-depend-on-CONFIGFS_FS.patch
- cd ${KERNEL_SRC}; patch -p1 <../dlm-increase-default-hash-table-sizes.patch
- cd ${KERNEL_SRC}; patch -p1 <../dlm-Use-cmwq-for-send-and-receive-workqueues.patch
- cd ${KERNEL_SRC}; patch -p1 <../dlm-sanitize-work_start-in-lowcomms.c.patch
- cd ${KERNEL_SRC}; patch -p1 <../dlm-use-single-thread-workqueues.patch
- cd ${KERNEL_SRC}; patch -p1 <../dlm-Remove-superfluous-call-to-recalc_sigpending.patch
- cd ${KERNEL_SRC}; patch -p1 <../dlm-delayed-reply-message-warning.patch
- cd ${KERNEL_SRC}; patch -p1 <../dlm-remove-shared-message-stub-for-recovery.patch
- cd ${KERNEL_SRC}; patch -p1 <../dlm-make-plock-operation-killable.patch
- #cd ${KERNEL_SRC}; patch -p1 <../ovz-fix-slow-fsync.patch
+ cd ${KERNEL_SRC}; patch -p1 <../fix-aspm-policy.patch
+ cd ${KERNEL_SRC}; patch -p1 <../optimize-cfq-parameters.patch
sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'
touch $@
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}
+#arcmsr.ko: ${ARECASRC}
+# rm -rf ${ARECADIR}
+# unzip ${ARECASRC}
# mkdir -p /lib/modules/${KVNAME}
# ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
-# cd ${BNX2DIR}; make KVER=${KVNAME}
-# cp `find ${BNX2DIR} -name bnx2.ko -o -name cnic.ko -o -name bnx2x.ko` .
+# cd ${ARECADIR}; make -C ${TOP}/${KERNEL_SRC} CONFIG_SCSI_ARCMSR=m SUBDIRS=${TOP}/${ARECADIR} modules
+# cp ${ARECADIR}/arcmsr.ko arcmsr.ko
-arcmsr.ko: ${ARECASRC}
- rm -rf ${ARECADIR}
- unzip ${ARECASRC}
+iscsi_trgt.ko: ${ISCSITARGETSRC}
+ rm -rf ${ISCSITARGETDIR}
+ tar xf ${ISCSITARGETSRC}
mkdir -p /lib/modules/${KVNAME}
ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
- cd ${ARECADIR}; make -C ${TOP}/${KERNEL_SRC} CONFIG_SCSI_ARCMSR=m SUBDIRS=${TOP}/${ARECADIR} modules
- cp ${ARECADIR}/arcmsr.ko arcmsr.ko
-
+ cd ${ISCSITARGETDIR}; make KVER=${KVNAME}
+ cp ${ISCSITARGETDIR}/kernel/iscsi_trgt.ko iscsi_trgt.ko
headers_tmp := $(CURDIR)/tmp-headers
headers_dir := $(headers_tmp)/usr/src/linux-headers-${KVNAME}
linux-firmware.git/WHENCE:
git clone git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware.git linux-firmware.git
-linux-firmware-from-kernel.git/WHENCE:
- git clone git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware-from-kernel.git linux-firmware-from-kernel.git
-
-${FW_DEB} fw: control.firmware linux-firmware.git/WHENCE linux-firmware-from-kernel.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.35-1-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-${KVNAME}
rm -rf fwdata
mkdir -p fwdata/lib/firmware
./assemble-firmware.pl fwlist-${KVNAME} fwdata/lib/firmware
./assemble-firmware.pl fwlist-2.6.32-3-pve fwdata/lib/firmware
./assemble-firmware.pl fwlist-2.6.32-4-pve fwdata/lib/firmware
./assemble-firmware.pl fwlist-2.6.32-5-pve fwdata/lib/firmware
+ ./assemble-firmware.pl fwlist-2.6.32-6-pve fwdata/lib/firmware
./assemble-firmware.pl fwlist-2.6.35-1-pve fwdata/lib/firmware
install -d fwdata/usr/share/doc/pve-firmware
cp linux-firmware.git/WHENCE fwdata/usr/share/doc/pve-firmware/README
.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} ${ARECADIR} arcmsr.ko
-
+ 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}
projects / pve-kernel-2.6.32.git / blobdiff