-RELEASE=5.0
+RELEASE=5.1
# also update proxmox-ve/changelog if you change KERNEL_VER or KREL
-KERNEL_VER=4.10.8
-PKGREL=7
+KERNEL_VER=4.13.13
+PKGREL=41
# also include firmware of previous version into
# the fw package: fwlist-2.6.32-PREV-pve
-KREL=1
+KREL=6
-KERNEL_SRC=ubuntu-zesty
-KERNEL_SRC_SUBMODULE=submodules/ubuntu-zesty
+KERNEL_SRC=ubuntu-artful
+KERNEL_SRC_SUBMODULE=submodules/ubuntu-artful
EXTRAVERSION=-${KREL}-pve
KVNAME=${KERNEL_VER}${EXTRAVERSION}
HDRPACKAGE=pve-headers-${KVNAME}
ARCH=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
+NPROCS=$(shell nproc)
# amd64/x86_64/x86 share the arch subdirectory in the kernel, 'x86' so we need
# a mapping
KERNEL_ARCH=${ARCH}
endif
-GITVERSION:=$(shell cat .git/refs/heads/master)
+GITVERSION:=$(shell git rev-parse HEAD)
CHANGELOG_DATE:=$(shell dpkg-parsechangelog -SDate -lchangelog.Debian)
export SOURCE_DATE_EPOCH ?= $(shell dpkg-parsechangelog -STimestamp -lchangelog.Debian)
SKIPABI=0
+ifeq ($(CC), cc)
+GCC=gcc
+else
+GCC=$(CC)
+endif
+
TOP=$(shell pwd)
KERNEL_CFG_ORG=config-${KERNEL_VER}.org
-E1000EDIR=e1000e-3.3.5.3
+E1000EDIR=e1000e-3.3.6
E1000ESRC=${E1000EDIR}.tar.gz
-IGBDIR=igb-5.3.5.4
+IGBDIR=igb-5.3.5.10
IGBSRC=${IGBDIR}.tar.gz
-IXGBEDIR=ixgbe-5.0.4
+IXGBEDIR=ixgbe-5.3.3
IXGBESRC=${IXGBEDIR}.tar.gz
+ZFSONLINUX_SUBMODULE=submodules/zfsonlinux
SPLDIR=pkg-spl
-SPLSRC=submodules/zfs/pkg-spl.tar.gz
+SPLSRC=${ZFSONLINUX_SUBMODULE}/spl-debian
ZFSDIR=pkg-zfs
-ZFSSRC=submodules/zfs/pkg-zfs.tar.gz
-ZFS_MODULES=zfs.ko zavl.ko znvpair.ko zunicode.ko zcommon.ko zpios.ko
-SPL_MODULES=spl.ko splat.ko
+ZFSSRC=${ZFSONLINUX_SUBMODULE}/zfs-debian
+ZFS_KO=zfs.ko
+ZFS_KO_REST=zavl.ko znvpair.ko zunicode.ko zcommon.ko zpios.ko icp.ko
+ZFS_MODULES=$(ZFS_KO) $(ZFS_KO_REST)
+SPL_KO=spl.ko
+SPL_KO_REST=splat.ko
+SPL_MODULES=$(SPL_KO) $(SPL_KO_REST)
DST_DEB=${PACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
HDR_DEB=${HDRPACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
VIRTUALHDRPACKAGE=pve-headers
VIRTUAL_HDR_DEB=${VIRTUALHDRPACKAGE}_${RELEASE}-${PKGREL}_all.deb
-LINUX_TOOLS_PKG=linux-tools-4.10
+LINUX_TOOLS_PKG=linux-tools-4.13
LINUX_TOOLS_DEB=${LINUX_TOOLS_PKG}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
DEBS=${DST_DEB} ${HDR_DEB} ${PVE_DEB} ${VIRTUAL_HDR_DEB} ${LINUX_TOOLS_DEB}
-all: check_gcc ${DEBS}
+all: check_gcc deb
+deb: ${DEBS}
-${PVE_DEB} pve: proxmox-ve/control proxmox-ve/postinst ${PVE_RELEASE_KEYS}
+pve: $(PVE_DEB)
+${PVE_DEB}: 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}/
gzip -n --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/pve-headers.control >proxmox-ve/data/DEBIAN/control
- echo "git clone git://git.proxmox.com/git/pve-kernel.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 -n --best proxmox-ve/data/usr/share/doc/${VIRTUALHDRPACKAGE}/changelog.Debian
- dpkg-deb --build proxmox-ve/data ${VIRTUAL_HDR_DEB}
-
-check_gcc:
-ifeq ($(CC), cc)
- gcc --version|grep "6\.3" || false
-else
- $(CC) --version|grep "6\.3" || false
-endif
+pve-headers: $(VIRTUAL_HDR_DEB)
+${VIRTUAL_HDR_DEB}: proxmox-ve/pve-headers.control
+ rm -rf pve-headers/data
+ mkdir -p pve-headers/data/DEBIAN
+ mkdir -p pve-headers/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/pve-headers.control >pve-headers/data/DEBIAN/control
+ echo "git clone git://git.proxmox.com/git/pve-kernel.git\\ngit checkout ${GITVERSION}" > pve-headers/data/usr/share/doc/${VIRTUALHDRPACKAGE}/SOURCE
+ install -m 0644 proxmox-ve/copyright pve-headers/data/usr/share/doc/${VIRTUALHDRPACKAGE}
+ install -m 0644 proxmox-ve/changelog.Debian pve-headers/data/usr/share/doc/${VIRTUALHDRPACKAGE}
+ gzip -n --best pve-headers/data/usr/share/doc/${VIRTUALHDRPACKAGE}/changelog.Debian
+ dpkg-deb --build pve-headers/data ${VIRTUAL_HDR_DEB}
+
+check_gcc:
+ $(GCC) --version|grep "6\.3" || false
+ @$(GCC) -Werror -mindirect-branch=thunk-extern -mindirect-branch-register -c -x c /dev/null -o check_gcc.o \
+ || ( rm -f check_gcc.o; \
+ echo "Please install gcc-6 packages with indirect thunk / RETPOLINE support"; \
+ false)
+ @rm -f check_gcc.o
${DST_DEB}: data control.in prerm.in postinst.in postrm.in copyright changelog.Debian | fwcheck abicheck
mkdir -p data/DEBIAN
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.10/usr/bin
- install -m 0755 ${KERNEL_SRC}/tools/perf/perf linux-tools/debian/linux-tools-4.10/usr/bin/perf_4.10
+ mkdir -p linux-tools/debian/linux-tools-4.13/usr/bin
+ install -m 0755 ${KERNEL_SRC}/tools/perf/perf linux-tools/debian/linux-tools-4.13/usr/bin/perf_4.13
cd linux-tools; for i in ${LINUX_TOOLS_DH_LIST}; do dh_$$i; done
lintian ${LINUX_TOOLS_DEB}
fwcheck: fwlist-${KVNAME} fwlist-previous
@echo "checking fwlist for changes since last built firmware package.."
@echo "if this check fails, add fwlist-${KVNAME} to the pve-firmware repository and upload a new firmware package together with the ${KVNAME} kernel"
- bash -c "diff -up -N <(sort fwlist-previous | uniq) <(sort fwlist-${KVNAME} | uniq) > fwlist.diff"
- rm fwlist.diff
+ sort fwlist-previous | uniq > fwlist-previous.sorted
+ sort fwlist-${KVNAME} | uniq > fwlist-${KVNAME}.sorted
+ diff -up -N fwlist-previous.sorted fwlist-${KVNAME}.sorted > fwlist.diff
+ rm fwlist.diff fwlist-previous.sorted fwlist-${KVNAME}.sorted
@echo "done, no need to rebuild pve-firmware"
-e CONFIG_MODVERSIONS \
-d CONFIG_DEFAULT_SECURITY_DAC \
-e CONFIG_DEFAULT_SECURITY_APPARMOR \
---set-str CONFIG_DEFAULT_SECURITY apparmor
+--set-str CONFIG_DEFAULT_SECURITY apparmor \
+-d CONFIG_UNWINDER_ORC \
+-d CONFIG_UNWINDER_GUESS \
+-e CONFIG_UNWINDER_FRAME_POINTER \
+-e CONFIG_PAGE_TABLE_ISOLATION
.compile_mark: ${KERNEL_SRC}/README ${KERNEL_CFG_ORG}
[ ! -e /lib/modules/${KVNAME}/build ] || (echo "please remove /lib/modules/${KVNAME}/build" && false)
cp ${KERNEL_CFG_ORG} ${KERNEL_SRC}/.config
cd ${KERNEL_SRC}; ./scripts/config ${PVE_CONFIG_OPTS}
cd ${KERNEL_SRC}; make oldconfig
- cd ${KERNEL_SRC}; make KBUILD_BUILD_VERSION_TIMESTAMP="PVE ${KERNEL_VER}-${PKGREL} ($(CHANGELOG_DATE))" -j 8
+ cd ${KERNEL_SRC}; make KBUILD_BUILD_VERSION_TIMESTAMP="PVE ${KERNEL_VER}-${PKGREL} (${CHANGELOG_DATE})" -j ${NPROCS}
make -C ${KERNEL_SRC}/tools/perf prefix=/usr HAVE_CPLUS_DEMANGLE=1 NO_LIBPYTHON=1 NO_LIBPERL=1 NO_LIBCRYPTO=1 PYTHON=python2.7
make -C ${KERNEL_SRC}/tools/perf man
touch $@
-${KERNEL_SRC}/README ${KERNEL_CFG_ORG}: ${KERNEL_SRC_SUBMODULE} | submodules
+${KERNEL_CFG_ORG}: ${KERNEL_SRC}/README
+${KERNEL_SRC}/README: ${KERNEL_SRC_SUBMODULE} | submodule
rm -rf ${KERNEL_SRC}
cp -a ${KERNEL_SRC_SUBMODULE} ${KERNEL_SRC}
cat ${KERNEL_SRC}/debian.master/config/config.common.ubuntu ${KERNEL_SRC}/debian.master/config/${ARCH}/config.common.${ARCH} ${KERNEL_SRC}/debian.master/config/${ARCH}/config.flavour.generic > ${KERNEL_CFG_ORG}
- cd ${KERNEL_SRC}; patch -p1 < ../uname-version-timestamp.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 <../vhost-net-extend-device-allocation-to-vmalloc.patch
- cd ${KERNEL_SRC}; patch -p1 < ../kvm-dynamic-halt-polling-disable-default.patch
- cd ${KERNEL_SRC}; patch -p1 < ../cgroup-cpuset-add-cpuset.remap_cpus.patch
- cd ${KERNEL_SRC}; patch -p1 < ../openvswitch-Set-internal-device-max-mtu-to-ETH_MAX_M.patch
- cd ${KERNEL_SRC}; patch -p1 < ../CVE-2017-7979-0001-net_sched-nla_memdup_cookie-can-be-static.patch
- cd ${KERNEL_SRC}; patch -p1 < ../CVE-2017-7979-0002-net-sched-actions-allocate-act-cookie-early.patch
- cd ${KERNEL_SRC}; patch -p1 < ../swapops-0001-Revert-mm-ksm-handle-protnone-saved-writes-when-maki.patch
- cd ${KERNEL_SRC}; patch -p1 < ../swapops-0002-Revert-mm-ksm-convert-write_protect_page-to-use-page.patch
- cd ${KERNEL_SRC}; patch -p1 < ../swapops-0003-Revert-mm-introduce-page_vma_mapped_walk.patch
- cd ${KERNEL_SRC}; patch -p1 < ../swapops-0004-mm-ksm-handle-protnone-saved-writes-when-making-page.patch
+ cd ${KERNEL_SRC}; for patch in ../patches/kernel/*.patch; do patch --verbose -p1 < $${patch}; done
sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'
touch $@
rm -rf ${E1000EDIR}
tar xf ${E1000ESRC}
[ ! -e /lib/modules/${KVNAME}/build ] || (echo "please remove /lib/modules/${KVNAME}/build" && false)
- cd ${E1000EDIR}; patch -p1 < ../intel-module-gcc6-compat.patch
- cd ${E1000EDIR}; patch -p1 < ../e1000e_4.10_compat.patch
- cd ${E1000EDIR}; patch -p1 < ../e1000e_4.10_max-mtu.patch
+ cd ${E1000EDIR}; patch -p1 < ../patches/intel/intel-module-gcc6-compat.patch
+ cd ${E1000EDIR}; patch -p1 < ../patches/intel/e1000e/e1000e_4.10_max-mtu.patch
cd ${E1000EDIR}/src; make BUILD_KERNEL=${KVNAME} KSRC=${TOP}/${KERNEL_SRC}
cp ${E1000EDIR}/src/e1000e.ko e1000e.ko
rm -rf ${IGBDIR}
tar xf ${IGBSRC}
[ ! -e /lib/modules/${KVNAME}/build ] || (echo "please remove /lib/modules/${KVNAME}/build" && false)
- cd ${IGBDIR}; patch -p1 < ../intel-module-gcc6-compat.patch
- cd ${IGBDIR}; patch -p1 < ../igb_4.9_compat.patch
- cd ${IGBDIR}; patch -p1 < ../igb_4.10_compat.patch
- cd ${IGBDIR}; patch -p1 < ../igb_4.10_max-mtu.patch
+ cd ${IGBDIR}; patch -p1 < ../patches/intel/igb/igb_4.10_max-mtu.patch
+ cd ${IGBDIR}; patch -p1 < ../patches/intel/igb/igb_4.12_compat.patch
cd ${IGBDIR}/src; make BUILD_KERNEL=${KVNAME} KSRC=${TOP}/${KERNEL_SRC}
cp ${IGBDIR}/src/igb.ko igb.ko
rm -rf ${IXGBEDIR}
tar xf ${IXGBESRC}
[ ! -e /lib/modules/${KVNAME}/build ] || (echo "please remove /lib/modules/${KVNAME}/build" && false)
- cd ${IXGBEDIR}; patch -p1 < ../ixgbe_4.10_compat.patch
- cd ${IXGBEDIR}; patch -p1 < ../ixgbe_4.10_max-mtu.patch
cd ${IXGBEDIR}/src; make CFLAGS_EXTRA="-DIXGBE_NO_LRO" BUILD_KERNEL=${KVNAME} KSRC=${TOP}/${KERNEL_SRC}
cp ${IXGBEDIR}/src/ixgbe.ko ixgbe.ko
-${SPL_MODULES}: .compile_mark ${SPLSRC}
+$(SPL_KO_REST): $(SPL_KO)
+$(SPL_KO): .compile_mark ${SPLSRC}
rm -rf ${SPLDIR}
- tar xf ${SPLSRC}
+ rsync -ra ${SPLSRC}/ ${SPLDIR}
[ ! -e /lib/modules/${KVNAME}/build ] || (echo "please remove /lib/modules/${KVNAME}/build" && false)
+ cd ${SPLDIR}; for patch in ../${SPLSRC}/../spl-patches/*.patch; do patch --verbose -p1 < $${patch}; done
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}
+$(ZFS_KO_REST): $(ZFS_KO)
+$(ZFS_KO): .compile_mark ${ZFSSRC}
rm -rf ${ZFSDIR}
- tar xf ${ZFSSRC}
+ rsync -ra ${ZFSSRC}/ ${ZFSDIR}
[ ! -e /lib/modules/${KVNAME}/build ] || (echo "please remove /lib/modules/${KVNAME}/build" && false)
+ cd ${ZFSDIR}; for patch in ../${ZFSSRC}/../zfs-patches/*.patch; do patch --verbose -p1 < $${patch}; done
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/unicode/zunicode.ko zunicode.ko
cp ${ZFSDIR}/module/zcommon/zcommon.ko zcommon.ko
cp ${ZFSDIR}/module/zpios/zpios.ko zpios.ko
+ cp ${ZFSDIR}/module/icp/icp.ko icp.ko
headers_tmp := $(CURDIR)/tmp-headers
headers_dir := $(headers_tmp)/usr/src/linux-headers-${KVNAME}
-${HDR_DEB} hdr: .compile_mark headers-control.in headers-postinst.in
+hdr: $(HDR_DEB)
+${HDR_DEB}: .compile_mark headers-control.in headers-postinst.in
rm -rf $(headers_tmp)
install -d $(headers_tmp)/DEBIAN $(headers_dir)/include/
sed -e 's/@KERNEL_VER@/${KERNEL_VER}/' -e 's/@KVNAME@/${KVNAME}/' -e 's/@PKGREL@/${PKGREL}/' -e 's/@ARCH@/${ARCH}/' <headers-control.in >$(headers_tmp)/DEBIAN/control
# upgrade to current master
.PHONY: update_modules
-update_modules: submodules
+update_modules: submodule
git submodule foreach 'git pull --ff-only origin master'
+ cd ${ZFSSRC}; git pull --ff-only origin master
+ cd ${SPLSRC}; git pull --ff-only origin master
# make sure submodules were initialized
-.PHONY: submodules
-submodules ${SPLSRC} ${ZFSSRC}:
- test -f "${KERNEL_SRC_SUBMODULE}/README" || git submodule update --init
+.PHONY: submodule
+submodule:
+ test -f "${KERNEL_SRC_SUBMODULE}/README" || git submodule update --init ${KERNEL_SRC_SUBMODULE}
+ test -f "${ZFSONLINUX_SUBMODULE}/Makefile" || git submodule update --init ${ZFSONLINUX_SUBMODULE}
+ (test -f "${ZFSSRC}/debian/changelog" && test -f "${SPLZRC}/debian/changelog") || (cd ${ZFSONLINUX_SUBMODULE}; git submodule update --init)
.PHONY: clean
projects / pve-kernel.git / blobdiff