remove gcc check completely, we have build dependencies for that

[pve-kernel.git] / Makefile

diff --git a/Makefile b/Makefile
index cb83216e957e7c96db72dbbecd7ba99fd0e21996..8c5c2bb8e6b15bd188fddc96af8b5b1981916493 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,12 @@
 # also bump pve-kernel-meta if either of MAJ.MIN, PATCHLEVEL or KREL change
-KERNEL_MAJ=4
-KERNEL_MIN=15
-KERNEL_PATCHLEVEL=18
+KERNEL_MAJ=5
+KERNEL_MIN=0
+KERNEL_PATCHLEVEL=8
 # increment KREL if the ABI changes (abicheck target in debian/rules)
 # rebuild packages with new KREL and run 'make abiupdate'
-KREL=13
+KREL=1
 
-PKGREL=37
+PKGREL=1
 
 KERNEL_MAJMIN=$(KERNEL_MAJ).$(KERNEL_MIN)
 KERNEL_VER=$(KERNEL_MAJMIN).$(KERNEL_PATCHLEVEL)
@@ -29,33 +29,21 @@ GITVERSION:=$(shell git rev-parse HEAD)
 
 SKIPABI=0
 
-ifeq    ($(CC), cc)
-GCC=gcc
-else
-GCC=$(CC)
-endif
-
 BUILD_DIR=build
 
-KERNEL_SRC=ubuntu-bionic
+KERNEL_SRC=ubuntu-disco
 KERNEL_SRC_SUBMODULE=submodules/$(KERNEL_SRC)
 KERNEL_CFG_ORG=config-${KERNEL_VER}.org
 
-E1000EDIR=e1000e-3.4.1.1
-E1000ESRC=${E1000EDIR}.tar.gz
-
-IGBDIR=igb-5.3.5.18
-IGBSRC=${IGBDIR}.tar.gz
-
 ZFSONLINUX_SUBMODULE=submodules/zfsonlinux
 SPLDIR=pkg-spl
 ZFSDIR=pkg-zfs
 
 MODULES=modules
-MODULE_DIRS=${E1000EDIR} ${IGBDIR} ${SPLDIR} ${ZFSDIR}
+MODULE_DIRS=${SPLDIR} ${ZFSDIR}
 
 # exported to debian/rules via debian/rules.d/dirs.mk
-DIRS=KERNEL_SRC E1000EDIR IGBDIR SPLDIR ZFSDIR MODULES
+DIRS=KERNEL_SRC SPLDIR ZFSDIR MODULES
 
 DST_DEB=${PACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
 HDR_DEB=${HDRPACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
@@ -63,17 +51,9 @@ LINUX_TOOLS_DEB=linux-tools-$(KERNEL_MAJMIN)_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
 
 DEBS=${DST_DEB} ${HDR_DEB} ${LINUX_TOOLS_DEB}
 
-all: check_gcc deb
+all: deb
 deb: ${DEBS}
 
-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
-
 ${LINUX_TOOLS_DEB} ${HDR_DEB}: ${DST_DEB}
 ${DST_DEB}: ${BUILD_DIR}.prepared
        cd ${BUILD_DIR}; dpkg-buildpackage --jobs=auto -b -uc -us
@@ -107,28 +87,12 @@ ${KERNEL_SRC}.prepared: ${KERNEL_SRC_SUBMODULE} | submodule
        cp ${KERNEL_CFG_ORG} ${BUILD_DIR}/${KERNEL_SRC}/.config
        sed -i ${BUILD_DIR}/${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'
        rm -rf ${BUILD_DIR}/${KERNEL_SRC}/debian ${BUILD_DIR}/${KERNEL_SRC}/debian.master
-       cd ${BUILD_DIR}/${KERNEL_SRC}; for patch in ../../patches/kernel/*.patch; do echo "applying patch '$$patch'" && patch -p1 < $${patch}; done
+       set -e; cd ${BUILD_DIR}/${KERNEL_SRC}; for patch in ../../patches/kernel/*.patch; do echo "applying patch '$$patch'" && patch -p1 < $${patch}; done
        touch $@
 
 ${MODULES}.prepared: $(addsuffix .prepared,${MODULE_DIRS})
        touch $@
 
-${E1000EDIR}.prepared: ${E1000ESRC}
-       rm -rf ${BUILD_DIR}/${MODULES}/${E1000EDIR} $@
-       mkdir -p ${BUILD_DIR}/${MODULES}/${E1000EDIR}
-       tar --strip-components=1 -C ${BUILD_DIR}/${MODULES}/${E1000EDIR} -xf ${E1000ESRC}
-       cd ${BUILD_DIR}/${MODULES}/${E1000EDIR}; patch -p1 < ../../../patches/intel/intel-module-gcc6-compat.patch
-       cd ${BUILD_DIR}/${MODULES}/${E1000EDIR}; patch -p1 < ../../../patches/intel/e1000e/e1000e_4.10_max-mtu.patch
-       cd ${BUILD_DIR}/${MODULES}/${E1000EDIR}; patch -p1 < ../../../patches/intel/e1000e/e1000e_4.15-new-timer.patch
-       touch $@
-
-${IGBDIR}.prepared: ${IGBSRC}
-       rm -rf ${BUILD_DIR}/${MODULES}/${IGBDIR} $@
-       mkdir -p ${BUILD_DIR}/${MODULES}/${IGBDIR}
-       tar --strip-components=1 -C ${BUILD_DIR}/${MODULES}/${IGBDIR} -xf ${IGBSRC}
-       cd ${BUILD_DIR}/${MODULES}/${IGBDIR}; patch -p1 < ../../../patches/intel/igb/igb_4.15_mtu.patch
-       touch $@
-
 ${SPLDIR}.prepared: ${ZFSDIR}.prepared
 ${ZFSDIR}.prepared: ${ZFSONLINUX_SUBMODULE}
        rm -rf ${BUILD_DIR}/${MODULES}/${SPLDIR} ${BUILD_DIR}/${MODULES}/${ZFSDIR} ${BUILD_DIR}/${MODULES}/tmp $@