From 753b6656fee3da6872e32d44eb75492ad45330a3 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Sun, 5 Sep 2021 11:44:30 +0100 Subject: [PATCH] CI: Upgrade kernel to v5.14 Older kernels cannot be built and booted with GCC 10+, as included in Debian bullseye, due to unfortunate stack-canary issues: https://lore.kernel.org/lkml/20200314164451.346497-1-slyfox@gentoo.org/T/ Upgrade to the last-released kernel, 5.14, to fix this. Signed-off-by: Daniel Stone --- .gitlab-ci.yml | 2 +- .gitlab-ci/build-deps.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 02496b5d..90fd9d57 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -43,7 +43,7 @@ variables: FDO_UPSTREAM_REPO: wayland/weston FDO_REPO_SUFFIX: "$BUILD_OS/$BUILD_ARCH" - FDO_DISTRIBUTION_TAG: '2021-09-14.2' + FDO_DISTRIBUTION_TAG: '2021-11-24.0-kernel-v5.14' include: diff --git a/.gitlab-ci/build-deps.sh b/.gitlab-ci/build-deps.sh index b4d2ab95..5edaf3c8 100755 --- a/.gitlab-ci/build-deps.sh +++ b/.gitlab-ci/build-deps.sh @@ -48,7 +48,7 @@ pip3 install sphinx_rtd_theme==0.4.3 --user # The fork pulls in this support from the original GitHub PR, rebased on top of # a newer upstream version which fixes AArch64 support. if [[ -n "$KERNEL_DEFCONFIG" ]]; then - git clone --depth=1 --branch=drm-next-2020-06-11-1 https://anongit.freedesktop.org/git/drm/drm.git linux + git clone --depth=1 --branch=v5.14 https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git linux cd linux if [[ "${BUILD_ARCH}" = "x86-64" ]]; then