From 77fed4f08dc0fc77c32b3d64154a70bf97248693 Mon Sep 17 00:00:00 2001 From: Robert Valik Date: Sat, 17 Oct 2015 19:07:28 +0200 Subject: [PATCH 1/9] Adding libssl-dev to packages - package ldns depends on it --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 5ac98aab4..8d8d62be8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,6 +28,7 @@ RUN apt-get update && apt-get install -y \ # Provides 'glib-genmarshal' which the glib build uses libglib2.0-dev \ libncurses5-dev \ + libssl-dev \ libtool \ lzip \ m4 \ From 54e3805db2d96532ff77dea3f873092d202ca355 Mon Sep 17 00:00:00 2001 From: Robert Valik Date: Sat, 17 Oct 2015 19:09:11 +0200 Subject: [PATCH 2/9] Creating /system symlink to / - needed for git package --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 8d8d62be8..76fb6eee1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -52,6 +52,9 @@ RUN cd /tmp && \ mv /tmp/android-ndk-r10e /root/lib/android-ndk && \ rm -fr /tmp/* +# This link is needed for building git package +RUN ln -s / /system + RUN mkdir -p /data/data/com.termux/files/usr && mkdir -p /root/termux-packages ADD *.py /root/termux-packages/ ADD *.sh /root/termux-packages/ From 46105f8aa835793ffc169c7bca19d7d46d650be3 Mon Sep 17 00:00:00 2001 From: Robert Valik Date: Sat, 17 Oct 2015 19:24:27 +0200 Subject: [PATCH 3/9] Adding libacl1-dev to packages - package coreutils depends on it --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 76fb6eee1..7f30fbbcb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,6 +19,7 @@ RUN apt-get update && apt-get install -y \ # Provides 'msgfmt' which the apt build uses gettext \ help2man \ + libacl1-dev \ # Needed by luajit host part libc6-dev-i386 \ # Needed by apt build @@ -50,10 +51,9 @@ RUN cd /tmp && \ mkdir /root/lib && \ mv /tmp/android-sdk-linux /root/lib/android-sdk && \ mv /tmp/android-ndk-r10e /root/lib/android-ndk && \ - rm -fr /tmp/* - + rm -fr /tmp/* \ # This link is needed for building git package -RUN ln -s / /system + ln -s / /system RUN mkdir -p /data/data/com.termux/files/usr && mkdir -p /root/termux-packages ADD *.py /root/termux-packages/ From 9f29b4abd8cb8171ce73fa895655c61b58beb31c Mon Sep 17 00:00:00 2001 From: Robert Valik Date: Sat, 17 Oct 2015 19:32:30 +0200 Subject: [PATCH 4/9] Only /bin/sh is symlinked to /system/bin/sh --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7f30fbbcb..abfaea85d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -51,9 +51,10 @@ RUN cd /tmp && \ mkdir /root/lib && \ mv /tmp/android-sdk-linux /root/lib/android-sdk && \ mv /tmp/android-ndk-r10e /root/lib/android-ndk && \ - rm -fr /tmp/* \ + rm -fr /tmp/* && \ # This link is needed for building git package - ln -s / /system + mkdir -p /system/bin && \ + ln -s /bin/sh /system/bin/sh RUN mkdir -p /data/data/com.termux/files/usr && mkdir -p /root/termux-packages ADD *.py /root/termux-packages/ From 35fa8ce718ea68ff3bee9d919614470ae224f2fb Mon Sep 17 00:00:00 2001 From: Robert Valik Date: Sat, 17 Oct 2015 21:37:11 +0200 Subject: [PATCH 5/9] Moving the link creation to more logical place --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index abfaea85d..f417a4575 100644 --- a/Dockerfile +++ b/Dockerfile @@ -51,12 +51,13 @@ RUN cd /tmp && \ mkdir /root/lib && \ mv /tmp/android-sdk-linux /root/lib/android-sdk && \ mv /tmp/android-ndk-r10e /root/lib/android-ndk && \ - rm -fr /tmp/* && \ + rm -fr /tmp/* + +RUN mkdir -p /data/data/com.termux/files/usr && mkdir -p /root/termux-packages && \ # This link is needed for building git package mkdir -p /system/bin && \ ln -s /bin/sh /system/bin/sh -RUN mkdir -p /data/data/com.termux/files/usr && mkdir -p /root/termux-packages ADD *.py /root/termux-packages/ ADD *.sh /root/termux-packages/ ADD *.spec /root/termux-packages/ From ea56e143ced94af84f8f45dd967710132645edd6 Mon Sep 17 00:00:00 2001 From: Robert Valik Date: Sat, 17 Oct 2015 21:52:02 +0200 Subject: [PATCH 6/9] Adding subversion to packages - required to build netpbm --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index f417a4575..1f6d8a213 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,6 +35,7 @@ RUN apt-get update && apt-get install -y \ m4 \ pkg-config \ scons \ + subversion \ texinfo \ xmlto \ # Provides u'makedepend' which the openssl build uses From ac6accf513d8535edc05a87c6c343b437fa674ce Mon Sep 17 00:00:00 2001 From: Robert Valik Date: Sat, 17 Oct 2015 22:25:07 +0200 Subject: [PATCH 7/9] Adding libtool-bin to packages - required to build neovim --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 1f6d8a213..3075cd325 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,6 +31,7 @@ RUN apt-get update && apt-get install -y \ libncurses5-dev \ libssl-dev \ libtool \ + libtool-bin \ lzip \ m4 \ pkg-config \ From 52135097c5d3d7b90062e9abf4d528fb1ae65f1b Mon Sep 17 00:00:00 2001 From: Robert Valik Date: Sat, 17 Oct 2015 22:54:25 +0200 Subject: [PATCH 8/9] Added neovim lua dependencies --- Dockerfile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3075cd325..f53e0b9ff 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,7 +31,9 @@ RUN apt-get update && apt-get install -y \ libncurses5-dev \ libssl-dev \ libtool \ - libtool-bin \ + libtool-bin \ + lua-lpeg \ + loarocks \ lzip \ m4 \ pkg-config \ @@ -58,7 +60,11 @@ RUN cd /tmp && \ RUN mkdir -p /data/data/com.termux/files/usr && mkdir -p /root/termux-packages && \ # This link is needed for building git package mkdir -p /system/bin && \ - ln -s /bin/sh /system/bin/sh + ln -s /bin/sh /system/bin/sh && \ +# Install neovim dependencies + luarocks install lpeg && \ + luarocks install lua-MessagePack && \ + luarocks install luabitop ADD *.py /root/termux-packages/ ADD *.sh /root/termux-packages/ From dbf5ee73447b171683311ac47ded81332b1d0286 Mon Sep 17 00:00:00 2001 From: Robert Valik Date: Sat, 17 Oct 2015 23:13:33 +0200 Subject: [PATCH 9/9] Fixed typo --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f53e0b9ff..7b0f0306d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,7 +33,7 @@ RUN apt-get update && apt-get install -y \ libtool \ libtool-bin \ lua-lpeg \ - loarocks \ + luarocks \ lzip \ m4 \ pkg-config \