From 832f1c5f4a2f8fafb6d3ae9293c69901a69e26e5 Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Thu, 8 Dec 2022 22:47:08 +0000 Subject: [PATCH] Use annotations for generating Ubuntu config This change updates the build script to use the annotations script from Ubuntu to generate the kernel configuration. Previously, we used the pre-generated configuration files available in the mainline crack builds. However, the team has stopped generating these in favor of the annotations script. --- debian/rules | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/debian/rules b/debian/rules index 311be906..181cc8ab 100755 --- a/debian/rules +++ b/debian/rules @@ -86,13 +86,12 @@ override_dh_auto_clean: debian/control PVE_KERNEL_TEMPLATES := $(patsubst debian/templates/pve-kernel.%.in, debian/${PVE_KERNEL_PKG}.%, $(wildcard debian/templates/pve-kernel.*.in)) ${KERNEL_SRC}/.config: + python3 ${KERNEL_SRC}/debian/scripts/misc/annotations -f ${KERNEL_SRC}/debian.master/config/annotations -a ${DEB_BUILD_ARCH} --export > ${KERNEL_SRC}/debian.master/config/config.ubuntu ${KERNEL_SRC}/scripts/kconfig/merge_config.sh -m \ -O ${KERNEL_SRC} \ - ${KERNEL_SRC}/debian.master/config/config.common.ubuntu \ - ${KERNEL_SRC}/debian.master/config/${DEB_BUILD_ARCH}/config.common.${DEB_BUILD_ARCH} \ - ${KERNEL_SRC}/debian.master/config/${DEB_BUILD_ARCH}/config.flavour.generic \ + ${KERNEL_SRC}/debian.master/config/config.ubuntu \ debian/config/config.pve - ${MAKE} -C ${KERNEL_SRC} CC=${PVE_KERNEL_CC} oldconfig + ${MAKE} -C ${KERNEL_SRC} CC=${PVE_KERNEL_CC} olddefconfig debian/${PVE_KERNEL_PKG}.%: debian/templates/pve-kernel.%.in sed -e 's/@@KVNAME@@/${KVNAME}/g' < debian/templates/pve-kernel.$*.in > debian/${PVE_KERNEL_PKG}.$*