-RELEASE=3.1
+RELEASE=4.0
KERNEL_VER=3.10.0
-PKGREL=1
+PKGREL=31
# also include firmware of previous versrion into
# the fw package: fwlist-2.6.32-PREV-pve
-KREL=1
+KREL=8
-RHKVER=54.0.1.el7
+RHKVER=229.el7
KERNELSRCRPM=kernel-${KERNEL_VER}-${RHKVER}.src.rpm
KERNEL_CFG_ORG=${RHKERSRCDIR}/kernel-${KERNEL_VER}-x86_64.config
FW_VER=1.1
-FW_REL=1
+FW_REL=4
FW_DEB=pve-firmware_${FW_VER}-${FW_REL}_all.deb
-#AOEDIR=aoe6-77
-#AOESRC=${AOEDIR}.tar.gz
+E1000EDIR=e1000e-3.1.0.2
+E1000ESRC=${E1000EDIR}.tar.gz
-#E1000EDIR=e1000e-2.5.4
-#E1000ESRC=${E1000EDIR}.tar.gz
+IGBDIR=igb-5.2.15
+IGBSRC=${IGBDIR}.tar.gz
-#IGBDIR=igb-5.0.6
-#IGBSRC=${IGBDIR}.tar.gz
+IXGBEDIR=ixgbe-3.23.2
+IXGBESRC=${IXGBEDIR}.tar.gz
-#IXGBEDIR=ixgbe-3.18.7
-#IXGBESRC=${IXGBEDIR}.tar.gz
+I40EDIR=i40e-1.2.37
+I40ESRC=${I40EDIR}.tar.gz
-#BNX2DIR=netxtreme2-7.6.62
-#BNX2SRC=${BNX2DIR}.tar.gz
+BNX2DIR=netxtreme2-7.11.05
+BNX2SRC=${BNX2DIR}.tar.gz
-#AACRAIDSRC=aacraid-1.2.1-30300.src.rpm
-#AACRAIDDIR=aacraid-1.2.1
+AACRAIDVER=1.2.1-40700
+AACRAIDDIR=aacraid-${AACRAIDVER}.src
+AACRAIDSRC=aacraid-linux-src-${AACRAIDVER}.tgz
-#MEGARAID_DIR=megaraid_sas-06.600.18.00
+HPSAVER=3.4.6
+HPSADIR=hpsa-${HPSAVER}
+HPSASRC=${HPSADIR}-170.tar.bz2
+
+# driver does not compile
+#MEGARAID_DIR=megaraid_sas-06.703.11.00
#MEGARAID_SRC=${MEGARAID_DIR}-src.tar.gz
-#ARECADIR=arcmsr-1.30.0X.16-20131206
-#ARECASRC=${ARECADIR}.zip
+ARECADIR=arcmsr-1.30.0X.19-140509
+ARECASRC=${ARECADIR}.zip
+# this one does not compile with newer 3.10 kernels!
#RR272XSRC=RR272x_1x-Linux-Src-v1.5-130325-0732.tar.gz
#RR272XDIR=rr272x_1x-linux-src-v1.5
+# this project look dead - no updates since 3 years
#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
+
+# DRBD9
+DRBDVER=9.0.0rc2
+DRBDDIR=drbd-${DRBDVER}
+DRBDSRC=${DRBDDIR}.tar.gz
+DRBD_MODULES=drbd.ko drbd_transport_tcp.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}
-#${PVE_DEB} ${FW_DEB} ${HDR_DEB}
+all: check_gcc ${DST_DEB} ${FW_DEB} ${HDR_DEB} ${PVE_DEB}
${PVE_DEB} pve: proxmox-ve/control proxmox-ve/postinst
rm -rf proxmox-ve/data
sed -e 's/@KVNAME@/${KVNAME}/' -e 's/@KERNEL_VER@/${KERNEL_VER}/' -e 's/@RELEASE@/${RELEASE}/' -e 's/@PKGREL@/${PKGREL}/' <proxmox-ve/control >proxmox-ve/data/DEBIAN/control
sed -e 's/@KERNEL_VER@/${KERNEL_VER}/' <proxmox-ve/postinst >proxmox-ve/data/DEBIAN/postinst
chmod 0755 proxmox-ve/data/DEBIAN/postinst
- echo "git clone git://git.proxmox.com/git/pve-kernel-2.6.32.git\\ngit checkout ${GITVERSION}" > proxmox-ve/data/usr/share/doc/${PVEPKG}/SOURCE
+ echo "git clone git://git.proxmox.com/git/pve-kernel-3.10.0.git\\ngit checkout ${GITVERSION}" > proxmox-ve/data/usr/share/doc/${PVEPKG}/SOURCE
install -m 0644 proxmox-ve/copyright proxmox-ve/data/usr/share/doc/${PVEPKG}
install -m 0644 proxmox-ve/changelog.Debian proxmox-ve/data/usr/share/doc/${PVEPKG}
gzip --best proxmox-ve/data/usr/share/doc/${PVEPKG}/changelog.Debian
dpkg-deb --build proxmox-ve/data ${PVE_DEB}
+.PHONY: download
+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}
+
check_gcc:
- gcc --version|grep "4.7.2" || false
+ifeq ($(CC), cc)
+ gcc --version|grep "4\.9" || false
+else
+ $(CC) --version|grep "4\.9" || false
+endif
-${DST_DEB}: data control.in postinst.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
+ chmod 0755 data/DEBIAN/postrm
install -D -m 644 copyright data/usr/share/doc/${PACKAGE}/copyright
install -D -m 644 changelog.Debian data/usr/share/doc/${PACKAGE}/changelog.Debian
echo "git clone git://git.proxmox.com/git/pve-kernel-3.2.0.git\\ngit checkout ${GITVERSION}" > data/usr/share/doc/${PACKAGE}/SOURCE
./find-firmware.pl data/lib/modules/${KVNAME} >fwlist.tmp
mv fwlist.tmp $@
-# aoe.ko e1000e.ko igb.ko ixgbe.ko bnx2.ko cnic.ko bnx2x.ko iscsi_trgt.ko aacraid.ko megaraid_sas.ko rr272x_1x.ko arcmsr.ko
-data: .compile_mark ${KERNEL_CFG}
+# 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} ${DRBD_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 latest aoe driver
- #install -m 644 aoe.ko tmp/lib/modules/${KVNAME}/kernel/drivers/block/aoe/aoe.ko
- ## install latest ixgbe driver
- #install -m 644 ixgbe.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/ixgbe/
- ## install latest e1000e driver
- #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 latest i40e driver
+ install -m 644 i40e.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/intel/i40e/
+ # install latest ixgbe driver
+ install -m 644 ixgbe.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/intel/ixgbe/
+ # install latest e1000e driver
+ install -m 644 e1000e.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/intel/e1000e/
+ # 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/
- #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 megaraid_sas driver
- #install -m 644 megaraid_sas.ko tmp/lib/modules/${KVNAME}/kernel/drivers/scsi/megaraid/
+ 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 hpsa driver
+ install -m 644 hpsa.ko tmp/lib/modules/${KVNAME}/kernel/drivers/scsi/
+ # install megaraid_sas driver
+ # install -m 644 megaraid_sas.ko tmp/lib/modules/${KVNAME}/kernel/drivers/scsi/megaraid/
## install Highpoint 2710 RAID driver
#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 iscsitarget module
- #install -m 644 -D iscsi_trgt.ko tmp/lib/modules/${KVNAME}/kernel/drivers/scsi/iscsi_trgt.ko
+ 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
+ # install drbd9
+ install -m 644 ${DRBD_MODULES} tmp/lib/modules/${KVNAME}/kernel/drivers/block/drbd
# remove firmware
rm -rf tmp/lib/firmware
# strip debug info
${KERNEL_CFG}: ${KERNEL_CFG_ORG} config-${KERNEL_VER}.diff
cp ${KERNEL_CFG_ORG} ${KERNEL_CFG}.new
- #patch --no-backup ${KERNEL_CFG}.new config-${KERNEL_VER}.diff
+ patch --no-backup ${KERNEL_CFG}.new config-${KERNEL_VER}.diff
mv ${KERNEL_CFG}.new ${KERNEL_CFG}
${KERNEL_SRC}/README: ${KERNEL_SRC}.org/README
#cd ${KERNEL_SRC}; patch -p1 <../bootsplash-3.8.diff
#cd ${KERNEL_SRC}; patch -p1 <../${RHKERSRCDIR}/patch-042stab083
#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 <../bridge-patch.diff
+ cd ${KERNEL_SRC}; patch -p1 <../bridge-forward-ipv6-neighbor-solicitation.patch
#cd ${KERNEL_SRC}; patch -p1 <../kvm-fix-invalid-secondary-exec-controls.patch
#cd ${KERNEL_SRC}; patch -p1 <../fix-aspm-policy.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-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
sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'
touch $@
# make -C ${TOP}/${RR272XDIR}/product/rr272x/linux KERNELDIR=${TOP}/${KERNEL_SRC}
# cp ${RR272XDIR}/product/rr272x/linux/$@ .
-#megaraid_sas.ko: .compile_mark ${MEGARAID_SRC}
-# rm -rf ${MEGARAID_DIR}
-# tar xf ${MEGARAID_SRC}
-# mkdir -p /lib/modules/${KVNAME}
-# ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
-# make -C ${TOP}/${KERNEL_SRC} M=${TOP}/${MEGARAID_DIR} modules
-# cp ${MEGARAID_DIR}/megaraid_sas.ko .
-
-#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
-# tar xf ${AOESRC}
-# mkdir -p /lib/modules/${KVNAME}
-# ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
-# cd ${AOEDIR}; make KVER=${KVNAME}
-# cp ${AOEDIR}/linux/drivers/block/aoe/aoe.ko aoe.ko
-
-#e1000e.ko e1000e: .compile_mark ${E1000ESRC}
-# rm -rf ${E1000EDIR}
-# tar xf ${E1000ESRC}
-# mkdir -p /lib/modules/${KVNAME}
-# ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
-# cd ${E1000EDIR}/src; make BUILD_KERNEL=${KVNAME}
-# cp ${E1000EDIR}/src/e1000e.ko e1000e.ko
-
-#igb.ko igb: .compile_mark ${IGBSRC}
-# rm -rf ${IGBDIR}
-# tar xf ${IGBSRC}
-# mkdir -p /lib/modules/${KVNAME}
-# ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
-# cd ${IGBDIR}/src; make BUILD_KERNEL=${KVNAME}
-# cp ${IGBDIR}/src/igb.ko igb.ko
-
-#ixgbe.ko ixgbe: .compile_mark ${IXGBESRC}
-# rm -rf ${IXGBEDIR}
-# tar xf ${IXGBESRC}
-# mkdir -p /lib/modules/${KVNAME}
-# ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
-# 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}
-# mkdir ${ARECADIR}; cd ${ARECADIR}; unzip ../${ARECASRC}
-# mkdir -p /lib/modules/${KVNAME}
-# ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
-# cd ${ARECADIR}; make -C ${TOP}/${KERNEL_SRC} SUBDIRS=${TOP}/${ARECADIR} modules
-# cp ${ARECADIR}/arcmsr.ko arcmsr.ko
+aacraid.ko: .compile_mark ${AACRAIDSRC}
+ rm -rf ${AACRAIDDIR}
+ mkdir ${AACRAIDDIR}
+ cd ${AACRAIDDIR};tar xzf ../${AACRAIDSRC}
+ cd ${AACRAIDDIR};rpm2cpio aacraid-${AACRAIDVER}.src.rpm|cpio -i
+ cd ${AACRAIDDIR};tar xf 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 .
+
+hpsa.ko hpsa: .compile_mark ${HPSASRC}
+ rm -rf ${HPSADIR}
+ tar xf ${HPSASRC}
+ sed -i ${HPSADIR}/drivers/scsi/hpsa_kernel_compat.h -e 's/^\/\* #define RHEL7.*/#define RHEL7/'
+ mkdir -p /lib/modules/${KVNAME}
+ ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
+ make -C ${TOP}/${KERNEL_SRC} M=${TOP}/${HPSADIR}/drivers/scsi modules
+ cp ${HPSADIR}/drivers/scsi/hpsa.ko hpsa.ko
+
+e1000e.ko e1000e: .compile_mark ${E1000ESRC}
+ rm -rf ${E1000EDIR}
+ tar xf ${E1000ESRC}
+ mkdir -p /lib/modules/${KVNAME}
+ ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
+ cd ${E1000EDIR}/src; make BUILD_KERNEL=${KVNAME}
+ cp ${E1000EDIR}/src/e1000e.ko e1000e.ko
+
+igb.ko igb: .compile_mark ${IGBSRC}
+ rm -rf ${IGBDIR}
+ tar xf ${IGBSRC}
+ mkdir -p /lib/modules/${KVNAME}
+ ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
+ cd ${IGBDIR}/src; make BUILD_KERNEL=${KVNAME}
+ cp ${IGBDIR}/src/igb.ko igb.ko
+
+ixgbe.ko ixgbe: .compile_mark ${IXGBESRC}
+ rm -rf ${IXGBEDIR}
+ tar xf ${IXGBESRC}
+ mkdir -p /lib/modules/${KVNAME}
+ ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
+ cd ${IXGBEDIR}/src; make CFLAGS_EXTRA="-DIXGBE_NO_LRO" BUILD_KERNEL=${KVNAME}
+ cp ${IXGBEDIR}/src/ixgbe.ko ixgbe.ko
+
+i40e.ko i40e: .compile_mark ${I40ESRC}
+ rm -rf ${I40EDIR}
+ tar xf ${I40ESRC}
+ mkdir -p /lib/modules/${KVNAME}
+ ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
+ cd ${I40EDIR}/src; make BUILD_KERNEL=${KVNAME}
+ cp ${I40EDIR}/src/i40e.ko i40e.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}
+ mkdir ${ARECADIR}; cd ${ARECADIR}; unzip ../${ARECASRC}
+ mkdir -p /lib/modules/${KVNAME}
+ ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
+ 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
+
+.PHONY: update-drbd
+update-drbd:
+ rm -rf ${DRBDDIR} ${DRBDSRC} drbd-9.0
+ git clone --recursive git://git.drbd.org/drbd-9.0
+ cd drbd-9.0; make tarball
+ mv drbd-9.0/${DRBDSRC} ${DRBDSRC}
+
+.PHONY: drbd
+drbd ${DRBD_MODULES}: .compile_mark ${DRBDSRC}
+ rm -rf ${DRBDDIR}
+ tar xzf ${DRBDSRC}
+ mkdir -p /lib/modules/${KVNAME}
+ ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
+ cd ${DRBDDIR}; make KVER=${KVNAME}
+ mv ${DRBDDIR}/drbd/drbd.ko drbd.ko
+ mv ${DRBDDIR}/drbd/drbd_transport_tcp.ko drbd_transport_tcp.ko
#iscsi_trgt.ko: .compile_mark ${ISCSITARGETSRC}
# rm -rf ${ISCSITARGETDIR}
chmod 0755 $(headers_tmp)/DEBIAN/postinst
install -D -m 644 copyright $(headers_tmp)/usr/share/doc/${HDRPACKAGE}/copyright
install -D -m 644 changelog.Debian $(headers_tmp)/usr/share/doc/${HDRPACKAGE}/changelog.Debian
- echo "git clone git://git.proxmox.com/git/pve-kernel-2.6.32.git\\ngit checkout ${GITVERSION}" > $(headers_tmp)/usr/share/doc/${HDRPACKAGE}/SOURCE
+ echo "git clone git://git.proxmox.com/git/pve-kernel-3.10.0.git\\ngit checkout ${GITVERSION}" > $(headers_tmp)/usr/share/doc/${HDRPACKAGE}/SOURCE
gzip -f --best $(headers_tmp)/usr/share/doc/${HDRPACKAGE}/changelog.Debian
install -m 0644 ${KERNEL_SRC}/.config $(headers_dir)
install -m 0644 ${KERNEL_SRC}/Module.symvers $(headers_dir)
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-${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-${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-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
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
dpkg-deb --build fwdata ${FW_DEB}
.PHONY: upload
-upload: ${DST_DEB} # ${PVE_DEB} ${HDR_DEB} ${FW_DEB}
+upload: ${DST_DEB} ${HDR_DEB} ${FW_DEB} ${PVE_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/${PVEPKG}_*.deb
-# rm -rf /pve/${RELEASE}/extra/pve-firmware*.deb
+ rm -rf /pve/${RELEASE}/extra/pve-firmware*.deb
rm -rf /pve/${RELEASE}/extra/Packages*
-# cp ${DST_DEB} ${PVE_DEB} ${HDR_DEB} ${FW_DEB} /pve/${RELEASE}/extra
- cp ${DST_DEB} /pve/${RELEASE}/extra
+ cp ${DST_DEB} ${FW_DEB} ${HDR_DEB} ${PVE_DEB} /pve/${RELEASE}/extra
cd /pve/${RELEASE}/extra; dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz
umount /pve/${RELEASE}; mount /pve/${RELEASE} -o ro
.PHONY: distclean
distclean: clean
- rm -rf linux-firmware.git linux-firmware-from-kernel.git ${KERNEL_SRC}.org ${RHKERSRCDIR}
+ rm -rf linux-firmware.git dvb-firmware.git ${KERNEL_SRC}.org ${RHKERSRCDIR}
.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} ${BNX2DIR} bnx2.ko cnic.ko bnx2x.ko aacraid.ko ${AACRAIDDIR} megaraid_sas.ko ${MEGARAID_DIR} 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 ${I40EDIR} ${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} hpsa.ko ${HPSADIR} ${DRBDDIR} drbd-9.0
+