friedkiwi/qemu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

docker: Remove LegacyKeyValueFormat warnings in generated files

Browse Source 
Display lcitool changes before generated ones.

Update lcitool refresh script to not use legacy 'ENV key value'
format:
https://docs.docker.com/reference/build-checks/legacy-key-value-format/

Run "make lcitool-refresh" to update the generated container files.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
Message-ID: <20260518102222.80735-8-philmd@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé
2026-05-18 11:55:20 +02:00
parent c75f4af469
commit 55e6ff178d
19 changed files with 33 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/git.orderfile
View File

@@ -39,3 +39,7 @@ qga/*.json
# code
*.c
*.c.inc
# Generated Dockerfiles
tests/lcitool/refresh
tests/docker/dockerfiles/*

2
tests/docker/dockerfiles/alpine.docker
View File

@@ -141,4 +141,4 @@ ARG UID
RUN if [ "${USER}" ]; then \
id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi
ENV ENABLE_RUST 1
ENV ENABLE_RUST=1

2
tests/docker/dockerfiles/centos9.docker
View File

@@ -145,4 +145,4 @@ ARG UID
RUN if [ "${USER}" ]; then \
id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi
ENV ENABLE_RUST 1
ENV ENABLE_RUST=1

10
tests/docker/dockerfiles/debian-all-test-cross.docker
View File

@@ -61,7 +61,8 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \
dpkg-dev\
gdb-multiarch\
libclang-rt-dev
ENV AVAILABLE_COMPILERS gcc-aarch64-linux-gnu \
ENV AVAILABLE_COMPILERS="\
gcc-aarch64-linux-gnu \
libc6-dev-arm64-cross \
gcc-arm-linux-gnueabihf \
libc6-dev-armhf-cross \
@@ -82,7 +83,8 @@ ENV AVAILABLE_COMPILERS gcc-aarch64-linux-gnu \
gcc-s390x-linux-gnu \
libc6-dev-s390x-cross\
gcc-sh4-linux-gnu \
libc6-dev-sh4-cross
libc6-dev-sh4-cross \
"
RUN if dpkg-architecture -e amd64; then \
export AVAILABLE_COMPILERS="${AVAILABLE_COMPILERS} gcc-hppa-linux-gnu libc6-dev-hppa-cross"; \
export AVAILABLE_COMPILERS="${AVAILABLE_COMPILERS} gcc-m68k-linux-gnu libc6-dev-m68k-cross"; \
@@ -94,8 +96,8 @@ DEBIAN_FRONTEND=noninteractive eatmydata \
apt install -y --no-install-recommends \
${AVAILABLE_COMPILERS} && \
dpkg-query --showformat '${Package}_${Version}_${Architecture}' --show > /packages.txt
ENV QEMU_CONFIGURE_OPTS --disable-docs
ENV DEF_TARGET_LIST aarch64-linux-user,alpha-linux-user,arm-linux-user,hppa-linux-user,i386-linux-user,m68k-linux-user,mips-linux-user,mips64-linux-user,mips64el-linux-user,mipsel-linux-user,ppc-linux-user,ppc64-linux-user,ppc64le-linux-user,riscv64-linux-user,s390x-linux-user,sh4-linux-user,sparc64-linux-user
ENV QEMU_CONFIGURE_OPTS=--disable-docs
ENV DEF_TARGET_LIST=aarch64-linux-user,alpha-linux-user,arm-linux-user,hppa-linux-user,i386-linux-user,m68k-linux-user,mips-linux-user,mips64-linux-user,mips64el-linux-user,mipsel-linux-user,ppc-linux-user,ppc64-linux-user,ppc64le-linux-user,riscv64-linux-user,s390x-linux-user,sh4-linux-user,sparc64-linux-user
# As a final step configure the user (if env is defined)
ARG USER
ARG UID

2
tests/docker/dockerfiles/debian-amd64-cross.docker
View File

@@ -188,4 +188,4 @@ ARG UID
RUN if [ "${USER}" ]; then \
id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi
ENV ENABLE_RUST 1
ENV ENABLE_RUST=1

2
tests/docker/dockerfiles/debian-arm64-cross.docker
View File

@@ -187,4 +187,4 @@ ARG UID
RUN if [ "${USER}" ]; then \
id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi
ENV ENABLE_RUST 1
ENV ENABLE_RUST=1

2
tests/docker/dockerfiles/debian-armhf-cross.docker
View File

@@ -185,4 +185,4 @@ ARG UID
RUN if [ "${USER}" ]; then \
id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi
ENV ENABLE_RUST 1
ENV ENABLE_RUST=1

2
tests/docker/dockerfiles/debian-i686-cross.docker
View File

@@ -185,4 +185,4 @@ ARG UID
RUN if [ "${USER}" ]; then \
id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi
ENV ENABLE_RUST 1
ENV ENABLE_RUST=1

2
tests/docker/dockerfiles/debian-mips64el-cross.docker
View File

@@ -183,4 +183,4 @@ ARG UID
RUN if [ "${USER}" ]; then \
id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi
ENV ENABLE_RUST 1
ENV ENABLE_RUST=1

2
tests/docker/dockerfiles/debian-mipsel-cross.docker
View File

@@ -183,4 +183,4 @@ ARG UID
RUN if [ "${USER}" ]; then \
id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi
ENV ENABLE_RUST 1
ENV ENABLE_RUST=1

2
tests/docker/dockerfiles/debian-ppc64el-cross.docker
View File

@@ -186,4 +186,4 @@ ARG UID
RUN if [ "${USER}" ]; then \
id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi
ENV ENABLE_RUST 1
ENV ENABLE_RUST=1

2
tests/docker/dockerfiles/debian-riscv64-cross.docker
View File

@@ -186,4 +186,4 @@ ARG UID
RUN if [ "${USER}" ]; then \
id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi
ENV ENABLE_RUST 1
ENV ENABLE_RUST=1

2
tests/docker/dockerfiles/debian-s390x-cross.docker
View File

@@ -185,4 +185,4 @@ ARG UID
RUN if [ "${USER}" ]; then \
id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi
ENV ENABLE_RUST 1
ENV ENABLE_RUST=1

2
tests/docker/dockerfiles/debian.docker
View File

@@ -175,4 +175,4 @@ ARG UID
RUN if [ "${USER}" ]; then \
id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi
ENV ENABLE_RUST 1
ENV ENABLE_RUST=1

2
tests/docker/dockerfiles/fedora-rust-nightly.docker
View File

@@ -185,4 +185,4 @@ ARG UID
RUN if [ "${USER}" ]; then \
id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi
ENV ENABLE_RUST 1
ENV ENABLE_RUST=1

2
tests/docker/dockerfiles/fedora-win64-cross.docker
View File

@@ -120,4 +120,4 @@ ARG UID
RUN if [ "${USER}" ]; then \
id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi
ENV ENABLE_RUST 1
ENV ENABLE_RUST=1

2
tests/docker/dockerfiles/fedora.docker
View File

@@ -162,4 +162,4 @@ ARG UID
RUN if [ "${USER}" ]; then \
id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi
ENV ENABLE_RUST 1
ENV ENABLE_RUST=1

2
tests/docker/dockerfiles/opensuse-leap.docker
View File

@@ -149,4 +149,4 @@ ARG UID
RUN if [ "${USER}" ]; then \
id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi
ENV ENABLE_RUST 1
ENV ENABLE_RUST=1

12
tests/lcitool/refresh
View File

@@ -77,7 +77,7 @@ def generate_dockerfile(host, target, project="qemu", cross=None, trailer=None,
trailer = "\n".join(add_user_mapping)
if enable_rust:
trailer += "\nENV ENABLE_RUST 1\n"
trailer += "\nENV ENABLE_RUST=1\n"
generate(filename, cmd, trailer)
@@ -169,7 +169,8 @@ debian_all_test_cross_compilers = [
" dpkg-dev\\\n",
" gdb-multiarch\\\n",
" libclang-rt-dev\n",
"ENV AVAILABLE_COMPILERS gcc-aarch64-linux-gnu \\\n",
"ENV AVAILABLE_COMPILERS=\"\\\n",
" gcc-aarch64-linux-gnu \\\n",
" libc6-dev-arm64-cross \\\n",
" gcc-arm-linux-gnueabihf \\\n",
" libc6-dev-armhf-cross \\\n",
@@ -190,7 +191,8 @@ debian_all_test_cross_compilers = [
" gcc-s390x-linux-gnu \\\n",
" libc6-dev-s390x-cross\\\n",
" gcc-sh4-linux-gnu \\\n",
" libc6-dev-sh4-cross\n",
" libc6-dev-sh4-cross \\\n",
" \"\n",
"RUN if dpkg-architecture -e amd64; then \\\n",
" export AVAILABLE_COMPILERS=\"${AVAILABLE_COMPILERS} gcc-hppa-linux-gnu libc6-dev-hppa-cross\"; \\\n",
" export AVAILABLE_COMPILERS=\"${AVAILABLE_COMPILERS} gcc-m68k-linux-gnu libc6-dev-m68k-cross\"; \\\n",
@@ -202,8 +204,8 @@ debian_all_test_cross_compilers = [
"apt install -y --no-install-recommends \\\n",
"${AVAILABLE_COMPILERS} && \\\n",
"dpkg-query --showformat '${Package}_${Version}_${Architecture}' --show > /packages.txt\n",
"ENV QEMU_CONFIGURE_OPTS --disable-docs\n",
"ENV DEF_TARGET_LIST aarch64-linux-user,alpha-linux-user,arm-linux-user,hppa-linux-user,i386-linux-user,m68k-linux-user,mips-linux-user,mips64-linux-user,mips64el-linux-user,mipsel-linux-user,ppc-linux-user,ppc64-linux-user,ppc64le-linux-user,riscv64-linux-user,s390x-linux-user,sh4-linux-user,sparc64-linux-user\n",
"ENV QEMU_CONFIGURE_OPTS=--disable-docs\n",
"ENV DEF_TARGET_LIST=aarch64-linux-user,alpha-linux-user,arm-linux-user,hppa-linux-user,i386-linux-user,m68k-linux-user,mips-linux-user,mips64-linux-user,mips64el-linux-user,mipsel-linux-user,ppc-linux-user,ppc64-linux-user,ppc64le-linux-user,riscv64-linux-user,s390x-linux-user,sh4-linux-user,sparc64-linux-user\n",
]
def cross_build(prefix, targets):