tests/docker: convert riscv64-cross to lcitool
We still need to base this on Debian Sid until riscv64 is promoted to a release architecture (or another distro provides a full cross compile target). We use the new qemu-minimal project description to avoid bringing in all the extra dependencies because every extra package is another chance for sid to fail. Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Message-Id: <20230630180423.558337-16-alex.bennee@linaro.org>
This commit is contained in:
parent
b911b9001e
commit
0101dd71b0
|
@ -1,54 +1,85 @@
|
||||||
|
# THIS FILE WAS AUTO-GENERATED
|
||||||
#
|
#
|
||||||
# Docker cross-compiler target for riscv64
|
# $ lcitool dockerfile --layers all --cross riscv64 debian-sid qemu-minimal
|
||||||
#
|
|
||||||
# Currently the only distro that gets close to cross compiling riscv64
|
|
||||||
# images is Debian Sid (with unofficial ports). As this is a moving
|
|
||||||
# target we keep the library list minimal and are aiming to migrate
|
|
||||||
# from this hack as soon as we are able.
|
|
||||||
#
|
#
|
||||||
|
# https://gitlab.com/libvirt/libvirt-ci
|
||||||
|
|
||||||
FROM docker.io/library/debian:sid-slim
|
FROM docker.io/library/debian:sid-slim
|
||||||
|
|
||||||
# Add ports
|
RUN export DEBIAN_FRONTEND=noninteractive && \
|
||||||
RUN apt update && \
|
apt-get update && \
|
||||||
DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \
|
apt-get install -y eatmydata && \
|
||||||
DEBIAN_FRONTEND=noninteractive eatmydata apt update -yy && \
|
eatmydata apt-get dist-upgrade -y && \
|
||||||
DEBIAN_FRONTEND=noninteractive eatmydata apt upgrade -yy
|
eatmydata apt-get install --no-install-recommends -y \
|
||||||
|
bash \
|
||||||
# Install common build utilities
|
|
||||||
RUN DEBIAN_FRONTEND=noninteractive eatmydata apt install -yy \
|
|
||||||
bison \
|
|
||||||
bc \
|
bc \
|
||||||
build-essential \
|
bison \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
debian-ports-archive-keyring \
|
ccache \
|
||||||
dpkg-dev \
|
findutils \
|
||||||
flex \
|
flex \
|
||||||
gettext \
|
gcc \
|
||||||
git \
|
git \
|
||||||
libglib2.0-dev \
|
libglib2.0-dev \
|
||||||
|
locales \
|
||||||
|
make \
|
||||||
|
meson \
|
||||||
ninja-build \
|
ninja-build \
|
||||||
pkg-config \
|
pkgconf \
|
||||||
python3 \
|
python3 \
|
||||||
python3-venv
|
python3-venv \
|
||||||
|
sed \
|
||||||
|
tar && \
|
||||||
|
eatmydata apt-get autoremove -y && \
|
||||||
|
eatmydata apt-get autoclean -y && \
|
||||||
|
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
|
||||||
|
dpkg-reconfigure locales
|
||||||
|
|
||||||
# Add ports and riscv64 architecture
|
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
|
||||||
RUN echo "deb http://ftp.ports.debian.org/debian-ports/ sid main" >> /etc/apt/sources.list
|
ENV LANG "en_US.UTF-8"
|
||||||
RUN dpkg --add-architecture riscv64
|
ENV MAKE "/usr/bin/make"
|
||||||
|
ENV NINJA "/usr/bin/ninja"
|
||||||
|
ENV PYTHON "/usr/bin/python3"
|
||||||
|
|
||||||
# Duplicate deb line as deb-src
|
RUN export DEBIAN_FRONTEND=noninteractive && \
|
||||||
RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list
|
dpkg --add-architecture riscv64 && \
|
||||||
|
eatmydata apt-get install debian-ports-archive-keyring && \
|
||||||
RUN apt update && \
|
eatmydata echo 'deb http://ftp.ports.debian.org/debian-ports/ sid main' > /etc/apt/sources.list.d/ports.list && \
|
||||||
DEBIAN_FRONTEND=noninteractive eatmydata \
|
eatmydata echo 'deb http://ftp.ports.debian.org/debian-ports/ unreleased main' >> /etc/apt/sources.list.d/ports.list && \
|
||||||
apt install -y --no-install-recommends \
|
eatmydata apt-get update && \
|
||||||
|
eatmydata apt-get dist-upgrade -y && \
|
||||||
|
eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
|
||||||
|
eatmydata apt-get install --no-install-recommends -y \
|
||||||
|
g++-riscv64-linux-gnu \
|
||||||
gcc-riscv64-linux-gnu \
|
gcc-riscv64-linux-gnu \
|
||||||
libc6-dev-riscv64-cross \
|
libc6-dev:riscv64 \
|
||||||
libfdt-dev:riscv64 \
|
libfdt-dev:riscv64 \
|
||||||
libffi-dev:riscv64 \
|
libffi-dev:riscv64 \
|
||||||
libglib2.0-dev:riscv64 \
|
libglib2.0-dev:riscv64 \
|
||||||
libpixman-1-dev:riscv64
|
libpixman-1-dev:riscv64 && \
|
||||||
|
eatmydata apt-get autoremove -y && \
|
||||||
|
eatmydata apt-get autoclean -y && \
|
||||||
|
mkdir -p /usr/local/share/meson/cross && \
|
||||||
|
printf "[binaries]\n\
|
||||||
|
c = '/usr/bin/riscv64-linux-gnu-gcc'\n\
|
||||||
|
ar = '/usr/bin/riscv64-linux-gnu-gcc-ar'\n\
|
||||||
|
strip = '/usr/bin/riscv64-linux-gnu-strip'\n\
|
||||||
|
pkgconfig = '/usr/bin/riscv64-linux-gnu-pkg-config'\n\
|
||||||
|
\n\
|
||||||
|
[host_machine]\n\
|
||||||
|
system = 'linux'\n\
|
||||||
|
cpu_family = 'riscv64'\n\
|
||||||
|
cpu = 'riscv64'\n\
|
||||||
|
endian = 'little'\n" > /usr/local/share/meson/cross/riscv64-linux-gnu && \
|
||||||
|
dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
|
||||||
|
mkdir -p /usr/libexec/ccache-wrappers && \
|
||||||
|
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/riscv64-linux-gnu-c++ && \
|
||||||
|
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/riscv64-linux-gnu-cc && \
|
||||||
|
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/riscv64-linux-gnu-g++ && \
|
||||||
|
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/riscv64-linux-gnu-gcc
|
||||||
|
|
||||||
# Specify the cross prefix for this image (see tests/docker/common.rc)
|
ENV ABI "riscv64-linux-gnu"
|
||||||
|
ENV MESON_OPTS "--cross-file=riscv64-linux-gnu"
|
||||||
ENV QEMU_CONFIGURE_OPTS --cross-prefix=riscv64-linux-gnu-
|
ENV QEMU_CONFIGURE_OPTS --cross-prefix=riscv64-linux-gnu-
|
||||||
ENV DEF_TARGET_LIST riscv64-softmmu,riscv64-linux-user
|
ENV DEF_TARGET_LIST riscv64-softmmu,riscv64-linux-user
|
||||||
# As a final step configure the user (if env is defined)
|
# As a final step configure the user (if env is defined)
|
||||||
|
|
|
@ -63,12 +63,12 @@ add_user_mapping = [
|
||||||
" id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi\n"
|
" id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi\n"
|
||||||
]
|
]
|
||||||
|
|
||||||
def generate_dockerfile(host, target, cross=None, trailer=None):
|
def generate_dockerfile(host, target, project="qemu", cross=None, trailer=None):
|
||||||
filename = Path(src_dir, "tests", "docker", "dockerfiles", host + ".docker")
|
filename = Path(src_dir, "tests", "docker", "dockerfiles", host + ".docker")
|
||||||
cmd = lcitool_cmd + ["dockerfile"]
|
cmd = lcitool_cmd + ["dockerfile"]
|
||||||
if cross is not None:
|
if cross is not None:
|
||||||
cmd.extend(["--cross", cross])
|
cmd.extend(["--cross", cross])
|
||||||
cmd.extend([target, "qemu"])
|
cmd.extend([target, project])
|
||||||
|
|
||||||
if trailer is not None:
|
if trailer is not None:
|
||||||
trailer += "\n".join(add_user_mapping)
|
trailer += "\n".join(add_user_mapping)
|
||||||
|
@ -164,6 +164,12 @@ try:
|
||||||
trailer=cross_build("powerpc64le-linux-gnu-",
|
trailer=cross_build("powerpc64le-linux-gnu-",
|
||||||
"ppc64-softmmu,ppc64-linux-user"))
|
"ppc64-softmmu,ppc64-linux-user"))
|
||||||
|
|
||||||
|
generate_dockerfile("debian-riscv64-cross", "debian-sid",
|
||||||
|
project="qemu-minimal",
|
||||||
|
cross="riscv64",
|
||||||
|
trailer=cross_build("riscv64-linux-gnu-",
|
||||||
|
"riscv64-softmmu,riscv64-linux-user"))
|
||||||
|
|
||||||
generate_dockerfile("debian-s390x-cross", "debian-11",
|
generate_dockerfile("debian-s390x-cross", "debian-11",
|
||||||
cross="s390x",
|
cross="s390x",
|
||||||
trailer=cross_build("s390x-linux-gnu-",
|
trailer=cross_build("s390x-linux-gnu-",
|
||||||
|
|
Loading…
Reference in New Issue