Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

proot: Update for accept and MagiskSU support #2235

Merged
merged 5 commits into from
Mar 10, 2018
Merged

proot: Update for accept and MagiskSU support #2235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8e3840a
Added arguments for proot to enable the use of MagiskSU from within t…
ShadowEO Mar 7, 2018
9aac3c6
Restore original shebang to termux-chroot for pull-request.
ShadowEO Mar 7, 2018
58708d2
Added folder existence check to ensure MagiskSU changes don't break t…
ShadowEO Mar 7, 2018
6c3a863
Merge pull request termux/termux-packages#2229
michalbednarski Mar 10, 2018
d95e2fd
proot: Update for accept -> accept4 translation
michalbednarski Mar 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/proot/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
TERMUX_PKG_HOMEPAGE=https://proot-me.github.io/
TERMUX_PKG_DESCRIPTION="Emulate chroot, bind mount and binfmt_misc for non-root users"
# Just bump commit and version when needed:
_COMMIT=9553bc6b65f705b26249cf70244bff9ab8e935e9
_COMMIT=c24fa3a43af2336a93f63fe3fb3eac599f0e3592
TERMUX_PKG_VERSION=5.1.107
TERMUX_PKG_REVISION=5
TERMUX_PKG_REVISION=6
TERMUX_PKG_SRCURL=https://github.com/termux/proot/archive/${_COMMIT}.zip
TERMUX_PKG_SHA256=8602a43aa0ce16e0f8248cde726eac11938cae78ad04b4ef75a9c62870db3cc5
TERMUX_PKG_SHA256=185e01d02a0bbf93036d143500e747e06b95fa6056fc1b8c1a093764b467e5b8
TERMUX_PKG_DEPENDS="libtalloc"

termux_step_pre_configure() {
Expand Down
8 changes: 8 additions & 0 deletions packages/proot/termux-chroot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,14 @@ ARGS="$ARGS -b /vendor:/vendor"
# and $HOME so that Termux programs with hard-coded paths continue to work:
ARGS="$ARGS -b /data:/data"


# Bind Magisk binary directories so root works, closing per Issue #2100.
if [ -d /sbin ] && [ -d /root ]; then
# Both of these directories exist under Android even without Magisk installed,
# The existence check is to ensure that it doesn't break if this changes.
ARGS="$ARGS -b /sbin:/sbin -b /root:/root"
fi

if [ -f /property_contexts ]; then
# Used by getprop (see https://github.com/termux/termux-packages/issues/1076)
# but does not exist on Android 8.
Expand Down