git: Update to 2.5.3

[termux-packages] / README.md

diff --git a/README.md b/README.md
index 6aec429..0612826 100644 (file)
--- a/README.md
+++ b/README.md
@@ -4,9 +4,21 @@ This project contains scripts and patches to cross compile and package packages
 the [Termux](http://termux.com/) Android application.
 
 NOTE: This is in a rough state - be prepared for some work and frustrations, and give
-feedback if you find incorrect our outdated things! Building is only supported on
-ubuntu 15.04 - execute `ubuntu-setup.sh` to install required packages as well as
-setting up the `/data/` folder.
+feedback if you find incorrect our outdated things!
+
+Initial setup
+=============
+Building packages are for now only tested to work on Ubuntu 15.04. Perform the following
+setup steps:
+
+* Run `ubuntu-setup.sh` to install required packages and setup the `/data/` folder (see below).
+
+* Install the Android SDK at `$HOME/lib/android-sdk`. Override this by setting the environment
+variable `$ANDROID_HOME` to point at another location.
+
+* Install the Android NDK, version r10e, at `$HOME/lib/android-ndk`. Override this by setting
+the environment variable `$NDK` to point at another location.
+
 
 Building a package
 ==================
@@ -16,7 +28,7 @@ which is why every package is installed inside the private file area of the Term
     PREFIX=/data/data/com.termux/files/usr
 
 For simplicity while developing and building, the build scripts here assume that a /data
-folder is reserved for use on the host builder.
+folder is reserved for use on the host builder and install everything there.
 
 The basic flow is then to run "./build-package.sh $PKG", which:
 * Sets up a patched stand-alone Android NDK toolchain
@@ -27,7 +39,8 @@ The basic flow is then to run "./build-package.sh $PKG", which:
 
 * Builds the package and installs it to $PREFIX
 
-* Packages the package in one or more .dpkg files for distribution
+* Creates a dpkg package file for distribution.
+
 Reading and following build-package.sh is the best way to understand what's going on here.
 
 
@@ -99,7 +112,7 @@ contains these and may be used by all packages.
 
 dlopen() and RTLD_* flags
 =================================
-<dlfn.h> declares
+<dlfcn.h> declares
 
     enum { RTLD_NOW=0, RTLD_LAZY=1, RTLD_LOCAL=0, RTLD_GLOBAL=2,       RTLD_NOLOAD=4}; // 32-bit
     enum { RTLD_NOW=2, RTLD_LAZY=1, RTLD_LOCAL=0, RTLD_GLOBAL=0x00100, RTLD_NOLOAD=4}; // 64-bit
@@ -132,35 +145,3 @@ These may come from version scripts in a Makefile such as:
 
     -Wl,--version-script=$(top_srcdir)/proc/libprocps.sym
 The termux-elf-cleaner utilty is run from build-package.sh and should normally take care of that problem.
-
-Obtaining shell access on an emulator
-=====================================
-First install and start sshd on device:
-
-    apt install openssh
-    sshd
-Then follow the below steps:
-
-    # Find out the linux user for the package to use in the chown command later:
-    adb shell dumpsys package com.termux | grep userId=
-    # Push your public ssh key:
-    adb push $HOME/.ssh/id_dsa.pub /data/data/com.termux/files/home/.ssh/authorized_keys
-    # Use the linux user for the package, 10053 below, to set ownerhip and permissions:
-    adb shell chown -R 10053 /data/data/com.termux/files/home/.ssh/
-    adb shell chmod -R 0700 /data/data/com.termux/files/home/.ssh/
-    # Forward port 8022 to the emulator:
-    adb forward tcp:8022 tcp:8022
-    # Finally connect with ssh:
-    ssh -p 8022 localhost
-
-Bootstrapping on device
-=======================
-To get files on device one option is:
-
-    udpsvd -vE 0.0.0.0 8069 tftpd -c . # Run on device. -c arg to allow file uploading
-    printf "mode binary\nput out.md\nquit" | tftp 192.168.0.12 8069 # on computer
-Another is with ftp:
-
-    tcpsvd -vE 0.0.0.0 8021 ftpd -w . # Run on device. -w arg to allow file uploading
-    printf "put tmp.c\nquit" | ftp -n 192.168.0.12 8021 # Run on computer. -n arg to use anonymous login
-NOTE: The ftpd and tftpd programs has been patched to run without chroot. This means that the directory serving is only the starting point and clients may cd out of if the access the whole system!