-RELEASE=3.2
+RELEASE=3.3
KERNEL_VER=3.10.0
-PKGREL=14
+PKGREL=25
# also include firmware of previous versrion into
# the fw package: fwlist-2.6.32-PREV-pve
-KREL=4
+KREL=6
-RHKVER=123.el7
+RHKVER=123.13.2.el7
KERNELSRCRPM=kernel-${KERNEL_VER}-${RHKVER}.src.rpm
E1000EDIR=e1000e-3.1.0.2
E1000ESRC=${E1000EDIR}.tar.gz
-IGBDIR=igb-5.2.9.4
+IGBDIR=igb-5.2.15
IGBSRC=${IGBDIR}.tar.gz
-IXGBEDIR=ixgbe-3.21.2
+IXGBEDIR=ixgbe-3.23.2
IXGBESRC=${IXGBEDIR}.tar.gz
-BNX2DIR=netxtreme2-7.10.14
+BNX2DIR=netxtreme2-7.11.05
BNX2SRC=${BNX2DIR}.tar.gz
AACRAIDVER=1.2.1-40700
#ISCSITARGETDIR=iscsitarget-1.4.20.2
#ISCSITARGETSRC=${ISCSITARGETDIR}.tar.gz
+ZFSVER=0.6.3-1.2
+SPLDIR=spl-spl-${ZFSVER}
+SPLSRC=spl-${ZFSVER}.tar.gz
+ZFSDIR=zfs-zfs-${ZFSVER}
+ZFSSRC=zfs-${ZFSVER}.tar.gz
+ZFS_MODULES=zfs.ko zavl.ko znvpair.ko zunicode.ko zcommon.ko zpios.ko
+SPL_MODULES=spl.ko splat.ko
+
DST_DEB=${PACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
HDR_DEB=${HDRPACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
PVEPKG=proxmox-ve-${KERNEL_VER}
.PHONY: download
download:
- rm ${KERNELSRCRPM}
- wget http://vault.centos.org/7.0.1406/os/Source/SPackages/${KERNELSRCRPM}
+ rm -f ${KERNELSRCRPM}
+ #wget http://vault.centos.org/7.0.1406/os/Source/SPackages/${KERNELSRCRPM}
+ wget http://vault.centos.org/7.0.1406/updates/Source/SPackages/${KERNELSRCRPM}
check_gcc:
ifeq ($(CC), cc)
$(CC) --version|grep "4\.7" || false
endif
-${DST_DEB}: data control.in postinst.in postrm.in copyright changelog.Debian
+${DST_DEB}: data control.in prerm.in postinst.in postrm.in copyright changelog.Debian
mkdir -p data/DEBIAN
sed -e 's/@KERNEL_VER@/${KERNEL_VER}/' -e 's/@KVNAME@/${KVNAME}/' -e 's/@PKGREL@/${PKGREL}/' <control.in >data/DEBIAN/control
+ sed -e 's/@@KVNAME@@/${KVNAME}/g' <prerm.in >data/DEBIAN/prerm
+ chmod 0755 data/DEBIAN/prerm
sed -e 's/@@KVNAME@@/${KVNAME}/g' <postinst.in >data/DEBIAN/postinst
chmod 0755 data/DEBIAN/postinst
sed -e 's/@@KVNAME@@/${KVNAME}/g' <postrm.in >data/DEBIAN/postrm
mv fwlist.tmp $@
# fixme: bnx2.ko cnic.ko bnx2x.ko
-data: .compile_mark ${KERNEL_CFG} e1000e.ko igb.ko ixgbe.ko bnx2.ko cnic.ko bnx2x.ko aacraid.ko arcmsr.ko
+data: .compile_mark ${KERNEL_CFG} e1000e.ko igb.ko ixgbe.ko bnx2.ko cnic.ko bnx2x.ko aacraid.ko arcmsr.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 rr272x_1x.ko -D tmp/lib/modules/${KVNAME}/kernel/drivers/scsi/rr272x_1x/rr272x_1x.ko
# install areca driver
install -m 644 arcmsr.ko tmp/lib/modules/${KVNAME}/kernel/drivers/scsi/arcmsr/
+ # install zfs drivers
+ install -d -m 0755 tmp/lib/modules/${KVNAME}/zfs
+ install -m 644 ${SPL_MODULES} ${ZFS_MODULES} tmp/lib/modules/${KVNAME}/zfs
# remove firmware
rm -rf tmp/lib/firmware
# strip debug info
#cd ${KERNEL_SRC}; patch -p1 <../add-tiocgdev-ioctl.patch
#cd ${KERNEL_SRC}; patch -p1 <../fix-nfs-block-count.patch
#cd ${KERNEL_SRC}; patch -p1 <../fix-idr-header-for-drbd-compilation.patch
- cd ${KERNEL_SRC}; patch -p1 <../n_tty-Fix-n_tty_write-crash-when-echoing-in-raw-mode.patch
cd ${KERNEL_SRC}; patch -p1 <../add-empty-ndo_poll_controller-to-veth.patch
+ cd ${KERNEL_SRC}; patch -p1 <../override_for_missing_acs_capabilities.patch
+ cd ${KERNEL_SRC}; patch -p1 <../tg3-fix-deadlock_in_tg3_change_mtu.patch
sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'
touch $@
cd ${ARECADIR}; make -C ${TOP}/${KERNEL_SRC} SUBDIRS=${TOP}/${ARECADIR} modules
cp ${ARECADIR}/arcmsr.ko arcmsr.ko
+${SPL_MODULES}: .compile_mark ${SPLSRC}
+ rm -rf ${SPLDIR}
+ tar xf ${SPLSRC}
+ cd ${SPLDIR}; ./autogen.sh
+ cd ${SPLDIR}; ./configure --with-config=kernel --with-linux=${TOP}/${KERNEL_SRC} --with-linux-obj=${TOP}/${KERNEL_SRC}
+ cd ${SPLDIR}; make
+ cp ${SPLDIR}/module/spl/spl.ko spl.ko
+ cp ${SPLDIR}/module/splat/splat.ko splat.ko
+
+${ZFS_MODULES}: .compile_mark ${ZFSSRC}
+ rm -rf ${ZFSDIR}
+ tar xf ${ZFSSRC}
+ cd ${ZFSDIR}; ./autogen.sh
+ cd ${ZFSDIR}; ./configure --with-spl=${TOP}/${SPLDIR} --with-spl-obj=${TOP}/${SPLDIR} --with-config=kernel --with-linux=${TOP}/${KERNEL_SRC} --with-linux-obj=${TOP}/${KERNEL_SRC}
+ cd ${ZFSDIR}; make
+ cp ${ZFSDIR}/module/zfs/zfs.ko zfs.ko
+ cp ${ZFSDIR}/module/avl/zavl.ko zavl.ko
+ cp ${ZFSDIR}/module/nvpair/znvpair.ko znvpair.ko
+ cp ${ZFSDIR}/module/unicode/zunicode.ko zunicode.ko
+ cp ${ZFSDIR}/module/zcommon/zcommon.ko zcommon.ko
+ cp ${ZFSDIR}/module/zpios/zpios.ko zpios.ko
+
+
#iscsi_trgt.ko: .compile_mark ${ISCSITARGETSRC}
# rm -rf ${ISCSITARGETDIR}
# tar xf ${ISCSITARGETSRC}
.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} ${BNX2DIR} bnx2.ko cnic.ko bnx2x.ko aacraid.ko ${AACRAIDDIR} rr272x_1x.ko ${RR272XDIR} ${ARECADIR}.ko ${ARECADIR}
+ 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} ${BNX2DIR} bnx2.ko cnic.ko bnx2x.ko aacraid.ko ${AACRAIDDIR} rr272x_1x.ko ${RR272XDIR} ${ARECADIR}.ko ${ARECADIR} ${ZFSDIR} ${SPLDIR} ${SPL_MODULES} ${ZFS_MODULES}
+
projects / pve-kernel-3.10.0.git / blobdiff