X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile;h=057103cc1c405db8d508ed31af21ccc3e04e8563;hb=af1a153d730f166562940ce9101c0567905fdfc1;hp=7e05e92f9ea6824107223c72c1e0484b3840d28e;hpb=826d65034bdccbce00ce9642dc95fc31c9ced122;p=pve-kernel-2.6.32.git diff --git a/Makefile b/Makefile index 7e05e92..057103c 100644 --- a/Makefile +++ b/Makefile @@ -1,13 +1,13 @@ -RELEASE=3.1 +RELEASE=3.3 KERNEL_VER=2.6.32 -PKGREL=110 +PKGREL=140 # also include firmware of previous versrion into # the fw package: fwlist-2.6.32-PREV-pve -KREL=24 +KREL=34 -RHKVER=358.14.1.el6 -OVZVER=042stab079.6 +RHKVER=431.29.2.el6 +OVZVER=042stab094.8 KERNELSRCRPM=vzkernel-${KERNEL_VER}-${OVZVER}.src.rpm @@ -26,33 +26,30 @@ RHKERSRCDIR=rh-kernel-src KERNEL_CFG=config-${KERNEL_VER} KERNEL_CFG_ORG=config-${KERNEL_VER}-${OVZVER}.x86_64 -FW_VER=1.0 -FW_REL=23 -FW_DEB=pve-firmware_${FW_VER}-${FW_REL}_all.deb - AOEDIR=aoe6-77 AOESRC=${AOEDIR}.tar.gz -E1000EDIR=e1000e-2.5.4 +E1000EDIR=e1000e-3.1.0.2 E1000ESRC=${E1000EDIR}.tar.gz -IGBDIR=igb-5.0.5 +IGBDIR=igb-5.2.9.4 IGBSRC=${IGBDIR}.tar.gz -IXGBEDIR=ixgbe-3.17.3 +IXGBEDIR=ixgbe-3.21.2 IXGBESRC=${IXGBEDIR}.tar.gz -BNX2DIR=netxtreme2-7.4.27 +BNX2DIR=netxtreme2-7.10.14 BNX2SRC=${BNX2DIR}.tar.gz -AACRAIDSRC=aacraid-1.2.1-30300.src.rpm -AACRAIDDIR=aacraid-1.2.1 +AACRAIDVER=1.2.1-40700 +AACRAIDSRC=aacraid-linux-src-${AACRAIDVER}.tgz +AACRAIDDIR=aacraid -MEGARAID_DIR=megaraid_sas-06.600.18.00 +MEGARAID_DIR=megaraid_sas-06.703.11.00 MEGARAID_SRC=${MEGARAID_DIR}-src.tar.gz -#ARECADIR=arcmsr.1.20.0X.15-110330 -#ARECASRC=${ARECADIR}.zip +ARECADIR=arcmsr-1.30.0X.19-140509 +ARECASRC=${ARECADIR}.zip RR272XSRC=RR272x_1x-Linux-Src-v1.5-130325-0732.tar.gz RR272XDIR=rr272x_1x-linux-src-v1.5 @@ -60,12 +57,15 @@ RR272XDIR=rr272x_1x-linux-src-v1.5 ISCSITARGETDIR=iscsitarget-1.4.20.2 ISCSITARGETSRC=${ISCSITARGETDIR}.tar.gz +OVSDIR=openvswitch-2.3.0 +OVSSRC=${OVSDIR}.tar.gz + 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} ${PVE_DEB} ${HDR_DEB} ${PVE_DEB} pve: proxmox-ve/control proxmox-ve/postinst rm -rf proxmox-ve/data @@ -81,14 +81,20 @@ ${PVE_DEB} pve: proxmox-ve/control proxmox-ve/postinst gzip --best proxmox-ve/data/usr/share/doc/${PVEPKG}/changelog.Debian dpkg-deb --build proxmox-ve/data ${PVE_DEB} -check_gcc: - gcc --version|grep "4.7.2" || false +check_gcc: +ifeq ($(CC), cc) + gcc --version|grep "4\.7\.2" || false +else + $(CC) --version|grep "4\.7" || false +endif -${DST_DEB}: data control.in postinst.in +${DST_DEB}: data control.in postinst.in postrm.in mkdir -p data/DEBIAN sed -e 's/@KERNEL_VER@/${KERNEL_VER}/' -e 's/@KVNAME@/${KVNAME}/' -e 's/@PKGREL@/${PKGREL}/' data/DEBIAN/control sed -e 's/@@KVNAME@@/${KVNAME}/g' data/DEBIAN/postinst chmod 0755 data/DEBIAN/postinst + sed -e 's/@@KVNAME@@/${KVNAME}/g' 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-2.6.32.git\\ngit checkout ${GITVERSION}" > data/usr/share/doc/${PACKAGE}/SOURCE @@ -99,17 +105,20 @@ ${DST_DEB}: data control.in postinst.in lintian ${DST_DEB} -fwlist-${KVNAME}: data +fwlist-${KVNAME} fwtest: data ./find-firmware.pl data/lib/modules/${KVNAME} >fwlist.tmp + cmp fwlist.tmp fwlist-2.6.32-20-pve mv fwlist.tmp $@ -data: .compile_mark ${KERNEL_CFG} 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 +data: .compile_mark ${KERNEL_CFG} 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 openvswitch.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 ${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 OVS driver + install -m 644 openvswitch.ko tmp/lib/modules/${KVNAME}/kernel/net/openvswitch/openvswitch.ko # install latest aoe driver install -m 644 aoe.ko tmp/lib/modules/${KVNAME}/kernel/drivers/block/aoe/aoe.ko # install latest ixgbe driver @@ -129,7 +138,7 @@ data: .compile_mark ${KERNEL_CFG} aoe.ko e1000e.ko igb.ko ixgbe.ko bnx2.ko cnic. # 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 -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 @@ -155,19 +164,24 @@ ${KERNEL_SRC}/README: ${KERNEL_SRC}.org/README 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-042stab079 + cd ${KERNEL_SRC}; patch -p1 <../${RHKERSRCDIR}/patch-042stab094 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 <../kvm-fix-invalid-secondary-exec-controls.patch + #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 + # this enable querier by default + 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 <../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 <../kvm-x86-ignore-ioapic-polarity.patch sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/' touch $@ @@ -202,8 +216,9 @@ megaraid_sas.ko: .compile_mark ${MEGARAID_SRC} aacraid.ko: .compile_mark ${AACRAIDSRC} rm -rf ${AACRAIDDIR} mkdir ${AACRAIDDIR} - cd ${AACRAIDDIR};rpm2cpio ../${AACRAIDSRC} |cpio -i - cd ${AACRAIDDIR};tar xzf aacraid_source.tgz + 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 @@ -251,13 +266,24 @@ bnx2.ko cnic.ko bnx2x.ko: ${BNX2SRC} 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} -# 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 +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 + +openvswitch.ko: .compile_mark ${OVSSRC} + rm -rf ${OVSDIR} + tar xf ${OVSSRC} + mkdir -p /lib/modules/${KVNAME} + ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build + cd ${OVSDIR}; ln -s ../ovspatches/ patches; quilt push -a + cd ${OVSDIR}; ./boot.sh + cd ${OVSDIR}; ./configure --with-linux=${TOP}/${KERNEL_SRC} + cd ${OVSDIR}; make -C datapath/linux + cp ${OVSDIR}/datapath/linux/openvswitch.ko openvswitch.ko iscsi_trgt.ko: .compile_mark ${ISCSITARGETSRC} rm -rf ${ISCSITARGETDIR} @@ -292,48 +318,16 @@ ${HDR_DEB} hdr: .compile_mark headers-control.in headers-postinst.in dpkg-deb --build $(headers_tmp) ${HDR_DEB} #lintian ${HDR_DEB} -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-2.6.32-20-pve fwlist-${KVNAME} - rm -rf fwdata - mkdir -p fwdata/lib/firmware - ./assemble-firmware.pl fwlist-${KVNAME} fwdata/lib/firmware - # include any files from older/newer kernels here - ./assemble-firmware.pl fwlist-2.6.24-12-pve fwdata/lib/firmware - ./assemble-firmware.pl fwlist-2.6.18-2-pve 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 - ./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 - cp linux-firmware.git/LICEN[CS]E* fwdata/usr/share/doc/pve-firmware/licenses - install -D -m 0644 changelog.firmware fwdata/usr/share/doc/pve-firmware/changelog.Debian - gzip -9 fwdata/usr/share/doc/pve-firmware/changelog.Debian - echo "git clone git://git.proxmox.com/git/pve-kernel-2.6.32.git\\ngit checkout ${GITVERSION}" >fwdata/usr/share/doc/pve-firmware/SOURCE - install -d fwdata/DEBIAN - sed -e 's/@VERSION@/${FW_VER}-${FW_REL}/' fwdata/DEBIAN/control - dpkg-deb --build fwdata ${FW_DEB} - .PHONY: upload -upload: ${DST_DEB} ${PVE_DEB} ${HDR_DEB} ${FW_DEB} +upload: ${DST_DEB} ${PVE_DEB} ${HDR_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/Packages* - cp ${DST_DEB} ${PVE_DEB} ${HDR_DEB} ${FW_DEB} /pve/${RELEASE}/extra + cp ${DST_DEB} ${PVE_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 @@ -343,7 +337,7 @@ distclean: clean .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} + 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} ${OVSDIR} openvswitch.ko