Przeglądaj źródła

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.
Fabian Mastenbroek 2 lat temu
rodzic
commit
97aa3e3f5b
1 zmienionych plików z 2 dodań i 3 usunięć
  1. 2 3
      debian/rules

+ 2 - 3
debian/rules

@@ -86,11 +86,10 @@ 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} olddefconfig