ci: disable initrd support

For baremetal CI we are using a 'dummy' rootfs as it is required by
abootimg. This causes NFS boot problems when using u-boot as bootloader.

[   13.230968] RAMDISK: gzip image found at block 0
[   13.235645] using deprecated initrd support, will be removed in 2021.
[   13.243106] List of all partitions:

If we disable CONFIG_BLK_DEV_INITRD nfsroot works.

Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10024>
This commit is contained in:
Christian Gmeiner 2021-04-04 12:30:16 +02:00 committed by Marge Bot
parent 757a711f39
commit 08ea007664
5 changed files with 11 additions and 2 deletions

View File

@ -450,7 +450,7 @@ kernel+rootfs_arm64-baremetal:
variables:
DEBIAN_ARCH: "arm64"
KERNEL_URL: "https://github.com/anholt/linux/archive/mesa-ci-2021-04-01-5.11.tar.gz"
MESA_ROOTFS_TAG: &arm-baremetal "2021-04-14-librenderdoc"
MESA_ROOTFS_TAG: &arm-baremetal "2021-04-15-nfsroot"
MINIO_SUFFIX: "baremetal"
# Kernel & rootfs for armhf baremetal testing

View File

@ -2,6 +2,9 @@ CONFIG_LOCALVERSION="ccu"
CONFIG_DEBUG_KERNEL=y
# abootimg with a 'dummy' rootfs fails with root=/dev/nfs
CONFIG_BLK_DEV_INITRD=n
CONFIG_DEVFREQ_GOV_PERFORMANCE=y
CONFIG_DEVFREQ_GOV_POWERSAVE=y
CONFIG_DEVFREQ_GOV_USERSPACE=y

View File

@ -2,6 +2,9 @@ CONFIG_LOCALVERSION="ccu"
CONFIG_DEBUG_KERNEL=y
# abootimg with a 'dummy' rootfs fails with root=/dev/nfs
CONFIG_BLK_DEV_INITRD=n
CONFIG_DEVFREQ_GOV_PERFORMANCE=y
CONFIG_DEVFREQ_GOV_POWERSAVE=y
CONFIG_DEVFREQ_GOV_USERSPACE=y

View File

@ -2,6 +2,9 @@ CONFIG_LOCALVERSION="ccu"
CONFIG_DEBUG_KERNEL=y
# abootimg with a 'dummy' rootfs fails with root=/dev/nfs
CONFIG_BLK_DEV_INITRD=n
CONFIG_DEVFREQ_GOV_PERFORMANCE=y
CONFIG_DEVFREQ_GOV_POWERSAVE=y
CONFIG_DEVFREQ_GOV_USERSPACE=y

View File

@ -14,7 +14,7 @@
variables:
KERNEL_URL: "https://gitlab.freedesktop.org/tomeu/linux/-/archive/v5.10-rc2-for-mesa-ci/linux-v5.10-rc2-for-mesa-ci.tar.gz"
INSTALL_KERNEL_MODULES: 1
MESA_ROOTFS_TAG: &lava-rootfs "2021-04-14-librenderdoc"
MESA_ROOTFS_TAG: &lava-rootfs "2021-04-15-nfsroot"
MINIO_SUFFIX: "lava"
PIGLIT_BUILD_TARGETS: "piglit_replayer"