Browse Source

Make ubuntu 17.04 the reference build environment

android-5
Fredrik Fornwall 8 years ago
parent
commit
852e83abc3
  1. 4
      README.md
  2. 2
      packages/librsvg/build.sh
  3. 2
      scripts/Dockerfile
  4. 2
      scripts/Vagrantfile
  5. 6
      scripts/setup-ubuntu.sh

4
README.md

@ -17,7 +17,7 @@ This source folder is mounted as the `/root/termux-packages` data volume, so cha
in sync between the host and the container when trying things out before committing, and built in sync between the host and the container when trying things out before committing, and built
deb files will be available on the host in the `debs/` directory just as when building on the host. deb files will be available on the host in the `debs/` directory just as when building on the host.
The docker container used for building packages is a Ubuntu 16.10 installation with necessary packages The docker container used for building packages is a Ubuntu 17.04 installation with necessary packages
pre-installed. The default user is a non-root user to avoid problems with package builds modifying the system pre-installed. The default user is a non-root user to avoid problems with package builds modifying the system
by mistake, but `sudo` can be used to install additional Ubuntu packages to be used during development. by mistake, but `sudo` can be used to install additional Ubuntu packages to be used during development.
@ -33,7 +33,7 @@ Note that building packages can take up a lot of space (especially if `build-all
Build environment without Docker Build environment without Docker
================================ ================================
If you can't run Docker you can use a Ubuntu 16.10 installation (either by installing a virtual maching guest or on direct hardware) by using the below scripts: If you can't run Docker you can use a Ubuntu 17.04 installation (either by installing a virtual maching guest or on direct hardware) by using the below scripts:
- Run `scripts/setup-ubuntu.sh` to install required packages and setup the `/data/` folder. - Run `scripts/setup-ubuntu.sh` to install required packages and setup the `/data/` folder.

2
packages/librsvg/build.sh

@ -4,4 +4,4 @@ TERMUX_PKG_VERSION=2.40.16
TERMUX_PKG_SRCURL=http://ftp.gnome.org/pub/GNOME/sources/librsvg/2.40/librsvg-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SRCURL=http://ftp.gnome.org/pub/GNOME/sources/librsvg/2.40/librsvg-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_SHA256=d48bcf6b03fa98f07df10332fb49d8c010786ddca6ab34cbba217684f533ff2e TERMUX_PKG_SHA256=d48bcf6b03fa98f07df10332fb49d8c010786ddca6ab34cbba217684f533ff2e
TERMUX_PKG_DEPENDS="libcroco,pango,gdk-pixbuf" TERMUX_PKG_DEPENDS="libcroco,pango,gdk-pixbuf"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-introspection" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-introspection --disable-pixbuf-loader"

2
scripts/Dockerfile

@ -4,7 +4,7 @@
# docker push termux/package-builder # docker push termux/package-builder
# This is done after changing this file or any of the # This is done after changing this file or any of the
# scripts/setup-{ubuntu,android-sdk}.sh setup scripts. # scripts/setup-{ubuntu,android-sdk}.sh setup scripts.
FROM ubuntu:16.10 FROM ubuntu:17.04
# Fix locale to avoid warnings: # Fix locale to avoid warnings:
ENV LANG C.UTF-8 ENV LANG C.UTF-8

2
scripts/Vagrantfile

@ -3,7 +3,7 @@
Vagrant.configure("2") do |config| Vagrant.configure("2") do |config|
config.vm.box = "ubuntu/yakkety64" config.vm.box = "ubuntu/zesty64"
config.vm.provider "virtualbox" do |vb| config.vm.provider "virtualbox" do |vb|
# Customize the amount of memory on the VM # Customize the amount of memory on the VM

6
scripts/setup-ubuntu.sh

@ -13,7 +13,6 @@ PACKAGES+=" gettext" # Provides 'msgfmt' which the apt build uses.
PACKAGES+=" git" # Used by the neovim build. PACKAGES+=" git" # Used by the neovim build.
PACKAGES+=" help2man" PACKAGES+=" help2man"
PACKAGES+=" intltool" # Used by qalc build. PACKAGES+=" intltool" # Used by qalc build.
PACKAGES+=" libgdk-pixbuf2.0-dev" # Provides 'gkd-pixbuf-query-loaders' which the librsvg build uses.
PACKAGES+=" libglib2.0-dev" # Provides 'glib-genmarshal' which the glib build uses. PACKAGES+=" libglib2.0-dev" # Provides 'glib-genmarshal' which the glib build uses.
PACKAGES+=" libtool-bin" PACKAGES+=" libtool-bin"
PACKAGES+=" lzip" PACKAGES+=" lzip"
@ -21,9 +20,10 @@ PACKAGES+=" python3.6"
PACKAGES+=" tar" PACKAGES+=" tar"
PACKAGES+=" unzip" PACKAGES+=" unzip"
PACKAGES+=" m4" PACKAGES+=" m4"
PACKAGES+=" openjdk-8-jdk" # Used for android-sdk. PACKAGES+=" openjdk-8-jdk-headless" # Used for android-sdk.
PACKAGES+=" pkg-config" PACKAGES+=" pkg-config"
PACKAGES+=" python-docutils" # For rst2man, used by mpv. PACKAGES+=" python3-docutils" # For rst2man, used by mpv.
PACKAGES+=" python3-setuptools" # Needed by at least asciinema.
PACKAGES+=" scons" PACKAGES+=" scons"
PACKAGES+=" texinfo" PACKAGES+=" texinfo"
PACKAGES+=" xmlto" PACKAGES+=" xmlto"

Loading…
Cancel
Save