Skip to content
Snippets Groups Projects
Commit e825a476 authored by Simon McVittie's avatar Simon McVittie
Browse files

runtimes: Assert that steamrt created pressure-vessel's mount points


Instead of creating them ourselves, just assert that steamrt already
did.

steamrt!51, steamrt!54, steamrt!52, steamrt!53 must be released to their
respective suites before this is merged.

Signed-off-by: default avatarSimon McVittie <smcv@collabora.com>
parent db8539c3
No related branches found
No related tags found
1 merge request!12WIP: Assert that steamrt created pressure-vessel's mount points
......@@ -29,47 +29,32 @@ add_packages:
post_script: |
set -eux
install -d -m755 /usr/lib/locale
install -d -m755 /usr/share/i18n
if [ -e /usr/share/i18n/locales/en_US ]; then
echo "en_US.UTF-8 UTF-8" > /etc/locale.gen
localedef -v -i en_US -c -f UTF-8 en_US.UTF-8 || :
test -e /usr/lib/locale/locale-archive
fi
# Arch Linux 32-bit biarch glibc looks for locales here. We might
# need to use the host system glibc when pressure-vessel brings in the
# host graphics drivers.
install -d -m755 /usr/lib32
ln -fnsv ../lib/locale /usr/lib32/locale
# Biarch OSs that are the other way round might conceivably look here
install -d -m755 /usr/lib64
ln -fnsv ../lib/locale /usr/lib64/locale
# Ensure that the libdrm folder is present
install -d -m755 /usr/share/libdrm
# Arch Linux uses a non-standard ELF interpreter for some binaries in the
# glibc package. We create two symlinks as a workaround.
ln -fnsv /lib64/ld-linux-x86-64.so.2 /usr/lib/
# Few lines above we already ensured that /usr/lib32 exists.
if [ -e /lib32/ld-linux.so.2 ]; then
# Create a symlink that the /usr merge will be able to merge
ln -fnsv /lib32/ld-linux.so.2 /usr/lib32/
else
ln -fnsv /lib/ld-linux.so.2 /usr/lib32/
test -d /usr/lib/gconv
test -d /usr/lib/locale
test -d /usr/share/i18n
test -d /usr/share/libdrm
if dpkg-query -W steamrt-container-host-compat:amd64; then
test -d /usr/lib64
test -d /usr/lib64/gconv
test -d /usr/lib64/locale
test -d /usr/lib/x86_64-linux-gnu/gconv
test -e /usr/lib/ld-linux-x86-64.so.2
test -e /usr/x86_64-pc-linux-gnu/lib/ld-linux-x86-64.so.2
fi
if dpkg-query -W steamrt-container-host-compat:i386; then
test -d /usr/lib32
test -d /usr/lib32/gconv
test -d /usr/lib32/locale
test -d /usr/lib/i386-linux-gnu/gconv
test -e /usr/i686-pc-linux-gnu/lib/ld-linux.so.2
fi
# Create symlinks to support the non-standard Exherbo library paths
install -d -m755 /usr/i686-pc-linux-gnu
install -d -m755 /usr/x86_64-pc-linux-gnu
ln -fnsv /usr/lib/i386-linux-gnu /usr/i686-pc-linux-gnu/lib
ln -fnsv /usr/lib/x86_64-linux-gnu /usr/x86_64-pc-linux-gnu/lib
# Ensure gconv directories. Previously we already ensured to have both
# /usr/lib32 and /usr/lib64. "/usr/(i686|x86_64)-pc-linux-gnu/lib" are
# symlinked to "/usr/lib/(i386|x86_64)-linux-gnu", so there is no need to
# create a "gconv" folder for them.
install -d -m755 /usr/lib32/gconv
install -d -m755 /usr/lib/gconv
install -d -m755 /usr/lib64/gconv
install -d -m755 /usr/lib/i386-linux-gnu/gconv
install -d -m755 /usr/lib/x86_64-linux-gnu/gconv
platform:
post_script: |
......
......@@ -37,47 +37,32 @@ post_script: |
set -eux
ln -s /usr/libexec/flatpak-xdg-utils/xdg-email /usr/bin/
ln -s /usr/libexec/flatpak-xdg-utils/xdg-open /usr/bin/
install -d -m755 /usr/lib/locale
install -d -m755 /usr/share/i18n
if [ -e /usr/share/i18n/locales/en_US ]; then
echo "en_US.UTF-8 UTF-8" > /etc/locale.gen
localedef -v -i en_US -c -f UTF-8 en_US.UTF-8 || :
test -e /usr/lib/locale/locale-archive
fi
# Arch Linux 32-bit biarch glibc looks for locales here. We might
# need to use the host system glibc when pressure-vessel brings in the
# host graphics drivers.
install -d -m755 /usr/lib32
ln -fnsv ../lib/locale /usr/lib32/locale
# Biarch OSs that are the other way round might conceivably look here
install -d -m755 /usr/lib64
ln -fnsv ../lib/locale /usr/lib64/locale
# Ensure that the libdrm folder is present
install -d -m755 /usr/share/libdrm
# Arch Linux uses a non-standard ELF interpreter for some binaries in the
# glibc package. We create two symlinks as a workaround.
ln -fnsv /lib64/ld-linux-x86-64.so.2 /usr/lib/
# Few lines above we already ensured that /usr/lib32 exists.
if [ -e /lib32/ld-linux.so.2 ]; then
# Create a symlink that the /usr merge will be able to merge
ln -fnsv /lib32/ld-linux.so.2 /usr/lib32/
else
ln -fnsv /lib/ld-linux.so.2 /usr/lib32/
test -d /usr/lib/gconv
test -d /usr/lib/locale
test -d /usr/share/i18n
test -d /usr/share/libdrm
if dpkg-query -W steamrt-container-host-compat:amd64; then
test -d /usr/lib64
test -d /usr/lib64/gconv
test -d /usr/lib64/locale
test -d /usr/lib/x86_64-linux-gnu/gconv
test -e /usr/lib/ld-linux-x86-64.so.2
test -e /usr/x86_64-pc-linux-gnu/lib/ld-linux-x86-64.so.2
fi
if dpkg-query -W steamrt-container-host-compat:i386; then
test -d /usr/lib32
test -d /usr/lib32/gconv
test -d /usr/lib32/locale
test -d /usr/lib/i386-linux-gnu/gconv
test -e /usr/i686-pc-linux-gnu/lib/ld-linux.so.2
fi
# Create symlinks to support the non-standard Exherbo library paths
install -d -m755 /usr/i686-pc-linux-gnu
install -d -m755 /usr/x86_64-pc-linux-gnu
ln -fnsv /usr/lib/i386-linux-gnu /usr/i686-pc-linux-gnu/lib
ln -fnsv /usr/lib/x86_64-linux-gnu /usr/x86_64-pc-linux-gnu/lib
# Ensure gconv directories. Previously we already ensured to have both
# /usr/lib32 and /usr/lib64. "/usr/(i686|x86_64)-pc-linux-gnu/lib" are
# symlinked to "/usr/lib/(i386|x86_64)-linux-gnu", so there is no need to
# create a "gconv" folder for them.
install -d -m755 /usr/lib32/gconv
install -d -m755 /usr/lib/gconv
install -d -m755 /usr/lib64/gconv
install -d -m755 /usr/lib/i386-linux-gnu/gconv
install -d -m755 /usr/lib/x86_64-linux-gnu/gconv
platform:
post_script: |
......
......@@ -34,47 +34,32 @@ post_script: |
set -eux
ln -s /usr/libexec/flatpak-xdg-utils/xdg-email /usr/bin/
ln -s /usr/libexec/flatpak-xdg-utils/xdg-open /usr/bin/
install -d -m755 /usr/lib/locale
install -d -m755 /usr/share/i18n
if [ -e /usr/share/i18n/locales/en_US ]; then
echo "en_US.UTF-8 UTF-8" > /etc/locale.gen
localedef -v -i en_US -c -f UTF-8 en_US.UTF-8 || :
test -e /usr/lib/locale/locale-archive
fi
# Arch Linux 32-bit biarch glibc looks for locales here. We might
# need to use the host system glibc when pressure-vessel brings in the
# host graphics drivers.
install -d -m755 /usr/lib32
ln -fnsv ../lib/locale /usr/lib32/locale
# Biarch OSs that are the other way round might conceivably look here
install -d -m755 /usr/lib64
ln -fnsv ../lib/locale /usr/lib64/locale
# Ensure that the libdrm folder is present
install -d -m755 /usr/share/libdrm
# Arch Linux uses a non-standard ELF interpreter for some binaries in the
# glibc package. We create two symlinks as a workaround.
ln -fnsv /lib64/ld-linux-x86-64.so.2 /usr/lib/
# Few lines above we already ensured that /usr/lib32 exists.
if [ -e /lib32/ld-linux.so.2 ]; then
# Create a symlink that the /usr merge will be able to merge
ln -fnsv /lib32/ld-linux.so.2 /usr/lib32/
else
ln -fnsv /lib/ld-linux.so.2 /usr/lib32/
test -d /usr/lib/gconv
test -d /usr/lib/locale
test -d /usr/share/i18n
test -d /usr/share/libdrm
if dpkg-query -W steamrt-container-host-compat:amd64; then
test -d /usr/lib64
test -d /usr/lib64/gconv
test -d /usr/lib64/locale
test -d /usr/lib/x86_64-linux-gnu/gconv
test -e /usr/lib/ld-linux-x86-64.so.2
test -e /usr/x86_64-pc-linux-gnu/lib/ld-linux-x86-64.so.2
fi
if dpkg-query -W steamrt-container-host-compat:i386; then
test -d /usr/lib32
test -d /usr/lib32/gconv
test -d /usr/lib32/locale
test -d /usr/lib/i386-linux-gnu/gconv
test -e /usr/i686-pc-linux-gnu/lib/ld-linux.so.2
fi
# Create symlinks to support the non-standard Exherbo library paths
install -d -m755 /usr/i686-pc-linux-gnu
install -d -m755 /usr/x86_64-pc-linux-gnu
ln -fnsv /usr/lib/i386-linux-gnu /usr/i686-pc-linux-gnu/lib
ln -fnsv /usr/lib/x86_64-linux-gnu /usr/x86_64-pc-linux-gnu/lib
# Ensure gconv directories. Previously we already ensured to have both
# /usr/lib32 and /usr/lib64. "/usr/(i686|x86_64)-pc-linux-gnu/lib" are
# symlinked to "/usr/lib/(i386|x86_64)-linux-gnu", so there is no need to
# create a "gconv" folder for them.
install -d -m755 /usr/lib32/gconv
install -d -m755 /usr/lib/gconv
install -d -m755 /usr/lib64/gconv
install -d -m755 /usr/lib/i386-linux-gnu/gconv
install -d -m755 /usr/lib/x86_64-linux-gnu/gconv
platform:
post_script: |
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment