diff options
| author | Cristian Ciocaltea <cristian.ciocaltea@collabora.com> | 2022-03-23 17:51:24 +0200 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2022-03-23 20:31:06 +0000 |
| commit | 315842e27cc39cd8e8e7951bc82bbc2ec2893a3f (patch) | |
| tree | 4f5e17442b16ca3734277821a869d000146002e8 /.gitlab-ci | |
| parent | a5884df949e6c33329add11d606b3287dd497293 (diff) | |
ci: Make bash available in LAVA rootfs
Ensure 'bash' shell interpreter is available in LAVA rootfs since it is
going to be a dependency requirement from several scripts, e.g.
generate-env.sh.
Suggested-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15524>
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/container/create-rootfs.sh | 4 | ||||
| -rw-r--r-- | .gitlab-ci/image-tags.yml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab-ci/container/create-rootfs.sh b/.gitlab-ci/container/create-rootfs.sh index 8613901ed0c..65d35f223ea 100644 --- a/.gitlab-ci/container/create-rootfs.sh +++ b/.gitlab-ci/container/create-rootfs.sh @@ -36,6 +36,7 @@ INSTALL_CI_FAIRY_PACKAGES="git apt-get -y install --no-install-recommends \ $ARCH_PACKAGES \ $INSTALL_CI_FAIRY_PACKAGES \ + bash \ ca-certificates \ firmware-realtek \ initramfs-tools \ @@ -170,7 +171,6 @@ UNNEEDED_PACKAGES="apt libapt-pkg6.0 "\ "insserv "\ "udev "\ "init-system-helpers "\ -"bash "\ "cpio "\ "passwd "\ "libsemanage1 libsemanage-common "\ @@ -216,7 +216,7 @@ rm -rf var/* opt srv share # ca-certificates are in /etc drop the source rm -rf usr/share/ca-certificates -# No bash, no need for completions +# No need for completions rm -rf usr/share/bash-completion # No zsh, no need for comletions diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 45d975dfc5e..216bcbccdec 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -12,7 +12,7 @@ variables: DEBIAN_X86_TEST_VK_TAG: "2022-02-21-libdrm" FEDORA_X86_BUILD_TAG: "2022-03-18-spirv-tools-5" - KERNEL_ROOTFS_TAG: "2022-03-04-crosvm-kvm" + KERNEL_ROOTFS_TAG: "2022-03-23-bash" WINDOWS_X64_BUILD_PATH: "windows/x64_build" WINDOWS_X64_BUILD_TAG: "2022-20-02-base_split" |