RELEASE=3.4
KERNEL_VER=3.10.0
-PKGREL=32
+PKGREL=51
# also include firmware of previous versrion into
# the fw package: fwlist-2.6.32-PREV-pve
-KREL=9
+KREL=22
-RHKVER=229.1.2.el7
+RHKVER=514.el7
KERNELSRCRPM=kernel-${KERNEL_VER}-${RHKVER}.src.rpm
KERNEL_CFG_ORG=${RHKERSRCDIR}/kernel-${KERNEL_VER}-x86_64.config
FW_VER=1.1
-FW_REL=4
+FW_REL=6
FW_DEB=pve-firmware_${FW_VER}-${FW_REL}_all.deb
-E1000EDIR=e1000e-3.1.0.2
+E1000EDIR=e1000e-3.3.5.3
E1000ESRC=${E1000EDIR}.tar.gz
-IGBDIR=igb-5.2.15
+IGBDIR=igb-5.3.5.4
IGBSRC=${IGBDIR}.tar.gz
-IXGBEDIR=ixgbe-3.23.2
+IXGBEDIR=ixgbe-4.5.4
IXGBESRC=${IXGBEDIR}.tar.gz
-I40EDIR=i40e-1.2.37
+I40EDIR=i40e-1.5.25
I40ESRC=${I40EDIR}.tar.gz
+# does not compile with RHEL 7.2 (=327.3.1.el7)
BNX2DIR=netxtreme2-7.11.05
BNX2SRC=${BNX2DIR}.tar.gz
+# does not compile with RHEL 7.2 (=327.3.1.el7)
AACRAIDVER=1.2.1-40700
AACRAIDDIR=aacraid-${AACRAIDVER}.src
AACRAIDSRC=aacraid-linux-src-${AACRAIDVER}.tgz
-HPSAVER=3.4.6
+HPSAVER=3.4.16
HPSADIR=hpsa-${HPSAVER}
-HPSASRC=${HPSADIR}-170.tar.bz2
+HPSASRC=${HPSADIR}-145.tar.bz2
# driver does not compile
#MEGARAID_DIR=megaraid_sas-06.703.11.00
#ISCSITARGETDIR=iscsitarget-1.4.20.2
#ISCSITARGETSRC=${ISCSITARGETDIR}.tar.gz
-ZFSVER=0.6.4
-SPLDIR=spl-spl-${ZFSVER}
-SPLSRC=spl-${ZFSVER}.tar.gz
-ZFSDIR=zfs-zfs-${ZFSVER}
-ZFSSRC=zfs-${ZFSVER}.tar.gz
+SPLDIR=pkg-spl
+SPLSRC=pkg-spl.tar.gz
+ZFSDIR=pkg-zfs
+ZFSSRC=pkg-zfs.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}
-PVE_DEB=${PVEPKG}_${RELEASE}-${PKGREL}_all.deb
all: check_gcc ${DST_DEB} ${FW_DEB} ${HDR_DEB}
download:
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}
+ #wget http://vault.centos.org/7.0.1406/updates/Source/SPackages/${KERNELSRCRPM}
+ wget http://vault.centos.org/7.2.1511/updates/Source/SPackages/${KERNELSRCRPM}
check_gcc:
ifeq ($(CC), cc)
mv fwlist.tmp $@
# fixme: bnx2.ko cnic.ko bnx2x.ko
-data: .compile_mark ${KERNEL_CFG} e1000e.ko igb.ko i40e.ko ixgbe.ko bnx2.ko cnic.ko bnx2x.ko aacraid.ko arcmsr.ko hpsa.ko ${SPL_MODULES} ${ZFS_MODULES}
+# todo: aacraid.ko ?
+data: .compile_mark ${KERNEL_CFG} e1000e.ko igb.ko i40e.ko ixgbe.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 latest ibg driver
install -m 644 igb.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/intel/igb/
## install bnx2 drivers
- install -m 644 bnx2.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/broadcom/
- install -m 644 cnic.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/broadcom/
- install -m 644 bnx2x.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/broadcom/bnx2x/
+ #install -m 644 bnx2.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/broadcom/
+ #install -m 644 cnic.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/broadcom/
+ #install -m 644 bnx2x.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/broadcom/bnx2x/
# install aacraid drivers
- install -m 644 aacraid.ko tmp/lib/modules/${KVNAME}/kernel/drivers/scsi/aacraid/
+ #install -m 644 aacraid.ko tmp/lib/modules/${KVNAME}/kernel/drivers/scsi/aacraid/
# install hpsa driver
install -m 644 hpsa.ko tmp/lib/modules/${KVNAME}/kernel/drivers/scsi/
# install megaraid_sas driver
#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 <../add-empty-ndo_poll_controller-to-veth.patch
- cd ${KERNEL_SRC}; patch -p1 <../override_for_missing_acs_capabilities.patch
- cd ${KERNEL_SRC}; patch -p1 <../vhost-net-extend-device-allocation-to-vmalloc.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
+ cp ${KERNEL_SRC}/drivers/vhost/scsi.c ${KERNEL_SRC}/drivers/vhost/scsi.c.backup
+ # vhost-scsi compile fixes
+ cd ${KERNEL_SRC}; patch -p1 <../vhost-scsi-fixes.patch
+ # nbd compile fix
+ cd ${KERNEL_SRC}; patch -p1 <../nbd-rename-REQ_TYPE_SPECIAL.patch
sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'
touch $@
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 dvb-firmware.git/README 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-6-pve fwlist-2.6.35-1-pve fwlist-2.6.32-13-pve fwlist-2.6.32-14-pve fwlist-2.6.32-20-pve fwlist-2.6.32-21-pve fwlist-3.10.0-3-pve fwlist-${KVNAME}
+${FW_DEB} fw: control.firmware linux-firmware.git/WHENCE dvb-firmware.git/README 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-6-pve fwlist-2.6.35-1-pve fwlist-2.6.32-13-pve fwlist-2.6.32-14-pve fwlist-2.6.32-20-pve fwlist-2.6.32-21-pve fwlist-3.10.0-3-pve fwlist-3.10.0-15-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-20-pve fwdata/lib/firmware
./assemble-firmware.pl fwlist-2.6.32-21-pve fwdata/lib/firmware
./assemble-firmware.pl fwlist-3.10.0-3-pve fwdata/lib/firmware
+ ./assemble-firmware.pl fwlist-3.10.0-15-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: upload
upload: ${DST_DEB} ${HDR_DEB} ${FW_DEB}
- umount /pve/${RELEASE}; mount /pve/${RELEASE} -o rw
- mkdir -p /pve/${RELEASE}/extra
- mkdir -p /pve/${RELEASE}/install
- rm -rf /pve/${RELEASE}/extra/${PACKAGE}_*.deb
- rm -rf /pve/${RELEASE}/extra/${HDRPACKAGE}_*.deb
- rm -rf /pve/${RELEASE}/extra/pve-firmware*.deb
- rm -rf /pve/${RELEASE}/extra/Packages*
- cp ${DST_DEB} ${FW_DEB} ${HDR_DEB} /pve/${RELEASE}/extra
- cd /pve/${RELEASE}/extra; dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz
- umount /pve/${RELEASE}; mount /pve/${RELEASE} -o ro
+ tar -cf - ${DST_DEB} ${HDR_DEB} ${FW_DEB} | ssh repoman@repo.proxmox.com upload --dist wheezy
.PHONY: distclean
distclean: clean
projects / pve-kernel-3.10.0.git / blobdiff