From 8437b88300ff11fe4d0990a151ec8dbabb42bd93 Mon Sep 17 00:00:00 2001 From: Ilya Zuyev Date: Wed, 30 Jun 2021 15:16:22 -0700 Subject: [PATCH 1/2] use ubuntu-20.04 builder image to compile kvm2 driver for arm64 --- installers/linux/kvm/Dockerfile.arm64 | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/installers/linux/kvm/Dockerfile.arm64 b/installers/linux/kvm/Dockerfile.arm64 index 247c367efea2..262d1325e648 100644 --- a/installers/linux/kvm/Dockerfile.arm64 +++ b/installers/linux/kvm/Dockerfile.arm64 @@ -12,23 +12,26 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM ubuntu:21.04 +FROM ubuntu:20.04 ARG GO_VERSION RUN apt update -RUN echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports hirsute main universe multiverse" >> /etc/apt/sources.list && \ - echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports hirsute-updates main universe restricted multiverse" >> /etc/apt/sources.list && \ +RUN echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal main universe multiverse" >> /etc/apt/sources.list && \ + echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal-updates main universe restricted multiverse" >> /etc/apt/sources.list && \ dpkg --add-architecture arm64 && \ (apt update || true) -RUN apt install -y \ +RUN DEBIAN_FRONTEND=noninteractive \ + apt install \ + -o APT::Immediate-Configure=false -y \ gcc-aarch64-linux-gnu \ make \ pkg-config \ curl \ - libvirt-dev:arm64 + libvirt-dev:arm64 \ + dpkg --configure -a RUN curl -sSL https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz | tar -C /usr/local -xzf - From 053b73bcd788b9b5120700db2a5cbb78a203aa4f Mon Sep 17 00:00:00 2001 From: Ilya Zuyev Date: Wed, 30 Jun 2021 15:27:04 -0700 Subject: [PATCH 2/2] fix install command --- installers/linux/kvm/Dockerfile.arm64 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installers/linux/kvm/Dockerfile.arm64 b/installers/linux/kvm/Dockerfile.arm64 index 262d1325e648..272c0a0d9234 100644 --- a/installers/linux/kvm/Dockerfile.arm64 +++ b/installers/linux/kvm/Dockerfile.arm64 @@ -30,7 +30,7 @@ RUN DEBIAN_FRONTEND=noninteractive \ make \ pkg-config \ curl \ - libvirt-dev:arm64 \ + libvirt-dev:arm64 && \ dpkg --configure -a RUN curl -sSL https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz | tar -C /usr/local -xzf -