sergiotarxz/termux-packages
sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update docker image to ubuntu 19.04 and llvm 8

Browse Source
This commit is contained in:
Fredrik Fornwall 2019-04-27 22:47:56 +02:00
parent 3ebf5e8c65
commit 499687c9fe
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/Dockerfile
View File

@ -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:18.10 FROM ubuntu:19.04
# Fix locale to avoid warnings: # Fix locale to avoid warnings:
ENV LANG C.UTF-8 ENV LANG C.UTF-8

4
scripts/setup-android-sdk.sh
View File

@ -42,5 +42,5 @@ fi
yes | $ANDROID_HOME/tools/bin/sdkmanager --licenses yes | $ANDROID_HOME/tools/bin/sdkmanager --licenses
# The android-21 platform is used in the ecj package: # The android platforms are used in the ecj and apksigner packages:
yes | $ANDROID_HOME/tools/bin/sdkmanager "platform-tools" "build-tools;${TERMUX_ANDROID_BUILD_TOOLS_VERSION}" "platforms;android-28" "platforms;android-21" yes | $ANDROID_HOME/tools/bin/sdkmanager "platform-tools" "build-tools;${TERMUX_ANDROID_BUILD_TOOLS_VERSION}" "platforms;android-28" "platforms;android-24" "platforms;android-21"

11
scripts/setup-ubuntu.sh
View File

@ -24,7 +24,6 @@ PACKAGES+=" python3.7"
PACKAGES+=" tar" PACKAGES+=" tar"
PACKAGES+=" unzip" PACKAGES+=" unzip"
PACKAGES+=" m4" PACKAGES+=" m4"
PACKAGES+=" openjdk-8-jdk-headless" # Used for android-sdk.
PACKAGES+=" pkg-config" PACKAGES+=" pkg-config"
PACKAGES+=" python3-docutils" # For rst2man, used by mpv. PACKAGES+=" python3-docutils" # For rst2man, used by mpv.
PACKAGES+=" python3-setuptools" # Needed by at least asciinema. PACKAGES+=" python3-setuptools" # Needed by at least asciinema.
@ -41,7 +40,7 @@ PACKAGES+=" gnupg" # Needed to verify downloaded .debs
PACKAGES+=" jq" # Needed by bintray upload script. PACKAGES+=" jq" # Needed by bintray upload script.
PACKAGES+=" lua5.3" # Needed to build luarocks package. PACKAGES+=" lua5.3" # Needed to build luarocks package.
PACKAGES+=" python3-recommonmark" # needed for llvm-8 documentation PACKAGES+=" python3-recommonmark" # needed for llvm-8 documentation
PACKAGES+=" llvm-7-tools" # so we don't build llvm for build PACKAGES+=" llvm-8-tools" # so we don't build llvm for build
PACKAGES+=" openssl" # Needed by swi-prolog PACKAGES+=" openssl" # Needed by swi-prolog
PACKAGES+=" libssl-dev:i386" # Needed by swi-prolog 32-bit PACKAGES+=" libssl-dev:i386" # Needed by swi-prolog 32-bit
PACKAGES+=" zlib1g-dev:i386" PACKAGES+=" zlib1g-dev:i386"
@ -53,5 +52,13 @@ sudo apt-get -yq update
sudo DEBIAN_FRONTEND=noninteractive \ sudo DEBIAN_FRONTEND=noninteractive \
apt-get install -yq --no-install-recommends $PACKAGES apt-get install -yq --no-install-recommends $PACKAGES
# Make openjdk 8 available:
curl -O http://security.ubuntu.com/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jdk-headless_8u191-b12-2ubuntu0.18.10.1_amd64.deb
curl -O http://security.ubuntu.com/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jdk_8u191-b12-2ubuntu0.18.10.1_amd64.deb
curl -O http://security.ubuntu.com/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jre_8u191-b12-2ubuntu0.18.10.1_amd64.deb
curl -O http://security.ubuntu.com/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jre-headless_8u191-b12-2ubuntu0.18.10.1_amd64.deb
sudo dpkg -i openjdk-8-jre-headless_8u191-b12-2ubuntu0.18.10.1_amd64.deb openjdk-8-jre_8u191-b12-2ubuntu0.18.10.1_amd64.deb openjdk-8-jdk_8u191-b12-2ubuntu0.18.10.1_amd64.deb openjdk-8-jdk-headless_8u191-b12-2ubuntu0.18.10.1_amd64.deb || sudo apt install -f -y
rm openjdk-8-jre-headless_8u191-b12-2ubuntu0.18.10.1_amd64.deb openjdk-8-jre_8u191-b12-2ubuntu0.18.10.1_amd64.deb openjdk-8-jdk_8u191-b12-2ubuntu0.18.10.1_amd64.deb openjdk-8-jdk-headless_8u191-b12-2ubuntu0.18.10.1_amd64.deb
sudo mkdir -p /data/data/com.termux/files/usr sudo mkdir -p /data/data/com.termux/files/usr
sudo chown -R $(whoami) /data sudo chown -R $(whoami) /data