From 814e7d728513852ab9d78fce4b717b4c9d82b48e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Thu, 18 Feb 2021 12:20:54 +0100 Subject: [PATCH] packaging: Remove NEMU mentions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There's no more NEMU, for some time already. Considering this, let's just remove any mention to it as part of our project. Signed-off-by: Fabiano FidĂȘncio --- .github/workflows/main.yaml | 28 +------------------ src/runtime/.gitignore | 1 - .../packaging/scripts/configure-hypervisor.sh | 4 +-- 3 files changed, 2 insertions(+), 31 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 8606c70b54..1846665821 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -103,32 +103,6 @@ jobs: name: kata-artifacts path: kata-static-qemu.tar.gz - build-nemu: - runs-on: ubuntu-16.04 - needs: get-artifact-list - env: - buildstr: "install_nemu" - steps: - - uses: actions/checkout@v1 - - name: get-artifact-list - uses: actions/download-artifact@master - with: - name: artifact-list - - name: build-nemu - run: | - if grep -q $buildstr ./artifact-list/artifact-list.txt; then - $GITHUB_WORKSPACE/.github/workflows/generate-artifact-tarball.sh $buildstr - echo "artifact-built=true" >> $GITHUB_ENV - else - echo "artifact-built=false" >> $GITHUB_ENV - fi - - name: store-artifacts - if: env.artifact-built == 'true' - uses: actions/upload-artifact@master - with: - name: kata-artifacts - path: kata-static-nemu.tar.gz - # Job for building the image build-image: runs-on: ubuntu-16.04 @@ -239,7 +213,7 @@ jobs: gather-artifacts: runs-on: ubuntu-16.04 - needs: [build-experimental-kernel, build-kernel, build-qemu, build-image, build-firecracker, build-kata-components, build-nemu, build-clh] + needs: [build-experimental-kernel, build-kernel, build-qemu, build-image, build-firecracker, build-kata-components, build-clh] steps: - uses: actions/checkout@v1 - name: get-artifacts diff --git a/src/runtime/.gitignore b/src/runtime/.gitignore index 3e916bbdf3..52b9e4e51c 100644 --- a/src/runtime/.gitignore +++ b/src/runtime/.gitignore @@ -8,7 +8,6 @@ coverage.html /cli/config/configuration-acrn.toml /cli/config/configuration-clh.toml /cli/config/configuration-fc.toml -/cli/config/configuration-nemu.toml /cli/config/configuration-qemu.toml /cli/config/configuration-clh.toml /cli/config-generated.go diff --git a/tools/packaging/scripts/configure-hypervisor.sh b/tools/packaging/scripts/configure-hypervisor.sh index 195d25b3dc..2d3438459e 100755 --- a/tools/packaging/scripts/configure-hypervisor.sh +++ b/tools/packaging/scripts/configure-hypervisor.sh @@ -273,9 +273,7 @@ generate_qemu_options() { # Disable TCG support case "$arch" in - aarch64) - echo $hypervisor | grep -q nemu && qemu_options+=(size:--disable-tcg) - ;; + aarch64) ;; x86_64) qemu_options+=(size:--disable-tcg) ;; ppc64le) ;; s390x) qemu_options+=(size:--disable-tcg) ;;