From 291622805e41f874d53dccab3687442aae40ef1f Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Sun, 26 Nov 2017 00:41:28 +0100 Subject: [PATCH] Slim down the setup created by setup-ubuntu.sh This changes the docker image size from around 5.8 to 3.6 GB. For those wanting more tools in the docker build environment sudo is always available. --- scripts/setup-ubuntu.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/setup-ubuntu.sh b/scripts/setup-ubuntu.sh index 5c1b0f722..674319af5 100755 --- a/scripts/setup-ubuntu.sh +++ b/scripts/setup-ubuntu.sh @@ -6,18 +6,17 @@ PACKAGES+=" ant" # Used by apksigner. PACKAGES+=" asciidoc" PACKAGES+=" automake" PACKAGES+=" bison" -PACKAGES+=" clang" # Used by golang, useful to have same compiler building. PACKAGES+=" curl" # Used for fetching sources. PACKAGES+=" ed" # Used by bc PACKAGES+=" flex" -PACKAGES+=" g++-multilib" # For building nodejs-current mkpeephole for 32-bit arm and i686. +PACKAGES+=" gcc-multilib" # Used by pforth build for 32-bit arches. PACKAGES+=" gettext" # Provides 'msgfmt' which the apt build uses. +PACKAGES+=" g++" PACKAGES+=" git" # Used by the neovim build. PACKAGES+=" gperf" # Used by the fontconfig build. PACKAGES+=" help2man" PACKAGES+=" intltool" # Used by qalc build. PACKAGES+=" libglib2.0-dev" # Provides 'glib-genmarshal' which the glib build uses. -PACKAGES+=" libgnutls28-dev" # Needed by native build step of mariadb. PACKAGES+=" libtool-bin" PACKAGES+=" libncurses5-dev" # Used by mariadb for host build part. PACKAGES+=" lzip" @@ -30,14 +29,16 @@ PACKAGES+=" pkg-config" PACKAGES+=" python3-docutils" # For rst2man, used by mpv. PACKAGES+=" python3-setuptools" # Needed by at least asciinema. PACKAGES+=" python3-sphinx" # Needed by notmuch man page generation. +PACKAGES+=" ruby" # Needed to build ruby. PACKAGES+=" scons" PACKAGES+=" texinfo" +PACKAGES+=" texlive-binaries" # Needed by texlive build. PACKAGES+=" xmlto" PACKAGES+=" xutils-dev" # Provides 'makedepend' which the openssl build uses. PACKAGES+=" libexpat1-dev" # Needed by ghostscript PACKAGES+=" libjpeg-dev" # Needed by ghostscript -DEBIAN_FRONTEND=noninteractive sudo apt-get install -yq $PACKAGES +DEBIAN_FRONTEND=noninteractive sudo apt-get install -yq --no-install-recommends $PACKAGES sudo mkdir -p /data/data/com.termux/files/usr sudo chown -R `whoami` /data