From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Date: Mon, 3 Aug 2020 14:19:38 +0000 (+0200)
Subject: ci: Build-test Panfrost tools
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a9560939e07a9b15c0e655dc2c4f9b38190b6293;p=mesa.git

ci: Build-test Panfrost tools

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3348
Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Reviewed-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6157>
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 144b541bf6b..203d4e4d2e1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -642,6 +642,8 @@ meson-arm64-build-test:
     - .ci-deqp-artifacts
   variables:
     VULKAN_DRIVERS: "amd"
+    EXTRA_OPTION: >
+      -Dtools=panfrost
   script:
     - .gitlab-ci/meson-build.sh
 
diff --git a/.gitlab-ci/arm64.config b/.gitlab-ci/arm64.config
index 42aad36ef17..23f766541e5 100644
--- a/.gitlab-ci/arm64.config
+++ b/.gitlab-ci/arm64.config
@@ -115,7 +115,6 @@ CONFIG_DETECT_HUNG_TASK=y
 
 CONFIG_FW_LOADER_COMPRESS=y
 CONFIG_FW_LOADER_USER_HELPER=n
-CONFIG_SUNRPC_DEBUG=y
 
 CONFIG_USB_USBNET=y
 CONFIG_NETDEVICES=y
diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh
index 7a7e997a31c..f55b9a5e227 100755
--- a/.gitlab-ci/container/lava_build.sh
+++ b/.gitlab-ci/container/lava_build.sh
@@ -136,7 +136,7 @@ mkdir -p kernel
 wget -qO- ${KERNEL_URL} | tar -xz --strip-components=1 -C kernel
 pushd kernel
 ./scripts/kconfig/merge_config.sh ${DEFCONFIG} ../.gitlab-ci/${KERNEL_ARCH}.config
-make ${KERNEL_IMAGE_NAME}
+make ${KERNEL_IMAGE_NAME} modules
 for image in ${KERNEL_IMAGE_NAME}; do
     cp arch/${KERNEL_ARCH}/boot/${image} /lava-files/.
 done
@@ -145,6 +145,9 @@ if [[ -n ${DEVICE_TREES} ]]; then
     cp ${DEVICE_TREES} /lava-files/.
 fi
 
+make -j12 modules
+INSTALL_MOD_PATH=/lava-files/rootfs-${DEBIAN_ARCH}/ make modules_install
+
 if [[ ${DEBIAN_ARCH} = "arm64" ]] && which mkimage > /dev/null; then
     make Image.lzma
     mkimage \