Merge "Clean up arch.mk, only define really board-specific things here"
diff --git a/arch.mk b/arch.mk
index b223373..aa4d7c6 100644
--- a/arch.mk
+++ b/arch.mk
@@ -12,135 +12,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# Preamble. Don't define any targets in this file! This is effectively just a
-# common header where useful global vars go.
-
-LOG := @$(ROOTDIR)/build/log.sh
-
-ifeq (,$(wildcard /etc/dpkg/origins/glinux))
-ifeq (,$(wildcard /google))
- IS_EXTERNAL ?= true
-endif
-endif
-
-FETCH_PACKAGES ?= false
ifeq ($(IS_EXTERNAL),)
- PREBUILT_DOCKER_ROOT ?= /google/data/ro/teams/spacepark/enterprise/kokoro/prod/spacepark/enterprise/docker/
- FETCH_PBUILDER_DIRECTORY ?= /google/data/ro/teams/spacepark/enterprise/kokoro/prod/spacepark/enterprise/pbuilder/
- ROOTFS_RAW_CACHE_DIRECTORY ?= /google/data/ro/teams/spacepark/enterprise/kokoro/prod/spacepark/enterprise/rootfs/latest/
+ ROOTFS_RAW_CACHE_DIRECTORY ?= /google/data/ro/teams/spacepark/excelsior/kokoro/prod/spacepark/excelsior/rootfs/latest/
endif
-USERSPACE_ARCH ?= arm64
-
-# Architecture specific defines here
-ifeq (armhf,$(USERSPACE_ARCH))
- QEMU_ARCH := arm
-endif
-
-ifeq (arm64,$(USERSPACE_ARCH))
- QEMU_ARCH := aarch64
-endif
-
-PACKAGES_EXTRA := \
- alsa-utils \
- apt-transport-https \
- apt-listchanges \
- apt-utils \
- aptitude \
- avahi-daemon \
- bash-completion \
- build-essential \
- cpio \
- cron \
- curl \
- dbus \
- debconf-i18n \
- debian-archive-keyring \
- debian-faq \
- dialog \
- dmidecode \
- dnsmasq \
- doc-debian \
- ethtool \
- file \
- firmware-atheros \
- gettext-base \
- gnupg \
- hdparm \
- i2c-tools \
- ifupdown \
- init \
- iptables \
- iputils-ping \
- isc-dhcp-client \
- isc-dhcp-common \
- kbd \
- krb5-locales \
- less \
- libc++1 \
- libc++abi1 \
- libclass-isa-perl \
- libinput10 \
- liblockfile-bin \
- libnss-mdns \
- libpam-systemd \
- libswitch-perl \
- libwayland-cursor0 \
- libwayland-egl1-mesa \
- libxcb-composite0 \
- libxcb-shape0 \
- libxcursor1 \
- libxkbcommon0 \
- linux-base \
- lm-sensors \
- locales \
- logrotate \
- lrzsz \
- lsof \
- man-db \
- manpages \
- nano \
- ncurses-term \
- net-tools \
- netbase \
- netcat-traditional \
- network-manager \
- openssh-server \
- parted \
- pciutils \
- psmisc \
- pulseaudio \
- python \
- python-minimal \
- python2.7 \
- python3-gst-1.0 \
- python3-jwt \
- python3-numpy \
- python3-pip \
- python3-reportbug \
- python3-setuptools \
- python3-wheel \
- reportbug \
- rsync \
- rsyslog \
- software-properties-common \
- sudo \
- systemd \
- systemd-sysv \
- tasksel \
- telnet \
- traceroute \
- unattended-upgrades \
- unzip \
- v4l-utils \
- vim \
- wamerican \
- wget \
- whiptail \
- wireless-tools \
- wpasupplicant \
- xdg-user-dirs \
- xwayland
+BOARD_PACKAGES_EXTRA :=
BOOT_SIZE_MB := 128
-ROOTFS_SIZE_MB := 4096
+ROOTFS_SIZE_MB := 2048
