br0kenpixel/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-09-06 06:36:58 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Stop embedding stub.apk in magiskinit

Browse Source
This commit is contained in:
vvb2060
2022-10-31 22:31:15 +08:00
committed by John Wu
parent a4a734458b
commit ad0e6511e1
10 changed files with 55 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/avd_magisk.sh
View File

@@ -120,6 +120,7 @@ fi
# Magisk stuff
mkdir -p $MAGISKBIN 2>/dev/null
unzip -oj magisk.apk 'assets/*.sh' -d $MAGISKBIN
unzip -oj magisk.apk 'assets/stub.apk' -d $MAGISKTMP
mkdir $NVBASE/modules 2>/dev/null
mkdir $POSTFSDATAD 2>/dev/null
mkdir $SERVICED 2>/dev/null
@@ -143,8 +144,6 @@ ln -s ./magisk $MAGISKTMP/resetprop
ln -s ./magisk $MAGISKTMP/magiskhide
ln -s ./magiskpolicy $MAGISKTMP/supolicy
./magiskinit -x manager $MAGISKTMP/stub.apk
mkdir -p $MAGISKTMP/.magisk/mirror
mkdir $MAGISKTMP/.magisk/block
touch $MAGISKTMP/.magisk/config

6
scripts/avd_patch.sh
View File

@@ -43,7 +43,7 @@ if [ -z "$FIRST_STAGE" ]; then
fi
# Extract files from APK
unzip -oj magisk.apk 'assets/util_functions.sh'
unzip -oj magisk.apk 'assets/util_functions.sh' 'assets/stub.apk'
. ./util_functions.sh
api_level_arch_detect
@@ -65,6 +65,7 @@ touch config
./magiskboot compress=xz magisk32 magisk32.xz
./magiskboot compress=xz magisk64 magisk64.xz
./magiskboot compress=xz stub.apk stub.xz
export KEEPVERITY=false
export KEEPFORCEENCRYPT=true
@@ -75,10 +76,11 @@ export KEEPFORCEENCRYPT=true
"mkdir 0750 overlay.d/sbin" \
"add 0644 overlay.d/sbin/magisk32.xz magisk32.xz" \
"add 0644 overlay.d/sbin/magisk64.xz magisk64.xz" \
"add 0644 overlay.d/sbin/stub.xz stub.xz" \
"patch" \
"backup ramdisk.cpio.orig" \
"mkdir 000 .backup" \
"add 000 .backup/.magisk config"
rm -f ramdisk.cpio.orig config magisk*.xz
rm -f ramdisk.cpio.orig config magisk*.xz stub.xz
./magiskboot compress=gzip ramdisk.cpio ramdisk.cpio.gz

4
scripts/boot_patch.sh
View File

@@ -164,6 +164,7 @@ if [ -f magisk64 ]; then
./magiskboot compress=xz magisk64 magisk64.xz
unset SKIP64
fi
./magiskboot compress=xz stub.apk stub.xz
./magiskboot cpio ramdisk.cpio \
"add 0750 $INIT magiskinit" \
@@ -171,12 +172,13 @@ fi
"mkdir 0750 overlay.d/sbin" \
"$SKIP32 add 0644 overlay.d/sbin/magisk32.xz magisk32.xz" \
"$SKIP64 add 0644 overlay.d/sbin/magisk64.xz magisk64.xz" \
"add 0644 overlay.d/sbin/stub.xz stub.xz" \
"patch" \
"backup ramdisk.cpio.orig" \
"mkdir 000 .backup" \
"add 000 .backup/.magisk config"
rm -f ramdisk.cpio.orig config magisk*.xz
rm -f ramdisk.cpio.orig config magisk*.xz stub.xz
#################
# Binary Patches