Remove docker arm64
- Unused, so clean this up. Also makes the output a lot cleaner.
Change-Id: Ie3cdb18f006f4118af330890a76b857541104296
diff --git a/Dockerfile b/Dockerfile
index 3db29d9..68c6e53 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,15 +15,6 @@
FROM debian:9.4
MAINTAINER support-aiyprojects@google.com
-# Install Docker into this image, so we can run nested containers for ARM64 builds.
-RUN apt-get update -qq && apt-get install -qqy \
- apt-transport-https \
- ca-certificates \
- curl \
- lxc \
- iptables
-RUN curl -sSL https://get.docker.com/ | sh
-
# Install the prerequisite packages into the image.
ADD . /build
RUN /bin/bash -c '\
@@ -32,5 +23,3 @@
ln -sfr /build/Makefile /Makefile && \
source /build/setup.sh && \
make -C /build prereqs'
-
-VOLUME /var/lib/docker
diff --git a/Dockerfile.arm64 b/Dockerfile.arm64
deleted file mode 100644
index 6daec9a..0000000
--- a/Dockerfile.arm64
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 2018 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-FROM arm64v8/debian:9.4
-MAINTAINER support-aiyprojects@google.com
-COPY qemu-aarch64-static /usr/bin
-RUN apt-get update && apt-get install -y \
- autoconf \
- automake \
- autopoint \
- autotools-dev \
- build-essential \
- cdbs \
- checkinstall \
- debhelper \
- devscripts \
- dh-autoreconf \
- docbook-xsl \
- dpkg-dev \
- flex \
- flite-dev \
- gir1.2-freedesktop \
- gir1.2-glib-2.0 \
- git \
- gnome-pkg-tools \
- gobject-introspection \
- gtk-doc-tools \
- ladspa-sdk \
- libaa1-dev \
- libasound2-dev \
- libass-dev \
- libavc1394-dev \
- libbison-dev \
- libbluetooth-dev \
- libbs2b-dev \
- libbz2-dev \
- libcaca-dev \
- libcairo2-dev \
- libcap2-bin \
- libcap-dev \
- libcdaudio-dev \
- libcdparanoia-dev \
- libchromaprint-dev \
- libcurl4-gnutls-dev \
- libdca-dev \
- libde265-dev \
- libdrm-dev \
- libdv4-dev \
- libdvdnav-dev \
- libegl1-mesa-dev \
- libexempi-dev \
- libexif-dev \
- libfaad-dev \
- libflac-dev \
- libfluidsynth-dev \
- libgbm-dev \
- libgdk-pixbuf2.0-dev \
- libgirepository1.0-dev \
- libgl1-mesa-dev \
- libgles2-mesa-dev \
- libglib2.0-dev \
- libglib2.0-doc \
- libglu1-mesa-dev \
- libgme-dev \
- libgmp3-dev \
- libgnutls28-dev \
- libgsl0-dev bison \
- libgsl-dev \
- libgsm1-dev \
- libgudev-1.0-dev \
- libiec61883-dev \
- libinput-dev \
- libiptcdata0-dev \
- libjack-jackd2-dev \
- libjpeg-dev \
- libkate-dev \
- liblilv-dev \
- libmjpegtools-dev \
- libmms-dev \
- libmodplug-dev \
- libmpcdec-dev \
- libneon27-dev \
- libofa0-dev \
- libogg-dev \
- libopenal-dev \
- libopencv-dev \
- libopenexr-dev \
- libopenjp2-7-dev \
- libopus-dev \
- liborc-0.4-dev \
- libpam-dev \
- libpango1.0-dev \
- libpciaccess-dev \
- libpng-dev \
- libpulse-dev \
- librsvg2-dev \
- librtmp-dev \
- libshout3-dev \
- libsndfile1-dev \
- libsoundtouch-dev \
- libsoup2.4-dev \
- libspandsp-dev \
- libsrtp0-dev \
- libssl-dev \
- libtag1-dev \
- libtheora-dev \
- libtool \
- libudev-dev \
- libusb-1.0-0-dev \
- libv4l-dev \
- libvisual-0.4-dev \
- libvo-aacenc-dev \
- libvo-amrwbenc-dev \
- libvorbis-dev \
- libvorbisidec-dev \
- libvpx-dev \
- libwavpack-dev \
- libwayland-dev \
- libwebp-dev \
- libwebrtc-audio-processing-dev \
- libwildmidi-dev \
- libx11-dev \
- libx11-xcb-dev \
- libx265-dev \
- libxcb1-dev \
- libxcb-composite0-dev \
- libxcb-xfixes0-dev \
- libxcursor-dev \
- libxkbcommon-dev \
- libxml2-dev \
- libxv-dev \
- libxvidcore-dev \
- libzbar-dev \
- libzvbi-dev \
- nettle-dev \
- perl-doc \
- pkg-config \
- quilt \
- xsltproc \
- xutils-dev \
- libsbc-dev \
- libvulkan-dev \
diff --git a/docker.mk b/docker.mk
index b5850a8..4a3767e 100644
--- a/docker.mk
+++ b/docker.mk
@@ -18,7 +18,6 @@
include $(ROOTDIR)/build/preamble.mk
-ARM64_BUILDER_FETCH_TARBALL ?= $(IS_GLINUX)
DOCKER_FETCH_TARBALL ?= $(IS_GLINUX)
docker-build: $(ROOTDIR)/cache/aiy-board-builder.tar
@@ -34,22 +33,6 @@
docker rmi aiy-board-builder:latest
endif
-docker-build-arm64: $(ROOTDIR)/cache/arm64-builder.tar
-ifeq ($(ARM64_BUILDER_FETCH_TARBALL),true)
-$(ROOTDIR)/cache/arm64-builder.tar: $(PREBUILT_DOCKER_ROOT)/arm64-builder.tar
- mkdir -p $(ROOTDIR)/cache
- cp $< $(ROOTDIR)/cache
-else
-$(ROOTDIR)/cache/arm64-builder.tar:
- mkdir -p $(ROOTDIR)/cache
- mkdir -p $(PRODUCT_OUT)/obj/ARM64_BUILDER
- cp $(ROOTDIR)/build/Dockerfile.arm64 $(PRODUCT_OUT)/obj/ARM64_BUILDER/Dockerfile
- cp $(shell which qemu-aarch64-static) $(PRODUCT_OUT)/obj/ARM64_BUILDER
- docker build -t arm64-builder $(PRODUCT_OUT)/obj/ARM64_BUILDER
- docker image save -o $@ arm64-builder:latest
- docker rmi arm64-builder:latest
-endif
-
# Runs any make TARGET in x86 docker image ('m docker-TARGET')
docker-%: docker-build;
docker load -i $(ROOTDIR)/cache/aiy-board-builder.tar
@@ -63,7 +46,6 @@
-v $(PACKAGES_FETCH_ROOT_DIRECTORY)\:/packages \
-w /rootdir \
-e "ROOTFS_FETCH_TARBALL=$(ROOTFS_FETCH_TARBALL)" \
- -e "ARM64_BUILDER_FETCH_TARBALL=$(ARM64_BUILDER_FETCH_TARBALL)" \
-e "FETCH_PBUILDER_BASE=$(FETCH_PBUILDER_BASE)" \
-e "TARBALL_FETCH_ROOT_DIRECTORY=/tarballs" \
-e "PREBUILT_DOCKER_ROOT=/docker" \
@@ -84,39 +66,11 @@
useradd -m -e "" -s /bin/bash --gid $(shell id -g) --uid $(shell id -u) $(shell id -u -n); \
passwd -d $(shell id -u -n); \
echo "$(shell id -u -n) ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers; \
- adduser $(shell id -u -n) docker; \
sudo cp /rootdir/build/99network-settings /etc/apt/apt.conf.d/; \
sudo chmod 644 /etc/apt/apt.conf.d/99network-settings; \
- /etc/init.d/docker start; \
sudo -E -u $(shell id -u -n) /bin/bash -c "source build/setup.sh; m \
-j$$(nproc) $*";'
-# Macro for running make target in arm64 docker image
-define docker-arm64-run
-docker-arm64-$1: docker-build-arm64;
- docker load -i $(ROOTDIR)/cache/arm64-builder.tar; \
- docker run --rm --tty \
- -v /dev\:/dev \
- -v $(ROOTDIR)\:/build \
- -v $(TARBALL_FETCH_ROOT_DIRECTORY)\:/tarballs \
- -v $(PREBUILT_DOCKER_ROOT)\:/docker \
- -v $(PREBUILT_MODULES_ROOT)\:/modules \
- -w /build \
- -e "ROOTFS_FETCH_TARBALL=$(ROOTFS_FETCH_TARBALL)" \
- -e "ARM64_BUILDER_FETCH_TARBALL=$(ARM64_BUILDER_FETCH_TARBALL)" \
- -e "TARBALL_FETCH_ROOT_DIRECTORY=/tarballs" \
- -e "PREBUILT_DOCKER_ROOT=/docker" \
- -e "ROOTFS_REVISION=$(ROOTFS_REVISION)" \
- -e "PREBUILT_MODULES_ROOT=/modules" \
- arm64-builder \
- /bin/bash -c \
- 'groupadd --gid $$(shell id -g) $$(shell id -g -n); \
- useradd -m -e "" -s /bin/bash --gid $$(shell id -g) --uid $$(shell id -u) $$(shell id -u -n); \
- passwd -d $$(shell id -u -n); \
- echo "$$(shell id -u -n) ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers; \
- source build/setup.sh; m -j$$(nproc) $2'
-endef
-
# Test x86 docker ('m docker-test-docker')
test-docker:
@echo "Docker architecture: $(shell uname -a)"
@@ -126,9 +80,6 @@
@./hello
@rm -f hello.c hello
-# Test arm64 docker 'm docker-arm64-test-docker'
-$(call docker-arm64-run,test-docker,test-docker)
-
.DEFAULT_GOAL:=docker-all
.PHONY:: docker-build
diff --git a/kokoro/continuous.cfg b/kokoro/continuous.cfg
index 9e62184..368601d 100644
--- a/kokoro/continuous.cfg
+++ b/kokoro/continuous.cfg
@@ -1,8 +1,6 @@
build_file: "continuous-build/build/kokoro/continuous.sh"
gfile_resources: "/x20/teams/spacepark/enterprise/kokoro/prod/spacepark/enterprise/rootfs/latest/rootfs.raw.img"
gfile_resources: "/x20/teams/spacepark/enterprise/kokoro/prod/spacepark/enterprise/rootfs/latest/rootfs.raw.img.sha256sum"
-gfile_resources: "/x20/teams/spacepark/enterprise/kokoro/prod/spacepark/enterprise/debs/apex.deb"
-gfile_resources: "/x20/teams/spacepark/enterprise/kokoro/prod/spacepark/enterprise/docker/arm64-builder.tar"
gfile_resources: "/x20/teams/spacepark/enterprise/kokoro/prod/spacepark/enterprise/docker/aiy-board-builder.tar"
gfile_resources: "/x20/teams/spacepark/enterprise/kokoro/prod/spacepark/enterprise/pbuilder/base.tgz"
action {
diff --git a/kokoro/release.cfg b/kokoro/release.cfg
index 6077745..c5d1c7f 100644
--- a/kokoro/release.cfg
+++ b/kokoro/release.cfg
@@ -1,8 +1,6 @@
build_file: "continuous-build/build/kokoro/release.sh"
gfile_resources: "/x20/teams/spacepark/enterprise/kokoro/prod/spacepark/enterprise/rootfs/latest/rootfs.raw.img"
gfile_resources: "/x20/teams/spacepark/enterprise/kokoro/prod/spacepark/enterprise/rootfs/latest/rootfs.raw.img.sha256sum"
-gfile_resources: "/x20/teams/spacepark/enterprise/kokoro/prod/spacepark/enterprise/debs/apex.deb"
-gfile_resources: "/x20/teams/spacepark/enterprise/kokoro/prod/spacepark/enterprise/docker/arm64-builder.tar"
gfile_resources: "/x20/teams/spacepark/enterprise/kokoro/prod/spacepark/enterprise/docker/aiy-board-builder.tar"
gfile_resources: "/x20/teams/spacepark/enterprise/kokoro/prod/spacepark/enterprise/pbuilder/base.tgz"
diff --git a/u-boot.mk b/u-boot.mk
index 9bac91f..2f0d789 100644
--- a/u-boot.mk
+++ b/u-boot.mk
@@ -20,7 +20,7 @@
u-boot: $(PRODUCT_OUT)/u-boot.imx
-$(PRODUCT_OUT)/u-boot.imx: docker-uboot-imx | out-dirs
+$(PRODUCT_OUT)/u-boot.imx: uboot-imx | out-dirs
$(LOG) u-boot extract
dpkg --fsys-tarfile $(PRODUCT_OUT)/packages/uboot-imx*.deb | \
tar --strip-components 2 -C $(PRODUCT_OUT) -xf - ./boot/u-boot.imx
