| Message ID | 20211014224435.2539547-2-richard.henderson@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | tests: docker images for hexagon, nios2, microblaze | expand |
Richard Henderson <richard.henderson@linaro.org> writes: > Replace the complex apt-get subshell with apt build-dep. > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- > tests/docker/dockerfiles/debian10.docker | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/tests/docker/dockerfiles/debian10.docker b/tests/docker/dockerfiles/debian10.docker > index b414af1b9f..d3bbb90c64 100644 > --- a/tests/docker/dockerfiles/debian10.docker > +++ b/tests/docker/dockerfiles/debian10.docker > @@ -14,7 +14,8 @@ RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.lis > > # Install common build utilities > RUN apt update && \ > - DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \ > + DEBIAN_FRONTEND=noninteractive \ > + apt install -yy eatmydata && \ > DEBIAN_FRONTEND=noninteractive eatmydata \ > apt install -y --no-install-recommends \ > bc \ > @@ -33,5 +34,7 @@ RUN apt update && \ > psmisc \ > python3 \ > python3-sphinx \ > - python3-sphinx-rtd-theme \ > - $(apt-get -s build-dep --arch-only qemu | egrep ^Inst | fgrep '[all]' | cut -d\ -f2) > + python3-sphinx-rtd-theme > + > +RUN DEBIAN_FRONTEND=noninteractive eatmydata \ > + apt build-dep -yy qemu I'd rather preserve the --arch-only while moving it. Otherwise: Reviewed-by: Alex Bennée <alex.bennee@linaro.org> -- Alex Bennée
diff --git a/tests/docker/dockerfiles/debian10.docker b/tests/docker/dockerfiles/debian10.docker index b414af1b9f..d3bbb90c64 100644 --- a/tests/docker/dockerfiles/debian10.docker +++ b/tests/docker/dockerfiles/debian10.docker @@ -14,7 +14,8 @@ RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.lis # Install common build utilities RUN apt update && \ - DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \ + DEBIAN_FRONTEND=noninteractive \ + apt install -yy eatmydata && \ DEBIAN_FRONTEND=noninteractive eatmydata \ apt install -y --no-install-recommends \ bc \ @@ -33,5 +34,7 @@ RUN apt update && \ psmisc \ python3 \ python3-sphinx \ - python3-sphinx-rtd-theme \ - $(apt-get -s build-dep --arch-only qemu | egrep ^Inst | fgrep '[all]' | cut -d\ -f2) + python3-sphinx-rtd-theme + +RUN DEBIAN_FRONTEND=noninteractive eatmydata \ + apt build-dep -yy qemu
Replace the complex apt-get subshell with apt build-dep. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- tests/docker/dockerfiles/debian10.docker | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) -- 2.25.1