ci: Remove kernel module build that slipped in

Some changes unintendedly slipped into an unrelated commit before it was
merged.

This caused kernel modules to be built and installed in the ramdisk,
which caused some devices to fail to boot due to the ramdisk size limit
being surpassed.

These changes weren't in effect until a subsequent commit triggered a
rebuild of the ramdisks.

Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Acked-by: Daniel Stone <daniels@collabora.com>
Fixes: a9560939e0 ("ci: Build-test Panfrost tools")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6167>
This commit is contained in:
Tomeu Vizoso
2020-08-04 11:00:54 +02:00
parent 7633037441
commit a133f7d288
3 changed files with 3 additions and 6 deletions
+1 -1
View File
@@ -355,7 +355,7 @@ arm64_test:
extends:
- .use-arm_test-base
variables:
FDO_DISTRIBUTION_TAG: &arm64_test "2020-07-31-minio"
FDO_DISTRIBUTION_TAG: &arm64_test "2020-08-04-ramdisk-fix"
.use-arm64_test:
variables:
+1 -4
View File
@@ -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} modules
make ${KERNEL_IMAGE_NAME}
for image in ${KERNEL_IMAGE_NAME}; do
cp arch/${KERNEL_ARCH}/boot/${image} /lava-files/.
done
@@ -145,9 +145,6 @@ 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 \
+1 -1
View File
@@ -1,5 +1,5 @@
variables:
DISTRIBUTION_TAG: "2020-07-31-ntp-2"
DISTRIBUTION_TAG: "2020-08-04-ramdisk-fix"
.kernel+rootfs:
stage: container-2