docker: Remove LegacyKeyValueFormat warnings in generated files
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>
Philippe Mathieu-Daudé committed
May 18, 2026 at 11:55 UTC
55e6ff178d9805118133d2458aec8b0399fb53a4
19 files changed
+33
-25
scripts/git.orderfile
+4
@@ -39,3 +39,7 @@ qga/*.json
39
# code
40
*.c
41
*.c.inc
42
+
43
+# Generated Dockerfiles
44
+tests/lcitool/refresh
45
+tests/docker/dockerfiles/*
tests/docker/dockerfiles/alpine.docker
+1
-1
@@ -141,4 +141,4 @@ ARG UID
141
RUN if [ "${USER}" ]; then \
142
id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi
143
144
-ENV ENABLE_RUST 1
144
+ENV ENABLE_RUST=1
tests/docker/dockerfiles/centos9.docker
+1
-1
@@ -145,4 +145,4 @@ ARG UID
145
RUN if [ "${USER}" ]; then \
146
id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi
147
148
-ENV ENABLE_RUST 1
148
+ENV ENABLE_RUST=1
tests/docker/dockerfiles/debian-all-test-cross.docker
+6
-4
@@ -61,7 +61,8 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \
61
dpkg-dev\
62
gdb-multiarch\
63
libclang-rt-dev
64
-ENV AVAILABLE_COMPILERS gcc-aarch64-linux-gnu \
64
+ENV AVAILABLE_COMPILERS="\
65
+ gcc-aarch64-linux-gnu \
66
libc6-dev-arm64-cross \
67
gcc-arm-linux-gnueabihf \
68
libc6-dev-armhf-cross \
@@ -82,7 +83,8 @@ ENV AVAILABLE_COMPILERS gcc-aarch64-linux-gnu \
83
gcc-s390x-linux-gnu \
84
libc6-dev-s390x-cross\
85
gcc-sh4-linux-gnu \
85
- libc6-dev-sh4-cross
86
+ libc6-dev-sh4-cross \
87
+ "
88
RUN if dpkg-architecture -e amd64; then \
89
export AVAILABLE_COMPILERS="${AVAILABLE_COMPILERS} gcc-hppa-linux-gnu libc6-dev-hppa-cross"; \
90
export AVAILABLE_COMPILERS="${AVAILABLE_COMPILERS} gcc-m68k-linux-gnu libc6-dev-m68k-cross"; \
@@ -94,8 +96,8 @@ DEBIAN_FRONTEND=noninteractive eatmydata \
96
apt install -y --no-install-recommends \
97
${AVAILABLE_COMPILERS} && \
98
dpkg-query --showformat '${Package}_${Version}_${Architecture}' --show > /packages.txt
97
-ENV QEMU_CONFIGURE_OPTS --disable-docs
98
-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
99
+ENV QEMU_CONFIGURE_OPTS=--disable-docs
100
+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
101
# As a final step configure the user (if env is defined)
102
ARG USER
103
ARG UID
tests/docker/dockerfiles/debian-amd64-cross.docker
+1
-1
@@ -188,4 +188,4 @@ ARG UID
188
RUN if [ "${USER}" ]; then \
189
id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi
190
191
-ENV ENABLE_RUST 1
191
+ENV ENABLE_RUST=1
tests/docker/dockerfiles/debian-arm64-cross.docker
+1
-1
@@ -187,4 +187,4 @@ ARG UID
187
RUN if [ "${USER}" ]; then \
188
id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi
189
190
-ENV ENABLE_RUST 1
190
+ENV ENABLE_RUST=1
tests/docker/dockerfiles/debian-armhf-cross.docker
+1
-1
@@ -185,4 +185,4 @@ ARG UID
185
RUN if [ "${USER}" ]; then \
186
id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi
187
188
-ENV ENABLE_RUST 1
188
+ENV ENABLE_RUST=1
tests/docker/dockerfiles/debian-i686-cross.docker
+1
-1
@@ -185,4 +185,4 @@ ARG UID
185
RUN if [ "${USER}" ]; then \
186
id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi
187
188
-ENV ENABLE_RUST 1
188
+ENV ENABLE_RUST=1
tests/docker/dockerfiles/debian-mips64el-cross.docker
+1
-1
@@ -183,4 +183,4 @@ ARG UID
183
RUN if [ "${USER}" ]; then \
184
id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi
185
186
-ENV ENABLE_RUST 1
186
+ENV ENABLE_RUST=1
tests/docker/dockerfiles/debian-mipsel-cross.docker
+1
-1
@@ -183,4 +183,4 @@ ARG UID
183
RUN if [ "${USER}" ]; then \
184
id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi
185
186
-ENV ENABLE_RUST 1
186
+ENV ENABLE_RUST=1
tests/docker/dockerfiles/debian-ppc64el-cross.docker
+1
-1
@@ -186,4 +186,4 @@ ARG UID
186
RUN if [ "${USER}" ]; then \
187
id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi
188
189
-ENV ENABLE_RUST 1
189
+ENV ENABLE_RUST=1
tests/docker/dockerfiles/debian-riscv64-cross.docker
+1
-1
@@ -186,4 +186,4 @@ ARG UID
186
RUN if [ "${USER}" ]; then \
187
id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi
188
189
-ENV ENABLE_RUST 1
189
+ENV ENABLE_RUST=1
tests/docker/dockerfiles/debian-s390x-cross.docker
+1
-1
@@ -185,4 +185,4 @@ ARG UID
185
RUN if [ "${USER}" ]; then \
186
id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi
187
188
-ENV ENABLE_RUST 1
188
+ENV ENABLE_RUST=1
tests/docker/dockerfiles/debian.docker
+1
-1
@@ -175,4 +175,4 @@ ARG UID
175
RUN if [ "${USER}" ]; then \
176
id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi
177
178
-ENV ENABLE_RUST 1
178
+ENV ENABLE_RUST=1
tests/docker/dockerfiles/fedora-rust-nightly.docker
+1
-1
@@ -185,4 +185,4 @@ ARG UID
185
RUN if [ "${USER}" ]; then \
186
id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi
187
188
-ENV ENABLE_RUST 1
188
+ENV ENABLE_RUST=1
tests/docker/dockerfiles/fedora-win64-cross.docker
+1
-1
@@ -120,4 +120,4 @@ ARG UID
120
RUN if [ "${USER}" ]; then \
121
id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi
122
123
-ENV ENABLE_RUST 1
123
+ENV ENABLE_RUST=1
tests/docker/dockerfiles/fedora.docker
+1
-1
@@ -162,4 +162,4 @@ ARG UID
162
RUN if [ "${USER}" ]; then \
163
id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi
164
165
-ENV ENABLE_RUST 1
165
+ENV ENABLE_RUST=1
tests/docker/dockerfiles/opensuse-leap.docker
+1
-1
@@ -149,4 +149,4 @@ ARG UID
149
RUN if [ "${USER}" ]; then \
150
id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi
151
152
-ENV ENABLE_RUST 1
152
+ENV ENABLE_RUST=1
tests/lcitool/refresh
+7
-5
@@ -77,7 +77,7 @@ def generate_dockerfile(host, target, project="qemu", cross=None, trailer=None,
77
trailer = "\n".join(add_user_mapping)
78
79
if enable_rust:
80
- trailer += "\nENV ENABLE_RUST 1\n"
80
+ trailer += "\nENV ENABLE_RUST=1\n"
81
generate(filename, cmd, trailer)
82
83
@@ -169,7 +169,8 @@ debian_all_test_cross_compilers = [
169
" dpkg-dev\\\n",
170
" gdb-multiarch\\\n",
171
" libclang-rt-dev\n",
172
- "ENV AVAILABLE_COMPILERS gcc-aarch64-linux-gnu \\\n",
172
+ "ENV AVAILABLE_COMPILERS=\"\\\n",
173
+ " gcc-aarch64-linux-gnu \\\n",
174
" libc6-dev-arm64-cross \\\n",
175
" gcc-arm-linux-gnueabihf \\\n",
176
" libc6-dev-armhf-cross \\\n",
@@ -190,7 +191,8 @@ debian_all_test_cross_compilers = [
191
" gcc-s390x-linux-gnu \\\n",
192
" libc6-dev-s390x-cross\\\n",
193
" gcc-sh4-linux-gnu \\\n",
193
- " libc6-dev-sh4-cross\n",
194
+ " libc6-dev-sh4-cross \\\n",
195
+ " \"\n",
196
"RUN if dpkg-architecture -e amd64; then \\\n",
197
" export AVAILABLE_COMPILERS=\"${AVAILABLE_COMPILERS} gcc-hppa-linux-gnu libc6-dev-hppa-cross\"; \\\n",
198
" export AVAILABLE_COMPILERS=\"${AVAILABLE_COMPILERS} gcc-m68k-linux-gnu libc6-dev-m68k-cross\"; \\\n",
@@ -202,8 +204,8 @@ debian_all_test_cross_compilers = [
204
"apt install -y --no-install-recommends \\\n",
205
"${AVAILABLE_COMPILERS} && \\\n",
206
"dpkg-query --showformat '${Package}_${Version}_${Architecture}' --show > /packages.txt\n",
205
- "ENV QEMU_CONFIGURE_OPTS --disable-docs\n",
206
- "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",
207
+ "ENV QEMU_CONFIGURE_OPTS=--disable-docs\n",
208
+ "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",
209
]
210
211
def cross_build(prefix, targets):