All the build jobs exist in two flavors: debug and non-debug, where the
former sets 'debug' variable to 'y' and the latter to 'n'. This variable
is only being recognized by the toolstack, because Xen requires
enabling/disabling debug build via e.g. menuconfig/config file.
As a corollary, we end up building/testing Xen with CONFIG_DEBUG always
set to a default value ('y' for unstable and 'n' for stable branches),
regardless of the type of the build job.
Fix this behavior by setting CONFIG_DEBUG according to the 'debug' value.
Signed-off-by: Michal Orzel <michal.or...@amd.com>
---
Xen used debug variable to control the build type before switching to Kconfig.
Support for GitLab CI was added later, which means that this issue was always
present. This is a low risk for 4.17 with a benefit of being able to test Xen
in both debug and non-debug versions.
---
automation/scripts/build | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/automation/scripts/build b/automation/scripts/build
index 8c0882f3aa33..a5934190634b 100755
--- a/automation/scripts/build
+++ b/automation/scripts/build
@@ -21,12 +21,13 @@ if [[ "${RANDCONFIG}" == "y" ]]; then
make -j$(nproc) -C xen KCONFIG_ALLCONFIG=tools/kconfig/allrandom.config
randconfig
hypervisor_only="y"
else
+ echo "CONFIG_DEBUG=${debug}" > xen/.config
+
if [[ -n "${EXTRA_XEN_CONFIG}" ]]; then
- echo "${EXTRA_XEN_CONFIG}" > xen/.config
- make -j$(nproc) -C xen olddefconfig
- else
- make -j$(nproc) -C xen defconfig
+ echo "${EXTRA_XEN_CONFIG}" >> xen/.config
fi
+
+ make -j$(nproc) -C xen olddefconfig
fi
# Save the config file before building because build failure causes the script
--
2.25.1
