From a0dd9312a1d60129a5394cfd697045232182237f Mon Sep 17 00:00:00 2001 From: yishangzhang Date: Tue, 30 May 2023 17:06:52 +0800 Subject: [PATCH] fix:Correcting the way of deleting the qemu-build file (#75) Signed-off-by: yishangzhang --- Fedora-35/Dockerfile | 3 ++- Fedora-35/Readme.md | 1 + Fedora-37/Dockerfile | 3 ++- Ubuntu-20/Dockerfile | 1 + Ubuntu-22/Dockerfile | 1 + 5 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Fedora-35/Dockerfile b/Fedora-35/Dockerfile index 32562f8..b62fa33 100644 --- a/Fedora-35/Dockerfile +++ b/Fedora-35/Dockerfile @@ -99,7 +99,8 @@ RUN dnf \ cd qemu && \ ./configure --target-list=x86_64-softmmu,arm-softmmu,aarch64-softmmu,loongarch64-softmmu --enable-gtk && \ make install -j $(nproc) && \ - rm -rf qemu-build && \ + cd .. && \ + rm -rf qemu && \ dnf \ --assumeyes \ remove \ diff --git a/Fedora-35/Readme.md b/Fedora-35/Readme.md index c8f202e..6988f30 100644 --- a/Fedora-35/Readme.md +++ b/Fedora-35/Readme.md @@ -20,3 +20,4 @@ These images include: - nasm 2.15.05 - Python 3.10 - Qemu 8.0.0 (x86, arm ,aarch64, loongarch) + diff --git a/Fedora-37/Dockerfile b/Fedora-37/Dockerfile index 3c8876c..9985ee7 100644 --- a/Fedora-37/Dockerfile +++ b/Fedora-37/Dockerfile @@ -101,7 +101,8 @@ RUN dnf \ cd qemu && \ ./configure --target-list=x86_64-softmmu,arm-softmmu,aarch64-softmmu,loongarch64-softmmu --enable-gtk && \ make install -j $(nproc) && \ - rm -rf qemu-build && \ + cd .. && \ + rm -rf qemu && \ dnf \ --assumeyes \ remove \ diff --git a/Ubuntu-20/Dockerfile b/Ubuntu-20/Dockerfile index ba05e18..229683b 100644 --- a/Ubuntu-20/Dockerfile +++ b/Ubuntu-20/Dockerfile @@ -162,6 +162,7 @@ RUN apt-get update && apt-get install --yes --no-install-recommends \ tar -xf qemu-7.1.0.tar.xz --strip-components=1 && \ ./configure --target-list=x86_64-softmmu,arm-softmmu,aarch64-softmmu,riscv32-softmmu,riscv32-linux-user,riscv64-linux-user,riscv64-softmmu && \ make install -j $(nproc) && \ + cd .. && \ rm -rf qemu-build && \ apt remove --yes \ ninja-build diff --git a/Ubuntu-22/Dockerfile b/Ubuntu-22/Dockerfile index 6618236..543161f 100644 --- a/Ubuntu-22/Dockerfile +++ b/Ubuntu-22/Dockerfile @@ -151,6 +151,7 @@ RUN apt-get update && apt-get install --yes --no-install-recommends \ tar -xf qemu-7.1.0.tar.xz --strip-components=1 && \ ./configure --target-list=x86_64-softmmu,arm-softmmu,aarch64-softmmu,riscv32-softmmu,riscv32-linux-user,riscv64-linux-user,riscv64-softmmu && \ make install -j $(nproc) && \ + cd .. && \ rm -rf qemu-build && \ apt remove --yes \ ninja-build