scripts/abi-check: don't fail after ABI bump

[pve-kernel.git] / Makefile

diff --git a/Makefile b/Makefile
index 495ca4a232d07e0eedc83e15ca621ae60b96eaa4..e1d9f3c7d7f006783572cc727dbf12f72cf237cf 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,11 @@
 RELEASE=5.1
 
-# also update proxmox-ve/changelog if you change KERNEL_VER or KREL
+# also update pve-kernel-meta.git if either of these change
 KERNEL_VER=4.13.13
-PKGREL=41
-# also include firmware of previous version into
-# the fw package:  fwlist-2.6.32-PREV-pve
 KREL=6
 
+PKGREL=42
+
 EXTRAVERSION=-${KREL}-pve
 KVNAME=${KERNEL_VER}${EXTRAVERSION}
 PACKAGE=pve-kernel-${KVNAME}
@@ -84,7 +83,7 @@ ${DST_DEB}: ${BUILD_DIR}.prepared
 
 ${BUILD_DIR}.prepared: $(addsuffix .prepared,${KERNEL_SRC} ${MODULES} debian)
        cp -a fwlist-previous ${BUILD_DIR}/
-       cp -a abi-previous ${BUILD_DIR}/
+       cp -a abi-prev-* ${BUILD_DIR}/
        cp -a abi-blacklist ${BUILD_DIR}/
        touch $@
 
@@ -101,8 +100,7 @@ debian.prepared: debian
 ${KERNEL_SRC}.prepared: ${KERNEL_SRC_SUBMODULE} | submodule
        rm -rf ${BUILD_DIR}/${KERNEL_SRC} $@
        mkdir -p ${BUILD_DIR}
-       mkdir ${BUILD_DIR}/${KERNEL_SRC}
-       cp -a ${KERNEL_SRC_SUBMODULE}/* ${BUILD_DIR}/${KERNEL_SRC}/
+       cp -a ${KERNEL_SRC_SUBMODULE} ${BUILD_DIR}/${KERNEL_SRC}
 # TODO: split for archs, track and diff in our repository?
        cat ${BUILD_DIR}/${KERNEL_SRC}/debian.master/config/config.common.ubuntu ${BUILD_DIR}/${KERNEL_SRC}/debian.master/config/${ARCH}/config.common.${ARCH} ${BUILD_DIR}/${KERNEL_SRC}/debian.master/config/${ARCH}/config.flavour.generic > ${KERNEL_CFG_ORG}
        cp ${KERNEL_CFG_ORG} ${BUILD_DIR}/${KERNEL_SRC}/.config