CommonInstaller: setup private busybox before installation

6 years ago · d3a8136a8e
parent 56df485da2
commit d3a8136a8e
8 changed files with 22 additions and 0 deletions
--- a/ChangeLog.md
+++ b/ChangeLog.md
@ -7,6 +7,8 @@
 * CommonInstaller
  * cleanup TWRP environment when an installation error occurs during System Mode installation
     * regression from 17.9
+  * add busybox build by osm0sis (used during installation only)
+     * fixes possible installation issues with Stock ROMs

 ### General Changes

--- a/11
+++ b/11
@ -409,6 +409,17 @@ detect_arch () {
 	[ ! -d /data/adb ] && mkdir /data/adb
 }

+setup_busybox () {
+	OLD_PATH=${PATH}
+
+	mkdir -p ${INSTALLER}/busybox
+	ln -s ${INSTALLER}/busybox.${BIN_ARCH} ${INSTALLER}/busybox/busybox
+
+	${INSTALLER}/busybox.${BIN_ARCH} --install -s ${INSTALLER}/busybox/
+
+	export PATH="${INSTALLER}/busybox:${PATH}"
+}
+
 # Taken from Magisk, used for System Mode installation
 recovery_actions () {
 	mv /sbin /sbin_tmp
--- a/F-Droid/META-INF/com/google/android/update-binary
+++ b/F-Droid/META-INF/com/google/android/update-binary
@ -26,6 +26,7 @@ set_progress 0.1
 mount_partitions
 unpack_zip
 detect_arch
+setup_busybox

 get_cfg_setup

--- a/Full/META-INF/com/google/android/update-binary
+++ b/Full/META-INF/com/google/android/update-binary
@ -26,6 +26,7 @@ set_progress 0.1
 mount_partitions
 unpack_zip
 detect_arch
+setup_busybox
 set_progress 0.2

 get_cfg_setup
--- a/data/build-package.pkg-fdroid
+++ b/data/build-package.pkg-fdroid
@ -22,6 +22,8 @@ create_fdroid_package() {

 	zip_add CommonInstaller
 	zip_add CommonAddon
+	zip_add busybox.arm
+	zip_add busybox.x86

 	zip_add_doc
 	zip_add_config .nanodroid-setup 0
--- a/data/build-package.pkg-full
+++ b/data/build-package.pkg-full
@ -15,6 +15,8 @@ create_full_package () {

 	zip_add CommonInstaller
 	zip_add CommonAddon
+	zip_add busybox.arm
+	zip_add busybox.x86

 	zip_add_doc
 	zip_add_config .nanodroid-overlay 0
--- a/data/build-package.pkg-microg
+++ b/data/build-package.pkg-microg
@ -33,6 +33,8 @@ create_microg_package() {

 	zip_add CommonInstaller
 	zip_add CommonAddon
+	zip_add busybox.arm
+	zip_add busybox.x86

 	zip_add_doc
 	zip_add_config .nanodroid-overlay 0
--- a/microG/META-INF/com/google/android/update-binary
+++ b/microG/META-INF/com/google/android/update-binary
@ -26,6 +26,7 @@ set_progress 0.1
 mount_partitions
 unpack_zip
 detect_arch
+setup_busybox

 get_cfg_setup
 get_cfg_overlay