| Message ID | 20210825000520.19368-2-bmeng.cn@gmail.com |
|---|---|
| State | Superseded |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [1/4] tools: docker: Bump up QEMU version to 6.1.0 | expand |
On Wed, Aug 25, 2021 at 08:05:18AM +0800, Bin Meng wrote: > genimage [1] is a tool to create flash/disk images. This is required > by some targets, e.g.: sifive_unleashed, to generate sdcard or spi-nor > images for real hardware, as well as U-Boot CI testing. > > [1] https://github.com/pengutronix/genimage > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> > --- > > tools/docker/Dockerfile | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile > index be6d7dd4dc..8e558ca495 100644 > --- a/tools/docker/Dockerfile > +++ b/tools/docker/Dockerfile > @@ -60,6 +60,7 @@ RUN apt-get update && apt-get install -y \ > iasl \ > imagemagick \ > iputils-ping \ > + libconfuse-dev \ > libgit2-dev \ > libguestfs-tools \ > liblz4-tool \ > @@ -172,6 +173,14 @@ RUN git clone https://gitlab.com/lbmeng/qemu.git /tmp/qemu && \ > make -j$(nproc) all install && \ > rm -rf /tmp/qemu > > +# Build genimage (required by some targets to generate disk images) > +RUN wget -O - https://github.com/pengutronix/genimage/releases/download/v14/genimage-14.tar.xz | tar -C /opt -xJ && \ > + cd /opt/genimage-14 && \ > + ./configure && \ > + make -j$(nproc) && \ > + make install && \ > + rm -rf /opt/genimage-14 > + If we're building, we should do it in /tmp like the rest of the recipe does.
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index be6d7dd4dc..8e558ca495 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -60,6 +60,7 @@ RUN apt-get update && apt-get install -y \ iasl \ imagemagick \ iputils-ping \ + libconfuse-dev \ libgit2-dev \ libguestfs-tools \ liblz4-tool \ @@ -172,6 +173,14 @@ RUN git clone https://gitlab.com/lbmeng/qemu.git /tmp/qemu && \ make -j$(nproc) all install && \ rm -rf /tmp/qemu +# Build genimage (required by some targets to generate disk images) +RUN wget -O - https://github.com/pengutronix/genimage/releases/download/v14/genimage-14.tar.xz | tar -C /opt -xJ && \ + cd /opt/genimage-14 && \ + ./configure && \ + make -j$(nproc) && \ + make install && \ + rm -rf /opt/genimage-14 + # Create our user/group RUN echo uboot ALL=NOPASSWD: ALL > /etc/sudoers.d/uboot RUN useradd -m -U uboot
genimage [1] is a tool to create flash/disk images. This is required by some targets, e.g.: sifive_unleashed, to generate sdcard or spi-nor images for real hardware, as well as U-Boot CI testing. [1] https://github.com/pengutronix/genimage Signed-off-by: Bin Meng <bmeng.cn@gmail.com> --- tools/docker/Dockerfile | 9 +++++++++ 1 file changed, 9 insertions(+)