From 0c1bde3dd67eafdd2b5534abc4c56bd48b280c9b Mon Sep 17 00:00:00 2001 From: Kienan Stewart Date: Fri, 4 Aug 2023 17:19:17 -0400 Subject: [PATCH] jjb: Correct ubuntu kernel builds on Debian nodes Change-Id: I9dd798548cc60611e2288cc3f56486a3ea04905a --- scripts/lttng-modules/param-build.sh | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/scripts/lttng-modules/param-build.sh b/scripts/lttng-modules/param-build.sh index b5c8b8f..68320e2 100644 --- a/scripts/lttng-modules/param-build.sh +++ b/scripts/lttng-modules/param-build.sh @@ -166,13 +166,21 @@ build_linux_kernel() { # Disable riscv64 config generation, we don't have a toolchain on bionic sed -i 's/riscv64 //' debian.master/etc/kernelconfig + fakeroot debian/rules clean KW_DEFCONFIG_DIR=. + # Hack for kernel Ubuntu-hwe-5.8 - if [ ! -f "debian/compat" ]; then + # The debian/control file is produced by the clean target above, so this + # check needs to happen afterwards. + if [ ! -f "debian/compat" ] && ! grep -q debhelper-compat debian/control; then echo "10" > "debian/compat" fi - fakeroot debian/rules clean KW_DEFCONFIG_DIR=. - fakeroot debian/rules genconfigs KW_DEFCONFIG_DIR=. + # genconfigs check can fail in certain cases, eg. when a more recent + # compiler exposes kernel configuration flags which aren't set in the + # Ubuntu annotations. + # In any case, the configuration will be updated with any missing values + # later in our build script. + fakeroot debian/rules genconfigs KW_DEFCONFIG_DIR=. do_skip_checks=true cp CONFIGS/"${ubuntu_config}" .config ;; -- 2.34.1