]> git.proxmox.com Git - pve-kernel.git/blobdiff - debian/rules
bump version to Ubuntu-4.15.0-34.37
[pve-kernel.git] / debian / rules
index 8e842aedb530c0283d50c04175872b3f68a31a5b..e99db8c2720a6735ecef87d78fcb79cacd185f1c 100755 (executable)
@@ -15,7 +15,8 @@ CHANGELOG_DATE:=$(shell dpkg-parsechangelog -SDate)
 
 PVE_KERNEL_PKG=pve-kernel-${KVNAME}
 PVE_HEADER_PKG=pve-headers-${KVNAME}
-LINUX_TOOLS_PKG=linux-tools-4.15
+LINUX_TOOLS_PKG=linux-tools-${KERNEL_MAJMIN}
+KERNEL_SRC_COPY=${KERNEL_SRC}_tmp
 
 # TODO: split for archs, move to files?
 PVE_CONFIG_OPTS= \
@@ -63,7 +64,7 @@ debian/control: $(wildcard debian/*.in)
        chmod +x debian/${PVE_KERNEL_PKG}.postrm
        chmod +x debian/${PVE_KERNEL_PKG}.postinst
        chmod +x debian/${PVE_HEADER_PKG}.postinst
-       sed -e 's/@KVNAME@/${KVNAME}/g' < debian/control.in > debian/control
+       sed -e 's/@KVNAME@/${KVNAME}/g' -e 's/@KVMAJMIN@/${KERNEL_MAJMIN}/g' < debian/control.in > debian/control
 
 build: .compile_mark .tools_compile_mark .modules_compile_mark
 
@@ -85,9 +86,12 @@ binary: install
        dh_md5sums
        dh_builddeb
 
-.compile_mark: ${KERNEL_SRC}/.config
+.config_mark:
        cd ${KERNEL_SRC}; scripts/config ${PVE_CONFIG_OPTS}
        ${MAKE} -C ${KERNEL_SRC} oldconfig
+       touch $@
+
+.compile_mark: .config_mark
        ${MAKE} -C ${KERNEL_SRC} KBUILD_BUILD_VERSION_TIMESTAMP="PVE ${DEB_VERSION} (${CHANGELOG_DATE})"
        touch $@
 
@@ -99,13 +103,10 @@ binary: install
        install -m 644 ${KERNEL_SRC}/System.map debian/${PVE_KERNEL_PKG}/boot/System.map-${KVNAME}
        install -m 644 ${KERNEL_SRC}/${KERNEL_IMAGE_PATH} debian/${PVE_KERNEL_PKG}/boot/${KERNEL_INSTALL_FILE}-${KVNAME}
        ${MAKE} -C ${KERNEL_SRC} INSTALL_MOD_PATH=${BUILD_DIR}/debian/${PVE_KERNEL_PKG}/ modules_install
-# disabled for now, incompatbile with 4.15
-#      ## install latest ibg driver
-#      install -m 644 ${MODULES}/igb.ko debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/intel/igb/
-#      # install latest ixgbe driver
-#      install -m 644 ${MODULES}/ixgbe.ko debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/intel/ixgbe/
-#      # install latest e1000e driver
-#      install -m 644 ${MODULES}/e1000e.ko debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/intel/e1000e/
+       ## install latest ibg driver
+       install -m 644 ${MODULES}/igb.ko debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/intel/igb/
+       # install latest e1000e driver
+       install -m 644 ${MODULES}/e1000e.ko debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/intel/e1000e/
        # install zfs drivers
        install -d -m 0755 debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/zfs
        install -m 644 $(addprefix ${MODULES}/,spl.ko splat.ko zfs.ko zavl.ko znvpair.ko zunicode.ko zcommon.ko zpios.ko icp.ko) debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/zfs
@@ -130,24 +131,28 @@ binary: install
        ! ldd ${KERNEL_SRC}/tools/perf/perf | grep -q -E '\blibbfd'
        ! ldd ${KERNEL_SRC}/tools/perf/perf | grep -q -E '\blibcrypto'
        ${MAKE} -C ${KERNEL_SRC}/tools/perf man
-       # contained in linux-base
-       rm -f ${KERNEL_SRC}/tools/perf/Documentation/perf.1
        touch $@
 
 .tools_install_mark: .tools_compile_mark
        rm -rf debian/${LINUX_TOOLS_PKG}
        mkdir -p debian/${LINUX_TOOLS_PKG}/usr/bin
        mkdir -p debian/${LINUX_TOOLS_PKG}/usr/share/man/man1
-       install -m 755 ${BUILD_DIR}/${KERNEL_SRC}/tools/perf/perf debian/${LINUX_TOOLS_PKG}/usr/bin/perf_4.15
-       install -m644 ${BUILD_DIR}/${KERNEL_SRC}/tools/perf/Documentation/*.1 debian/${LINUX_TOOLS_PKG}/usr/share/man/man1
+       install -m 755 ${BUILD_DIR}/${KERNEL_SRC}/tools/perf/perf debian/${LINUX_TOOLS_PKG}/usr/bin/perf_$(KERNEL_MAJMIN)
+       for i in ${BUILD_DIR}/${KERNEL_SRC}/tools/perf/Documentation/*.1; do \
+           fname="$${i##*/}"; manname="$${fname%.1}"; \
+           install -m644 "$$i" "debian/${LINUX_TOOLS_PKG}/usr/share/man/man1/$${manname}_$(KERNEL_MAJMIN).1"; \
+       done
        touch $@
 
-.headers_install_mark: .compile_mark .modules_compile_mark
+.headers_prepare_mark: .config_mark
        rm -rf debian/${PVE_HEADER_PKG}
        mkdir -p debian/${PVE_HEADER_PKG}/usr/src/linux-headers-${KVNAME}
        install -m 0644 ${KERNEL_SRC}/.config debian/${PVE_HEADER_PKG}/usr/src/linux-headers-${KVNAME}
-       install -m 0644 ${KERNEL_SRC}/Module.symvers debian/${PVE_HEADER_PKG}/usr/src/linux-headers-${KVNAME}
-       cd ${KERNEL_SRC}; find . -path './debian/*' -prune \
+       # copy to allow building in parallel to kernel/module compilation without interference
+       rm -rf ${KERNEL_SRC_COPY}
+       cp -ar ${KERNEL_SRC} ${KERNEL_SRC_COPY}
+       make -C ${KERNEL_SRC_COPY} mrproper
+       cd ${KERNEL_SRC_COPY}; find . -path './debian/*' -prune \
            -o -path './include/*' -prune \
            -o -path './Documentation' -prune \
            -o -path './scripts' -prune \
@@ -160,20 +165,34 @@ binary: install
                -o -name '*.pl' \
            \) \
            -print | cpio -pd --preserve-modification-time ${BUILD_DIR}/debian/${PVE_HEADER_PKG}/usr/src/linux-headers-${KVNAME}
-       cd ${KERNEL_SRC}; cp -a include scripts ${BUILD_DIR}/debian/${PVE_HEADER_PKG}/usr/src/linux-headers-${KVNAME}
-       cd ${KERNEL_SRC}; \
+       cd ${KERNEL_SRC_COPY}; cp -a include scripts ${BUILD_DIR}/debian/${PVE_HEADER_PKG}/usr/src/linux-headers-${KVNAME}
+       cd ${KERNEL_SRC_COPY}; \
            ( \
                find arch/${KERNEL_HEADER_ARCH} -name include -type d -print | \
                xargs -n1 -i: find : -type f \
            ) | \
            cpio -pd --preserve-modification-time ${BUILD_DIR}/debian/${PVE_HEADER_PKG}/usr/src/linux-headers-${KVNAME}
+       touch $@
+
+.headers_compile_mark: .headers_prepare_mark
+       # set output to subdir of source to reduce number of hardcoded paths in output files
+       rm -rf ${BUILD_DIR}/${KERNEL_SRC_COPY}/${PVE_HEADER_PKG}
+       mkdir -p ${BUILD_DIR}/${KERNEL_SRC_COPY}/${PVE_HEADER_PKG}
+       cp ${KERNEL_SRC}/.config ${BUILD_DIR}/${KERNEL_SRC_COPY}/${PVE_HEADER_PKG}/.config
+       ${MAKE} -C ${KERNEL_SRC_COPY} O=${BUILD_DIR}/${KERNEL_SRC_COPY}/${PVE_HEADER_PKG} -j1 silentoldconfig prepare scripts
+       find ${BUILD_DIR}/${KERNEL_SRC_COPY}/${PVE_HEADER_PKG} -name \*.o.ur-\* | xargs rm -f
+       rsync --ignore-existing -r -v -a $(addprefix ${BUILD_DIR}/${KERNEL_SRC_COPY}/${PVE_HEADER_PKG}/,arch include kernel scripts tools) ${BUILD_DIR}/debian/${PVE_HEADER_PKG}/usr/src/linux-headers-${KVNAME}/
+       rm -rf ${BUILD_DIR}/${KERNEL_SRC_COPY}
+       touch $@
+
+.headers_install_mark: .compile_mark .modules_compile_mark .headers_compile_mark
+       cp ${KERNEL_SRC}/include/generated/compile.h debian/${PVE_HEADER_PKG}/usr/src/linux-headers-${KVNAME}/include/generated/compile.h
+       install -m 0644 ${KERNEL_SRC}/Module.symvers debian/${PVE_HEADER_PKG}/usr/src/linux-headers-${KVNAME}
        mkdir -p debian/${PVE_HEADER_PKG}/lib/modules/${KVNAME}
        ln -sf /usr/src/linux-headers-${KVNAME} debian/${PVE_HEADER_PKG}/lib/modules/${KVNAME}/build
        touch $@
 
-# intel out-of-tree drivers disabled for now - incompatible with 4.15
-#.modules_compile_mark: $(addprefix ${MODULES}/,igb.ko ixgbe.ko e1000e.ko spl.ko zfs.ko)
-.modules_compile_mark: $(addprefix ${MODULES}/,spl.ko zfs.ko)
+.modules_compile_mark: $(addprefix ${MODULES}/,igb.ko e1000e.ko spl.ko zfs.ko)
        touch $@
 
 ${MODULES}/spl.ko: .compile_mark
@@ -199,10 +218,6 @@ ${MODULES}/igb.ko: .compile_mark
        ${MAKE} -C ${MODULES}/${IGBDIR}/src BUILD_KERNEL=${KVNAME} KSRC=${BUILD_DIR}/${KERNEL_SRC}
        cp ${MODULES}/${IGBDIR}/src/igb.ko ${MODULES}/
 
-${MODULES}/ixgbe.ko: .compile_mark
-       ${MAKE} -C ${MODULES}/${IXGBEDIR}/src CFLAGS_EXTRA="-DIXGBE_NO_LRO" BUILD_KERNEL=${KVNAME} KSRC=${BUILD_DIR}/${KERNEL_SRC}
-       cp ${MODULES}/${IXGBEDIR}/src/ixgbe.ko ${MODULES}/
-
 ${MODULES}/e1000e.ko: .compile_mark
        ${MAKE} -C ${MODULES}/${E1000EDIR}/src BUILD_KERNEL=${KVNAME} KSRC=${BUILD_DIR}/${KERNEL_SRC}
        cp ${MODULES}/${E1000EDIR}/src/e1000e.ko ${MODULES}/