-
-
Notifications
You must be signed in to change notification settings - Fork 3.2k
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.
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
bump(main/bionic-host),addpkg(main/{boringssl,iputils,mksh,toybox}-host): 9.0.0-r76 #22906
base: master
Are you sure you want to change the base?
bump(main/bionic-host),addpkg(main/{boringssl,iputils,mksh,toybox}-host): 9.0.0-r76 #22906
Conversation
daeb42b
to
d380f68
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hey, nice work!
Does any of the subpackages need to:
TERMUX_SUBPKG_BREAKS="bionic-host (<< 9.0.0-r76)"
TERMUX_SUBPKG_REPLACES="bionic-host (<< 9.0.0-r76)"
or are all of the subpackage files freshly added in this version?
If for example $PREFIX/opt/bionic-host/lib/libcrypto.so was part of bionic-host 8.0.0-r51 then we would get a file conflict when trying to install the subpackage without BREAKS and REPLACES.
tar xf "${TERMUX_PKG_CACHEDIR}/python2.tar.xz" --strip-components=1 -C "${PYTHON2_WORKDIR}" | ||
pushd "${PYTHON2_WORKDIR}" | ||
./configure --prefix="${TERMUX_PKG_SRCDIR}/prefix/usr" | ||
make install |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please move this to a termux_step_host_build step.
${TERMUX_PKG_SRCDIR}/prefix/usr
is not added to path, so python2 and pip2 further down are probably not using the compiled {python,pip}2?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please move this to a termux_step_host_build step.
Ok, yes I will try to move that code, thank you for the feedback!
${TERMUX_PKG_SRCDIR}/prefix/usr
is not added to path, so python2 and pip2 further down are probably not using the compiled {python,pip}2?
If you look closely, ${TERMUX_PKG_SRCDIR}/prefix/usr/bin
actually is already in $PATH
at that point due to preexisting code written by someone else for a different section of the package:
export PATH="${TERMUX_PKG_SRCDIR}/prefix/usr/bin:${PATH//$HOME\/.cargo\/bin/}" |
However, I completely understand how it's confusing and hard to notice that happening, so I will try to make sure this is redundantly specified, to make it as clear as possible what is happening.
Additionally, because the prebuilt version of Python 2 used by the 8.0.0 version of this package was not working successfully when I bumped the package to 9.0.0, to prevent the error I saw from happening anymore, I removed the original instance of Python 2 from the default.xml
, making this recompiled Python 2 the only one present in the whole environment.
If the |
…st): 9.0.0-r76 Dependencies for termux/termux-docker#72
d380f68
to
29bc357
Compare
PoC dependencies that would hypothetically be very helpful and idiomatic for:
deblobbify, replacing the system folder with several other components termux-docker#72
bumping is required because the
/system/lib/libc.so
file of AOSP 8.0.0 is bugged and freezes when run inside Docker on 32-bit devices, but the same file in AOSP 9.0.0 is unaffectedmksh
provides/system/bin/sh
for termux-dockeriputils
provides/system/bin/ping
for termux-docker which is a dependency of$PREFIX/bin/ping
toybox
provides/system/bin/su
which is used as a crucial component of termux-docker to switch to thesystem
user during itsentrypoint.sh
boringssl
is a dependency ofiputils
andtoybox