diff --git a/scripts/build.sh b/scripts/build.sh index 4f2db0107..dbeb0e482 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -454,7 +454,7 @@ if [ "$ROOT_SOL" = 'magisk' ]; then echo "Integrate Magisk" "$WORK_DIR/magisk/magiskboot" compress=xz "$WORK_DIR/magisk/magisk64" "$WORK_DIR/magisk/magisk64.xz" "$WORK_DIR/magisk/magiskboot" compress=xz "$WORK_DIR/magisk/magisk32" "$WORK_DIR/magisk/magisk32.xz" - "$WORK_DIR/magisk/magiskboot" compress=xz "$WORK_DIR/magisk/stub.apk" "$WORK_DIR/magisk/stub.xz" + "$WORK_DIR/magisk/magiskboot" compress=xz "$MAGISK_PATH" "$WORK_DIR/magisk/stub.xz" echo "KEEPFORCEENCRYPT=true" >> "$WORK_DIR/magisk/config" echo "PREINITDEVICE=sde" >> "$WORK_DIR/magisk/config" "$WORK_DIR/magisk/magiskboot" cpio "$WORK_DIR/wsa/$ARCH/Tools/initrd.img" "mv /init /wsainit" "add 0750 /lspinit ../bin/$ARCH/lspinit" "ln /lspinit /init" "add 0750 /magiskinit $WORK_DIR/magisk/magiskinit" "mkdir 0750 overlay.d" "mkdir 0750 overlay.d/sbin" "add 0644 overlay.d/sbin/magisk64.xz $WORK_DIR/magisk/magisk64.xz" "add 0644 overlay.d/sbin/magisk32.xz $WORK_DIR/magisk/magisk32.xz" "add 0644 overlay.d/sbin/stub.xz $WORK_DIR/magisk/stub.xz" "mkdir 000 .backup" "add 000 .backup/.magisk $WORK_DIR/magisk/config" || abort "Unable to patch initrd" diff --git a/scripts/extractMagisk.py b/scripts/extractMagisk.py index ee9d1d7cf..82e0430be 100644 --- a/scripts/extractMagisk.py +++ b/scripts/extractMagisk.py @@ -85,4 +85,3 @@ def extract_as(zip, name, as_name, dir): extract_as(zip, f"lib/{ abi_map[arch][0] }/libmagiskinit.so", "magiskpolicy", "magisk") extract_as(zip, f"lib/{ abi_map[arch][0] }/libmagiskinit.so", "magiskinit", "magisk") extract_as(zip, f"lib/{ abi_map[arch][0] }/libmagiskboot.so", "magiskboot", "magisk") - extract_as(zip, f"assets/stub.apk", "stub.apk", "magisk")