ci: Drop hack to disable all modules from defconfig

It was disabling the building of drivers that were needed in some
devices.

After merging we will anyway only have the modules we want (amdgpu atm),
so it's not really needed.

Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Acked-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10139>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8948381..6cf21b4 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -447,8 +447,7 @@ arm_build:
   variables:
     GIT_STRATEGY: fetch
     KERNEL_URL: "https://gitlab.freedesktop.org/tomeu/linux/-/archive/v5.11-for-mesa-ci-adcee9973be5/linux-v5.11-for-mesa-ci-adcee9973be5.tar.bz2"
-    INSTALL_KERNEL_MODULES: 1
-    MESA_ROOTFS_TAG: &kernel-rootfs "2021-04-20-unified-kernel"
+    MESA_ROOTFS_TAG: &kernel-rootfs "2021-04-20-kernel-modules"
     DISTRIBUTION_TAG: &distribution-tag-arm "${MESA_ROOTFS_TAG}--${MESA_IMAGE_TAG}--${MESA_TEMPLATES_COMMIT}"
   script:
     - .gitlab-ci/container/lava_build.sh
@@ -503,7 +502,7 @@ arm_test:
     FDO_DISTRIBUTION_EXEC: 'env ARTIFACTS_PREFIX=https://${MINIO_HOST}/mesa-lava ARTIFACTS_SUFFIX=${MESA_ROOTFS_TAG}--${MESA_ARM_BUILD_TAG}--${MESA_TEMPLATES_COMMIT} CI_PROJECT_PATH=${CI_PROJECT_PATH} FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} FDO_UPSTREAM_REPO=${FDO_UPSTREAM_REPO} bash .gitlab-ci/container/${CI_JOB_NAME}.sh'
     FDO_DISTRIBUTION_TAG: "${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${MESA_ARM_BUILD_TAG}--${MESA_TEMPLATES_COMMIT}"
     MESA_ARM_BUILD_TAG: *arm_build
-    MESA_IMAGE_TAG: &arm_test "2021-04-20-unified-kernel"
+    MESA_IMAGE_TAG: &arm_test "2021-04-20-kernel-modules"
     MESA_ROOTFS_TAG: *kernel-rootfs
 
 .use-arm_test:

diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh
index 154b8b4..b481ed8 100755 (executable)
--- a/.gitlab-ci/container/lava_build.sh
+++ b/.gitlab-ci/container/lava_build.sh
@@ -149,11 +149,6 @@ for i in /usr/bin/*-ld /usr/bin/ld; do
 done
 export PATH=`pwd`/ld-links:$PATH
 
-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
-
 export LOCALVERSION="`basename $KERNEL_URL`"
 ./scripts/kconfig/merge_config.sh ${DEFCONFIG} ../.gitlab-ci/container/${KERNEL_ARCH}.config
 make ${KERNEL_IMAGE_NAME}
@@ -166,7 +161,7 @@ if [[ -n ${DEVICE_TREES} ]]; then
     cp ${DEVICE_TREES} /lava-files/.
 fi
 
-if [ -n "$INSTALL_KERNEL_MODULES" ]; then
+if [[ ${DEBIAN_ARCH} = "amd64" ]]; then
     make modules
     INSTALL_MOD_PATH=/lava-files/rootfs-${DEBIAN_ARCH}/ make modules_install
 fi