Remove obsolete references to qemu
Test: create_base_image.sh works
Change-Id: I545abd3102bfa91a60680febdff4904607e378de
diff --git a/tools/build-qemu-packages.sh b/tools/build-qemu-packages.sh
deleted file mode 100755
index 7d30541..0000000
--- a/tools/build-qemu-packages.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-VIRGL_PACKAGE=libvirglrenderer-dev
-
-sudo apt update
-sudo apt upgrade -y
-sudo apt install -y debhelper ubuntu-dev-tools equivs
-dpkg -l "${VIRGL_PACKAGE}" || (
- # Try from the distribution
- sudo apt install -y "${VIRGL_PACKAGE}"
- dpkg -l "${VIRGL_PACKAGE}" || (
- echo That failed. Building from source
- curl -L -O http://http.debian.net/debian/pool/main/v/virglrenderer/virglrenderer_0.6.0-2.dsc
- curl -L -O http://http.debian.net/debian/pool/main/v/virglrenderer/virglrenderer_0.6.0.orig.tar.bz2
- curl -L -O http://http.debian.net/debian/pool/main/v/virglrenderer/virglrenderer_0.6.0-2.debian.tar.xz
- sudo mk-build-deps -i virglrenderer_0.6.0-2.dsc -t "apt-get -y"
- rm -f virglrenderer-build-deps_0.6.0-2_all.deb
- dpkg-source -x virglrenderer_0.6.0-2.dsc
- pushd virglrenderer*0
- dpkg-buildpackage -uc -us
- popd
- sudo apt install -y ./*.deb
- )
-)
-curl -L -O http://http.debian.net/debian/pool/main/q/qemu/qemu_2.12+dfsg.orig.tar.xz
-git clone https://salsa.debian.org/qemu-team/qemu.git
-pushd qemu
-debian/rules debian/control
-chmod +w debian/control
-popd
-sudo mk-build-deps -i qemu/debian/control -t "apt-get -y"
-rm -f ./qemu-build-deps_2.12+dfsg-3_amd64.deb
-pushd qemu
-dpkg-buildpackage -uc -us --jobs=auto
-popd
diff --git a/tools/create_base_image_gce.sh b/tools/create_base_image_gce.sh
index 2438dab..237760e 100755
--- a/tools/create_base_image_gce.sh
+++ b/tools/create_base_image_gce.sh
@@ -33,22 +33,6 @@
# Now gather all of the *.deb files to copy them into the image
debs=(*.deb)
-# See if we are using a local build of qemu.
-if [[ -x build-qemu-packages.sh ]]; then
- ./build-qemu-packages.sh
- # We want only a subset of the debs that will be generated
- for i in *.deb; do
- case "$i" in
- qemu-kvm_*) debs+=("$i") ;;
- qemu-system-common_*) debs+=("$i") ;;
- qemu-system-x86_*) debs+=("$i") ;;
- qemu-utils_*) debs+=("$i") ;;
- qemu-system-data_*) debs+=("$i") ;;
- libvirglrenderer0*) debs+=("$i") ;;
- esac
- done
-fi
-
tmp_debs=()
for i in "${debs[@]}"; do
tmp_debs+=(/tmp/"$(basename "$i")")
diff --git a/tools/create_base_image_hostlib.sh b/tools/create_base_image_hostlib.sh
index 26bf4f5..d4f343f 100755
--- a/tools/create_base_image_hostlib.sh
+++ b/tools/create_base_image_hostlib.sh
@@ -69,9 +69,6 @@
"${ANDROID_BUILD_TOP}/device/google/cuttlefish_common/tools/create_base_image_gce.sh"
${scratch_dir}/*
)
- if [[ "${FLAGS_variant}" == master ]]; then
- source_files+=("${ANDROID_BUILD_TOP}/device/google/cuttlefish_common/tools/build-qemu-packages.sh")
- fi
if [[ -n "${INTERNAL_extra_source}" ]]; then
source_files+=("${INTERNAL_extra_source}"/*)
fi
