X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile;h=cd95a3d72e2a23dc2499be4bc97d24db4ebe74df;hb=c11e0ec56a85a2049e4c0a32e7a9335429f7bf62;hp=e098d8db8e5f3b39c7631fa50f63531058bcc3e0;hpb=c6cb7710a8fed075fa551732a67e81fa951c0f9f;p=pve-kernel-jessie.git diff --git a/Makefile b/Makefile index e098d8d..cb7a506 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,13 @@ -RELEASE=4.0 +RELEASE=4.4 -KERNEL_VER=4.2.0 -PKGREL=9 -# also i7clude firmware of previous versrion into +# also update proxmox-ve/changelog if you change KERNEL_VER or KREL +KERNEL_VER=4.4.35 +PKGREL=76 +# also include firmware of previous version into # the fw package: fwlist-2.6.32-PREV-pve KREL=1 -KERNEL_SRC=ubuntu-wily +KERNEL_SRC=ubuntu-xenial KERNELSRCTAR=${KERNEL_SRC}.tgz EXTRAVERSION=-${KREL}-pve @@ -22,19 +23,17 @@ TOP=$(shell pwd) KERNEL_CFG_ORG=config-${KERNEL_VER}.org FW_VER=1.1 -FW_REL=7 +FW_REL=10 FW_DEB=pve-firmware_${FW_VER}-${FW_REL}_all.deb -# does not compile with kernel 3.19.8 -#E1000EDIR=e1000e-3.1.0.2 -#E1000ESRC=${E1000EDIR}.tar.gz +E1000EDIR=e1000e-3.3.5 +E1000ESRC=${E1000EDIR}.tar.gz -#IGBDIR=igb-5.3.2 -#IGBSRC=${IGBDIR}.tar.gz +IGBDIR=igb-5.3.5.3 +IGBSRC=${IGBDIR}.tar.gz -# does not compile with kernel 4.1 -#IXGBEDIR=ixgbe-4.1.2 -#IXGBESRC=${IXGBEDIR}.tar.gz +IXGBEDIR=ixgbe-4.4.6 +IXGBESRC=${IXGBEDIR}.tar.gz # does not compile with kernel 3.19.8 #I40EDIR=i40e-1.2.38 @@ -73,7 +72,7 @@ ZFS_MODULES=zfs.ko zavl.ko znvpair.ko zunicode.ko zcommon.ko zpios.ko SPL_MODULES=spl.ko splat.ko # DRBD9 -DRBDVER=9.0.0 +DRBDVER=9.0.5-1 DRBDDIR=drbd-${DRBDVER} DRBDSRC=${DRBDDIR}.tar.gz DRBD_MODULES=drbd.ko drbd_transport_tcp.ko @@ -82,29 +81,53 @@ DST_DEB=${PACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb HDR_DEB=${HDRPACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb PVEPKG=proxmox-ve PVE_DEB=${PVEPKG}_${RELEASE}-${PKGREL}_all.deb +VIRTUALHDRPACKAGE=pve-headers +VIRTUAL_HDR_DEB=${VIRTUALHDRPACKAGE}_${RELEASE}-${PKGREL}_all.deb + +LINUX_TOOLS_PKG=linux-tools-4.4 +LINUX_TOOLS_DEB=${LINUX_TOOLS_PKG}_${KERNEL_VER}-${PKGREL}_amd64.deb + +DEBS=${DST_DEB} ${HDR_DEB} ${FW_DEB} ${PVE_DEB} ${VIRTUAL_HDR_DEB} ${LINUX_TOOLS_DEB} + +PVE_RELEASE_KEYS= \ + proxmox-ve/proxmox-release-4.x.pubkey \ + proxmox-ve/proxmox-release-5.x.pubkey -all: check_gcc ${DST_DEB} ${FW_DEB} ${HDR_DEB} ${PVE_DEB} +all: check_gcc ${DEBS} -${PVE_DEB} pve: proxmox-ve/control proxmox-ve/postinst +${PVE_DEB} pve: proxmox-ve/control proxmox-ve/postinst ${PVE_RELEASE_KEYS} rm -rf proxmox-ve/data mkdir -p proxmox-ve/data/DEBIAN mkdir -p proxmox-ve/data/usr/share/doc/${PVEPKG}/ - install -m 0644 proxmox-ve/proxmox-release\@proxmox.com.pubkey proxmox-ve/data/usr/share/doc/${PVEPKG} + mkdir -p proxmox-ve/data/etc/apt/trusted.gpg.d + gpg2 --no-default-keyring --keyring ./proxmox-ve/data/etc/apt/trusted.gpg.d/proxmox-ve.gpg --import ${PVE_RELEASE_KEYS} sed -e 's/@KVNAME@/${KVNAME}/' -e 's/@KERNEL_VER@/${KERNEL_VER}/' -e 's/@RELEASE@/${RELEASE}/' -e 's/@PKGREL@/${PKGREL}/' proxmox-ve/data/DEBIAN/control - install -m 0755 proxmox-ve/postinst proxmox-ve/data/DEBIAN/postinst - echo "git clone git://git.proxmox.com/git/pve-kernel-4.0.git\\ngit checkout ${GITVERSION}" > proxmox-ve/data/usr/share/doc/${PVEPKG}/SOURCE + sed -e 's/@KVNAME@/${KVNAME}/' proxmox-ve/data/DEBIAN/postinst + chmod 0755 proxmox-ve/data/DEBIAN/postinst + install -m 0755 proxmox-ve/postrm proxmox-ve/data/DEBIAN/postrm + echo "git clone git://git.proxmox.com/git/pve-kernel.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} +${VIRTUAL_HDR_DEB} pve-headers: proxmox-ve/pve-headers.control + rm -rf proxmox-ve/data + mkdir -p proxmox-ve/data/DEBIAN + mkdir -p proxmox-ve/data/usr/share/doc/${VIRTUALHDRPACKAGE}/ + sed -e 's/@KVNAME@/${KVNAME}/' -e 's/@KERNEL_VER@/${KERNEL_VER}/' -e 's/@RELEASE@/${RELEASE}/' -e 's/@PKGREL@/${PKGREL}/' proxmox-ve/data/DEBIAN/control + echo "git clone git://git.proxmox.com/git/pve-kernel-4.0.git\\ngit checkout ${GITVERSION}" > proxmox-ve/data/usr/share/doc/${VIRTUALHDRPACKAGE}/SOURCE + install -m 0644 proxmox-ve/copyright proxmox-ve/data/usr/share/doc/${VIRTUALHDRPACKAGE} + install -m 0644 proxmox-ve/changelog.Debian proxmox-ve/data/usr/share/doc/${VIRTUALHDRPACKAGE} + gzip --best proxmox-ve/data/usr/share/doc/${VIRTUALHDRPACKAGE}/changelog.Debian + dpkg-deb --build proxmox-ve/data ${VIRTUAL_HDR_DEB} + # see https://wiki.ubuntu.com/Kernel/Dev/KernelGitGuide -# changelog: https://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux/+git/wily/log/ .PHONY: download download: rm -rf ${KERNEL_SRC} ${KERNELSRCTAR} #git clone git://kernel.ubuntu.com/ubuntu/ubuntu-vivid.git - git clone git://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux/+git/wily ${KERNEL_SRC} + git clone --single-branch -b Ubuntu-4.4.0-52.73 git://kernel.ubuntu.com/ubuntu/ubuntu-xenial.git ${KERNEL_SRC} tar czf ${KERNELSRCTAR} --exclude .git ${KERNEL_SRC} check_gcc: @@ -125,19 +148,32 @@ ${DST_DEB}: data control.in prerm.in postinst.in postrm.in copyright changelog.D 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 + echo "git clone git://git.proxmox.com/git/pve-kernel.git\\ngit checkout ${GITVERSION}" > data/usr/share/doc/${PACKAGE}/SOURCE gzip -f --best data/usr/share/doc/${PACKAGE}/changelog.Debian rm -f data/lib/modules/${KVNAME}/source rm -f data/lib/modules/${KVNAME}/build dpkg-deb --build data ${DST_DEB} lintian ${DST_DEB} +LINUX_TOOLS_DH_LIST=strip installchangelogs installdocs compress shlibdeps gencontrol md5sums builddeb + +${LINUX_TOOLS_DEB}: .compile_mark control.tools changelog.Debian copyright + rm -rf linux-tools ${LINUX_TOOLS_DEB} + mkdir -p linux-tools/debian + cp control.tools linux-tools/debian/control + echo 9 > linux-tools/debian/compat + cp changelog.Debian linux-tools/debian/changelog + cp copyright linux-tools/debian + mkdir -p linux-tools/debian/linux-tools-4.4/usr/bin + install -m 0755 ${KERNEL_SRC}/tools/perf/perf linux-tools/debian/linux-tools-4.4/usr/bin/perf_4.4 + cd linux-tools; for i in ${LINUX_TOOLS_DH_LIST}; do dh_$$i; done + lintian ${LINUX_TOOLS_DEB} fwlist-${KVNAME}: data ./find-firmware.pl data/lib/modules/${KVNAME} >fwlist.tmp mv fwlist.tmp $@ -data: .compile_mark ${SPL_MODULES} ${ZFS_MODULES} ${DRBD_MODULES} +data: .compile_mark igb.ko ixgbe.ko e1000e.ko ${SPL_MODULES} ${ZFS_MODULES} ${DRBD_MODULES} rm -rf data tmp; mkdir -p tmp/lib/modules/${KVNAME} mkdir tmp/boot install -m 644 ${KERNEL_SRC}/.config tmp/boot/config-${KVNAME} @@ -145,9 +181,11 @@ data: .compile_mark ${SPL_MODULES} ${ZFS_MODULES} ${DRBD_MODULES} 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 ibg driver - #install -m 644 igb.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/intel/igb/ - ## install latest ixgbe driver - #install -m 644 ixgbe.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/intel/ixgbe/ + install -m 644 igb.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/intel/igb/ + # 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 hpsa driver #install -m 644 hpsa.ko tmp/lib/modules/${KVNAME}/kernel/drivers/scsi/ # install zfs drivers @@ -160,10 +198,20 @@ data: .compile_mark ${SPL_MODULES} ${ZFS_MODULES} ${DRBD_MODULES} # strip debug info find tmp/lib/modules -name \*.ko -print | while read f ; do strip --strip-debug "$$f"; done # finalize - depmod -b tmp/ ${KVNAME} + /sbin/depmod -b tmp/ ${KVNAME} + # Autogenerate blacklist for watchdog devices (see README) + install -m 0755 -d tmp/lib/modprobe.d + ls tmp/lib/modules/${KVNAME}/kernel/drivers/watchdog/ > watchdog-blacklist.tmp + echo ipmi_watchdog.ko >> watchdog-blacklist.tmp + cat watchdog-blacklist.tmp|sed -e 's/^/blacklist /' -e 's/.ko$$//'|sort -u > tmp/lib/modprobe.d/blacklist_${PACKAGE}.conf mv tmp data PVE_CONFIG_OPTS= \ +-m INTEL_MEI_WDT \ +-d CONFIG_SND_PCM_OSS \ +-d CONFIG_TRANSPARENT_HUGEPAGE_MADVISE \ +-d CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS \ +-e CONFIG_TRANSPARENT_HUGEPAGE_NEVER \ -m CONFIG_CEPH_FS \ -m CONFIG_BLK_DEV_NBD \ -m CONFIG_BLK_DEV_RBD \ @@ -176,6 +224,7 @@ PVE_CONFIG_OPTS= \ -e CONFIG_BLK_DEV_SD \ -e CONFIG_BLK_DEV_SR \ -e CONFIG_BLK_DEV_DM \ +-e CONFIG_BLK_DEV_NVME \ -d CONFIG_INPUT_EVBUG \ -d CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND \ -e CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE \ @@ -194,20 +243,32 @@ PVE_CONFIG_OPTS= \ cd ${KERNEL_SRC}; ./scripts/config ${PVE_CONFIG_OPTS} cd ${KERNEL_SRC}; make oldconfig cd ${KERNEL_SRC}; make -j 8 + make -C ${KERNEL_SRC}/tools/perf prefix=/usr HAVE_CPLUS_DEMANGLE=1 NO_LIBPYTHON=1 NO_LIBPERL=1 PYTHON=python2.7 + make -C ${KERNEL_SRC}/tools/perf man touch $@ ${KERNEL_SRC}/README ${KERNEL_CFG_ORG}: ${KERNELSRCTAR} rm -rf ${KERNEL_SRC} tar xf ${KERNELSRCTAR} cat ${KERNEL_SRC}/debian.master/config/config.common.ubuntu ${KERNEL_SRC}/debian.master/config/amd64/config.common.amd64 ${KERNEL_SRC}/debian.master/config/amd64/config.flavour.generic > ${KERNEL_CFG_ORG} - # see https://github.com/zfsonlinux/zfs/issues/3511 - # should be fixed with zfs 0.6.5 - cd ${KERNEL_SRC}; patch -p1 <../0001-Revert-block-loop-switch-to-VFS-ITER_BVEC.patch + cd ${KERNEL_SRC}; patch -p1 <../add-thp-never-option.patch cd ${KERNEL_SRC}; patch -p1 <../bridge-patch.diff #cd ${KERNEL_SRC}; patch -p1 <../bridge-forward-ipv6-neighbor-solicitation.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 <../override_for_missing_acs_capabilities.patch #cd ${KERNEL_SRC}; patch -p1 <../vhost-net-extend-device-allocation-to-vmalloc.patch + cd ${KERNEL_SRC}; patch -p1 <../bug-950-tcp-fix-tcp_mark_head_lost-to-check-skb-len-before-f.patch + cd ${KERNEL_SRC}; patch -p1 < ../981-1-PCI-Reverse-standard-ACS-vs-device-specific-ACS-enabling.patch + cd ${KERNEL_SRC}; patch -p1 < ../981-2-PCI-Quirk-PCH-root-port-ACS-for-Sunrise-Point.patch + cd ${KERNEL_SRC}; patch -p1 < ../kvm-dynamic-halt-polling-disable-default.patch + # avoid iAMT watchdog problems (not a real watchdog, because does not reset the host) + cd ${KERNEL_SRC}; patch -p1 < ../watchdog_implement-mei-iamt-driver.patch + cd ${KERNEL_SRC}; patch -p1 < ../mei_drop-watchdog-code.patch + cd ${KERNEL_SRC}; patch -p1 < ../mei_bus-whitelist-watchdog-client.patch + # IPoIB performance regression fix + cd ${KERNEL_SRC}; patch -p1 < ../IB-ipoib-move-back-the-IB-LL-address-into-the-hard-header.patch + cd ${KERNEL_SRC}; patch -p1 < ../bnx2x-allow-adding-VLANs-while-interface-is-down.patch + cd ${KERNEL_SRC}; patch -p1 < ../CVE-2016-8655-packet-fix-race-condition.patch sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/' touch $@ @@ -217,67 +278,65 @@ aacraid.ko: .compile_mark ${AACRAIDSRC} 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 + [ ! -e /lib/modules/${KVNAME}/build ] || rm /lib/modules/${KVNAME}/build + make -C ${TOP}/${KERNEL_SRC} M=${TOP}/${AACRAIDDIR} KSRC=${TOP}/${KERNEL_SRC} 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 + [ ! -e /lib/modules/${KVNAME}/build ] || rm /lib/modules/${KVNAME}/build + make -C ${TOP}/${KERNEL_SRC} M=${TOP}/${HPSADIR}/drivers/scsi KSRC=${TOP}/${KERNEL_SRC} 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} + [ ! -e /lib/modules/${KVNAME}/build ] || rm /lib/modules/${KVNAME}/build + # patch used for igb and e1000e! + cd ${E1000EDIR}; patch -p1 < ../igb_e1000e-kcompat-version-check-fix.patch + cd ${E1000EDIR}/src; make BUILD_KERNEL=${KVNAME} KSRC=${TOP}/${KERNEL_SRC} 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} + [ ! -e /lib/modules/${KVNAME}/build ] || rm /lib/modules/${KVNAME}/build + # patch used for igb and e1000e! + cd ${IGBDIR}; patch -p1 < ../igb_e1000e-kcompat-version-check-fix.patch + cd ${IGBDIR}/src; make BUILD_KERNEL=${KVNAME} KSRC=${TOP}/${KERNEL_SRC} 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} + [ ! -e /lib/modules/${KVNAME}/build ] || rm /lib/modules/${KVNAME}/build + # HACK: for kernel < 4.6, we need to set UTS_UBUNTU_RELEASE_ABI manually + # to make it compile + cd ${IXGBEDIR}/src; make CFLAGS_EXTRA="-DIXGBE_NO_LRO -DUTS_UBUNTU_RELEASE_ABI=22" BUILD_KERNEL=${KVNAME} KSRC=${TOP}/${KERNEL_SRC} 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} + [ ! -e /lib/modules/${KVNAME}/build ] || rm /lib/modules/${KVNAME}/build + cd ${I40EDIR}/src; make BUILD_KERNEL=${KVNAME} KSRC=${TOP}/${KERNEL_SRC} 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} + [ ! -e /lib/modules/${KVNAME}/build ] || rm /lib/modules/${KVNAME}/build + cd ${BNX2DIR}; make -C bnx2/src KVER=${KVNAME} KSRC=${TOP}/${KERNEL_SRC} + cd ${BNX2DIR}; make -C bnx2x/src KVER=${KVNAME} KSRC=${TOP}/${KERNEL_SRC} 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 + [ ! -e /lib/modules/${KVNAME}/build ] || rm /lib/modules/${KVNAME}/build + cd ${ARECADIR}; make -C ${TOP}/${KERNEL_SRC} SUBDIRS=${TOP}/${ARECADIR} KSRC=${TOP}/${KERNEL_SRC} modules cp ${ARECADIR}/arcmsr.ko arcmsr.ko ${SPL_MODULES}: .compile_mark ${SPLSRC} @@ -292,6 +351,7 @@ ${SPL_MODULES}: .compile_mark ${SPLSRC} ${ZFS_MODULES}: .compile_mark ${ZFSSRC} rm -rf ${ZFSDIR} tar xf ${ZFSSRC} + cd ${ZFSDIR}; patch -p1 < ../zfs-fix-zpool-import-bug-with-nested-pools.patch 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 @@ -313,10 +373,8 @@ update-drbd: drbd ${DRBD_MODULES}: .compile_mark ${DRBDSRC} rm -rf ${DRBDDIR} tar xzf ${DRBDSRC} - cd ${DRBDDIR}; ln -s ../drbdpatches patches; quilt push -a - mkdir -p /lib/modules/${KVNAME} - ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build - cd ${DRBDDIR}; make KVER=${KVNAME} + [ ! -e /lib/modules/${KVNAME}/build ] || rm /lib/modules/${KVNAME}/build + cd ${DRBDDIR}; make KVER=${KVNAME} KDIR=${TOP}/${KERNEL_SRC} mv ${DRBDDIR}/drbd/drbd.ko drbd.ko mv ${DRBDDIR}/drbd/drbd_transport_tcp.ko drbd_transport_tcp.ko @@ -337,7 +395,7 @@ ${HDR_DEB} hdr: .compile_mark headers-control.in headers-postinst.in 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-3.10.0.git\\ngit checkout ${GITVERSION}" > $(headers_tmp)/usr/share/doc/${HDRPACKAGE}/SOURCE + echo "git clone git://git.proxmox.com/git/pve-kernel.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) @@ -350,6 +408,8 @@ ${HDR_DEB} hdr: .compile_mark headers-control.in headers-postinst.in cd ${KERNEL_SRC}; (find arch/x86 -name include -type d -print | \ xargs -n1 -i: find : -type f) | \ cpio -pd --preserve-modification-time $(headers_dir) + mkdir -p ${headers_tmp}/lib/modules/${KVNAME} + ln -sf /usr/src/linux-headers-${KVNAME} ${headers_tmp}/lib/modules/${KVNAME}/build dpkg-deb --build $(headers_tmp) ${HDR_DEB} #lintian ${HDR_DEB} @@ -359,7 +419,7 @@ dvb-firmware.git/README: 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.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-7-pve fwlist-3.10.0-8-pve fwlist-3.19.8-1-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.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-7-pve fwlist-3.10.0-8-pve fwlist-3.19.8-1-pve fwlist-4.2.8-1-pve fwlist-4.4.13-2-pve fwlist-4.4.16-1-pve fwlist-4.4.21-1-pve fwlist-${KVNAME} rm -rf fwdata mkdir -p fwdata/lib/firmware ./assemble-firmware.pl fwlist-${KVNAME} fwdata/lib/firmware @@ -377,30 +437,24 @@ ${FW_DEB} fw: control.firmware linux-firmware.git/WHENCE dvb-firmware.git/README ./assemble-firmware.pl fwlist-3.10.0-7-pve fwdata/lib/firmware ./assemble-firmware.pl fwlist-3.10.0-8-pve fwdata/lib/firmware ./assemble-firmware.pl fwlist-3.19.8-1-pve fwdata/lib/firmware + ./assemble-firmware.pl fwlist-4.2.8-1-pve fwdata/lib/firmware + ./assemble-firmware.pl fwlist-4.4.13-2-pve fwdata/lib/firmware + ./assemble-firmware.pl fwlist-4.4.16-1-pve fwdata/lib/firmware + ./assemble-firmware.pl fwlist-4.4.21-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 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 + echo "git clone git://git.proxmox.com/git/pve-kernel.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} ${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/Packages* - 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 +upload: ${DEBS} + tar cf - ${DEBS}|ssh repoman@repo.proxmox.com upload .PHONY: distclean distclean: clean @@ -408,7 +462,7 @@ distclean: clean .PHONY: clean clean: - rm -rf *~ .compile_mark ${KERNEL_CFG_ORG} ${KERNEL_SRC} ${KERNEL_SRC}.tmp ${KERNEL_CFG_ORG} ${KERNEL_SRC}.org orig tmp data proxmox-ve/data *.deb ${headers_tmp} fwdata fwlist.tmp *.ko fwlist-${KVNAME} ${ZFSDIR} ${SPLDIR} ${SPL_MODULES} ${ZFS_MODULES} hpsa.ko ${HPSADIR} ${DRBDDIR} drbd-9.0 ${IGBDIR} igb.ko ${IXGBEDIR} ixgbe.ko + rm -rf *~ .compile_mark watchdog-blacklist.tmp ${KERNEL_CFG_ORG} ${KERNEL_SRC} ${KERNEL_SRC}.tmp ${KERNEL_CFG_ORG} ${KERNEL_SRC}.org orig tmp data proxmox-ve/data *.deb ${headers_tmp} fwdata fwlist.tmp *.ko fwlist-${KVNAME} ${ZFSDIR} ${SPLDIR} ${SPL_MODULES} ${ZFS_MODULES} hpsa.ko ${HPSADIR} ${DRBDDIR} drbd-9.0 ${IGBDIR} igb.ko ${IXGBEDIR} ixgbe.ko ${E1000EDIR} e1000e.ko linux-tools ${LINUX_TOOLS_DEB}