Module: Mesa Branch: master Commit: bf576b449e1d5cf685bfb5a14b05d1ee03d32cb0 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bf576b449e1d5cf685bfb5a14b05d1ee03d32cb0
Author: Eric Anholt <[email protected]> Date: Mon Nov 9 15:06:38 2020 -0800 ci: Only install kernel modules for LAVA devices. The recent change to install kernel modules for AMD included a sed job to disable kernel modules in the defconfig. This somehow broke booting on a307, except the commit failed to bump the arm64_test tag so it wasn't noticed until the next uprev. (I didn't notice when landing the next change to that container to add the deqp runner, because I didn't get a git conflict on rebasing my tag bump so I didn't bump the tag again to pull in the kernel changes and catch the fail). I've spent a while trying to debug what's happened (including what *should* be a replication of the kernel build on my local db410c) and come up empty. Just punt and disable the AMD kernel module changes on baremetal to fix it. Bump every container using lava_build.sh to make sure we don't screw anything up with the script changes. Fixes: 60c5729d1669 ("ci: Distribute ADMGPU driver to LAVA as a module") Reviewed-by: Tomeu Vizoso <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6971> --- .gitlab-ci.yml | 2 +- .gitlab-ci/container/lava_build.sh | 12 ++++++++---- .gitlab-ci/lava-gitlab-ci.yml | 3 ++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 73e103482e3..9ad2268d7d5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -414,7 +414,7 @@ arm64_test: extends: - .use-arm_test-base variables: - FDO_DISTRIBUTION_TAG: &arm64_test "2020-11-03-deqp-runner" + FDO_DISTRIBUTION_TAG: &arm64_test "2020-11-09-kmod" .use-arm64_test: variables: diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh index 1d2be14cd22..ecb160d6457 100755 --- a/.gitlab-ci/container/lava_build.sh +++ b/.gitlab-ci/container/lava_build.sh @@ -153,8 +153,10 @@ for i in /usr/bin/*-ld /usr/bin/ld; do done export PATH=`pwd`/ld-links:$PATH -# Disable all modules in defconfig, so we only build the ones we want -sed -i 's/=m/=n/g' ${DEFCONFIG} +if [ -n "$INSTALL_KERNEL_MODULES" ]; then + # Disable all modules in defconfig, so we only build the ones we want + sed -i 's/=m/=n/g' ${DEFCONFIG} +fi ./scripts/kconfig/merge_config.sh ${DEFCONFIG} ../.gitlab-ci/${KERNEL_ARCH}.config make ${KERNEL_IMAGE_NAME} @@ -167,8 +169,10 @@ if [[ -n ${DEVICE_TREES} ]]; then cp ${DEVICE_TREES} /lava-files/. fi -make modules -INSTALL_MOD_PATH=/lava-files/rootfs-${DEBIAN_ARCH}/ make modules_install +if [ -n "$INSTALL_KERNEL_MODULES" ]; then + make modules + INSTALL_MOD_PATH=/lava-files/rootfs-${DEBIAN_ARCH}/ make modules_install +fi if [[ ${DEBIAN_ARCH} = "arm64" ]] && which mkimage > /dev/null; then make Image.lzma diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml index e7cf14c8512..ad86b4d21d8 100644 --- a/.gitlab-ci/lava-gitlab-ci.yml +++ b/.gitlab-ci/lava-gitlab-ci.yml @@ -1,5 +1,5 @@ variables: - DISTRIBUTION_TAG: "2020-11-05-deqp-runner" + DISTRIBUTION_TAG: "2020-11-09-kmod-fix" .kernel+rootfs: stage: container-2 @@ -9,6 +9,7 @@ variables: GIT_STRATEGY: fetch KERNEL_URL: "https://gitlab.freedesktop.org/tomeu/linux/-/archive/v5.10-rc2-for-mesa-ci/linux-v5.10-rc2-for-mesa-ci.tar.gz"; UPLOAD_FOR_LAVA: 1 + INSTALL_KERNEL_MODULES: 1 script: - .gitlab-ci/container/lava_build.sh _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
