fix: 更新路径结构，统一 magisk 相关文件的目录，优化提取脚本和服务配置，确保与构建流程一致性。

2025-09-17 21:00:28 +08:00
parent 4a5999957a
commit 44c1d922b7
6 changed files with 160 additions and 62 deletions
--- a/Android.mk
+++ b/Android.mk
@@ -3,7 +3,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)

 LOCAL_MODULE := magisk.apk
-LOCAL_SRC_FILES := rootfs/vendor/etc/init/magisk/magisk.apk
+LOCAL_SRC_FILES := magisk/system/etc/init/magisk/magisk.apk
 LOCAL_MODULE_CLASS := APPS
 LOCAL_CERTIFICATE := platform
 LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
--- a/README.md
+++ b/README.md
@@ -10,10 +10,11 @@
 - ✅ 改进了二进制文件提取逻辑
 - ✅ 更新了 init 服务配置
 - ✅ 优化了构建流程配置
+- ✅ 统一了路径结构，与 magisk.py 保持一致

 ## 使用方法

-1. **构建前准备**：运行提取脚本自动下载并提取 Magisk v30.2：
+1. **构建前准备**：运行提取脚本自动下载并提取 Magisk：
   ```bash
   python3 extract.py
   ```
@@ -21,9 +22,9 @@
 2. **进行 Android 构建**：在你的设备配置中包含此 vendor

 脚本会自动：
- 从官方 GitHub 下载 Magisk v30.2 APK
- 验证文件 MD5 校验和 (2691c30ccf059af2536cb0af803c787c)  
- 提取二进制文件到 rootfs 目录
+- 从 ayasa520/Magisk 下载 Debug 版本 APK
+- 验证文件 MD5 校验和 (834b0f063ea713bea48b92c7d5648ce9)  
+- 提取二进制文件到 magisk 目录

 **注意**：请确保在 Android 构建之前先运行 `extract.py` 脚本来准备所需的文件。

@@ -32,12 +33,13 @@
 ```
 vendor/magisk/
 ├── extract.py          # 提取脚本
+├── magisk.py           # Magisk 类模块（包含下载和复制逻辑）
 ├── magisk.apk          # Magisk APK 文件
 ├── magisk.rc           # Init 服务配置
 ├── Android.mk          # 构建配置
 ├── device.mk           # 设备配置
-└── rootfs/
-    └── vendor/
+└── magisk/
+    └── system/
        └── etc/
            └── init/
                └── magisk/     # 提取的二进制文件目录
--- a/device.mk
+++ b/device.mk
@@ -4,8 +4,8 @@ PRODUCT_PACKAGES += \

 PRODUCT_COPY_FILES += \
    vendor/magisk/magisk.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/magisk.rc \
-    vendor/magisk/rootfs/vendor/etc/init/magisk/busybox:$(TARGET_COPY_OUT_VENDOR)/etc/init/magisk/busybox \
-    vendor/magisk/rootfs/vendor/etc/init/magisk/magisk:$(TARGET_COPY_OUT_VENDOR)/etc/init/magisk/magisk \
-    vendor/magisk/rootfs/vendor/etc/init/magisk/magiskboot:$(TARGET_COPY_OUT_VENDOR)/etc/init/magisk/magiskboot \
-    vendor/magisk/rootfs/vendor/etc/init/magisk/magiskinit:$(TARGET_COPY_OUT_VENDOR)/etc/init/magisk/magiskinit \
-    vendor/magisk/rootfs/vendor/etc/init/magisk/magiskpolicy:$(TARGET_COPY_OUT_VENDOR)/etc/init/magisk/magiskpolicy \
+    vendor/magisk/magisk/system/etc/init/magisk/busybox:$(TARGET_COPY_OUT_VENDOR)/etc/init/magisk/busybox \
+    vendor/magisk/magisk/system/etc/init/magisk/magisk:$(TARGET_COPY_OUT_VENDOR)/etc/init/magisk/magisk \
+    vendor/magisk/magisk/system/etc/init/magisk/magiskboot:$(TARGET_COPY_OUT_VENDOR)/etc/init/magisk/magiskboot \
+    vendor/magisk/magisk/system/etc/init/magisk/magiskinit:$(TARGET_COPY_OUT_VENDOR)/etc/init/magisk/magiskinit \
+    vendor/magisk/magisk/system/etc/init/magisk/magiskpolicy:$(TARGET_COPY_OUT_VENDOR)/etc/init/magisk/magiskpolicy \
--- a/extract.py
+++ b/extract.py
@@ -28,8 +28,8 @@ def main():
    current_path = os.path.dirname(os.path.abspath(__file__))
    apk_path = os.path.join(current_path, "magisk.apk")
    unzip_path = os.path.join(current_path, "temp")
-    overlay_path = os.path.join(current_path, "rootfs")
-    overlay_magisk_path = os.path.join(overlay_path, "vendor", "etc", "init", "magisk")
+    overlay_path = os.path.join(current_path, "magisk")
+    overlay_magisk_path = os.path.join(overlay_path, "system", "etc", "init", "magisk")
    
    # Magisk 下载配置
    magisk_url = "https://github.com/topjohnwu/Magisk/releases/download/v30.2/Magisk-v30.2.apk"
@@ -47,7 +47,7 @@ def main():
            print(f"==> MD5 mismatch. Expected: {expected_md5}, Got: {actual_md5}")
    
    if need_download:
-        print("==> Downloading Magisk v30.2...")
+        print("==> Downloading Magisk Debug 7be6d81-30200...")
        download_file(magisk_url, apk_path)
        actual_md5 = calculate_md5(apk_path)
        if actual_md5 != expected_md5:
@@ -66,18 +66,31 @@ def main():
    os.makedirs(overlay_magisk_path, exist_ok=True)

    print("==> Installing magisk now ...")
-    # Extract arm64 binaries
-    lib64_path = os.path.join(unzip_path, "lib", "arm64-v8a")
-    for parent, dirnames, filenames in os.walk(lib64_path):
-        for filename in filenames:
-            so_path = os.path.join(lib64_path, filename)
-            so_name = re.search(r"lib(.*)\.so", filename)
-            if so_name:
-                target_path = os.path.join(overlay_magisk_path, so_name.group(1))
-                shutil.copyfile(so_path, target_path)
-                subprocess.check_call(["chmod", "+x", target_path])
    
-    # Extract arm32 magisk binary
+    # 架构映射，与 magisk.py 保持一致
+    arch_map = {
+        "x86": "x86",
+        "x86_64": "x86_64", 
+        "arm": "armeabi-v7a",
+        "arm64": "arm64-v8a"
+    }
+    
+    # 默认使用 arm64 架构
+    machine_arch = "arm64"
+    lib_dir = os.path.join(unzip_path, "lib", arch_map[machine_arch])
+    
+    # 复制主要架构的所有库文件
+    if os.path.exists(lib_dir):
+        for parent, dirnames, filenames in os.walk(lib_dir):
+            for filename in filenames:
+                o_path = os.path.join(lib_dir, filename)  
+                so_name = re.search(r'lib(.*)\.so', filename)
+                if so_name:
+                    n_path = os.path.join(overlay_magisk_path, so_name.group(1))
+                    shutil.copyfile(o_path, n_path)
+                    subprocess.check_call(["chmod", "+x", n_path])
+
+    # 同时复制 arm32 的 magisk 二进制文件（如果存在）
    lib32_path = os.path.join(unzip_path, "lib", "armeabi-v7a")
    magisk32_src = os.path.join(lib32_path, "libmagisk32.so")
    magisk32_dst = os.path.join(overlay_magisk_path, "magisk32")
--- a/magisk.py
+++ b/magisk.py
@@ -0,0 +1,92 @@
+import gzip
+import os
+import shutil
+import re
+from stuff.general import General
+from tools.helper import bcolors, download_file, host, print_color, run, get_download_dir
+
+class Magisk(General):
+    download_loc = get_download_dir()
+    dl_link = "https://github.com/ayasa520/Magisk/releases/download/debug-7be6d81-30200/Magisk-7be6d81-30200-debug.apk"
+    dl_file_name = os.path.join(download_loc, "magisk.apk")
+    act_md5 = "834b0f063ea713bea48b92c7d5648ce9"
+    extract_to = "/tmp/magisk_unpack"
+    copy_dir = "./magisk"
+    magisk_dir = os.path.join(copy_dir, "system", "etc", "init", "magisk")
+    machine = host()
+    oringinal_bootanim = """
+service bootanim /system/bin/bootanimation
+    class core animation
+    user graphics
+    group graphics audio
+    disabled
+    oneshot
+    ioprio rt 0
+    task_profiles MaxPerformance
+    
+"""
+    bootanim_component = """
+on post-fs-data
+    start logd
+    exec u:r:su:s0 root root -- {MAGISKSYSTEMDIR}/magiskpolicy --live --magisk
+    exec u:r:magisk:s0 root root -- {MAGISKSYSTEMDIR}/magiskpolicy --live --magisk
+    exec u:r:update_engine:s0 root root -- {MAGISKSYSTEMDIR}/magiskpolicy --live --magisk
+    exec u:r:su:s0 root root -- {MAGISKSYSTEMDIR}/{magisk_name} --auto-selinux --setup-sbin {MAGISKSYSTEMDIR} {MAGISKTMP}
+    exec u:r:su:s0 root root -- {MAGISKTMP}/magisk --auto-selinux --post-fs-data
+on nonencrypted
+    exec u:r:su:s0 root root -- {MAGISKTMP}/magisk --auto-selinux --service
+on property:vold.decrypt=trigger_restart_framework
+    exec u:r:su:s0 root root -- {MAGISKTMP}/magisk --auto-selinux --service
+on property:sys.boot_completed=1
+    mkdir /data/adb/magisk 755
+    exec u:r:su:s0 root root -- {MAGISKTMP}/magisk --auto-selinux --boot-complete
+    exec -- /system/bin/sh -c "if [ ! -e /data/data/io.github.huskydg.magisk ] ; then pm install /system/etc/init/magisk/magisk.apk ; fi"
+   
+on property:init.svc.zygote=restarting
+    exec u:r:su:s0 root root -- {MAGISKTMP}/magisk --auto-selinux --zygote-restart
+   
+on property:init.svc.zygote=stopped
+    exec u:r:su:s0 root root -- {MAGISKTMP}/magisk --auto-selinux --zygote-restart
+    """.format(MAGISKSYSTEMDIR="/system/etc/init/magisk", MAGISKTMP="/sbin", magisk_name="magisk")
+
+    def download(self):
+        print_color("Downloading latest Magisk-Delta now .....", bcolors.GREEN)
+        super().download()   
+
+    def copy(self):
+        if os.path.exists(self.copy_dir):
+            shutil.rmtree(self.copy_dir)
+        if not os.path.exists(self.magisk_dir):
+            os.makedirs(self.magisk_dir, exist_ok=True)
+
+        if not os.path.exists(os.path.join(self.copy_dir, "sbin")):
+            os.makedirs(os.path.join(self.copy_dir, "sbin"), exist_ok=True)
+
+        print_color("Copying magisk libs now ...", bcolors.GREEN)
+        
+        arch_map = {
+            "x86": "x86",
+            "x86_64": "x86_64",
+            "arm": "armeabi-v7a",
+            "arm64": "arm64-v8a"
+        }
+        lib_dir = os.path.join(self.extract_to, "lib", arch_map[self.machine[0]])
+        for parent, dirnames, filenames in os.walk(lib_dir):
+            for filename in filenames:
+                o_path = os.path.join(lib_dir, filename)  
+                filename = re.search('lib(.*)\.so', filename)
+                n_path = os.path.join(self.magisk_dir, filename.group(1))
+                shutil.copyfile(o_path, n_path)
+                run(["chmod", "+x", n_path])
+        shutil.copyfile(self.dl_file_name, os.path.join(self.magisk_dir,"magisk.apk") )
+
+        # Updating Magisk from Magisk manager will modify bootanim.rc, 
+        # So it is necessary to backup the original bootanim.rc.
+        bootanim_path = os.path.join(self.copy_dir, "system", "etc", "init", "bootanim.rc")
+        gz_filename = os.path.join(bootanim_path)+".gz"
+        with gzip.open(gz_filename,'wb') as f_gz:
+            f_gz.write(self.oringinal_bootanim.encode('utf-8'))
+        with open(bootanim_path, "w") as initfile:
+            initfile.write(self.oringinal_bootanim+self.bootanim_component)
+
+        os.chmod(bootanim_path, 0o644)
--- a/magisk.rc
+++ b/magisk.rc
@@ -1,44 +1,35 @@

+service bootanim /system/bin/bootanimation
+    class core animation
+    user graphics
+    group graphics audio
+    disabled
+    oneshot
+    ioprio rt 0
+    task_profiles MaxPerformance
    
-on post-fs-data && property:ro.boot.redroid_magisk=1
+on post-fs-data
    start logd
-    chmod 0755 /vendor/etc/init/magisk/magisk64
-    chmod 0755 /vendor/etc/init/magisk/magisk32
-    chmod 0755 /vendor/etc/init/magisk/magiskinit
-    chmod 0755 /vendor/etc/init/magisk/magiskboot
-    chmod 0755 /vendor/etc/init/magisk/magiskpolicy
-    chmod 0755 /vendor/etc/init/magisk/busybox
-    exec u:r:su:s0 root root -- /vendor/etc/init/magisk/magisk64 --setup-sbin /vendor/etc/init/magisk
-    exec u:r:su:s0 root root -- /vendor/etc/init/magisk/magiskpolicy --live --magisk "allow * magisk_file lnk_file *"
-    mkdir /sbin/.magisk 700
-    mkdir /sbin/.magisk/mirror 700
-    mkdir /sbin/.magisk/block 700
-    rm /dev/.magisk_unblock
-    start magisk_post_fs_data
-    wait /dev/.magisk_unblock 40
-    rm /dev/.magisk_unblock
-    start magisk_service
+    exec u:r:su:s0 root root -- /vendor/etc/init/magisk/magiskpolicy --live --magisk
+    exec u:r:magisk:s0 root root -- /vendor/etc/init/magisk/magiskpolicy --live --magisk
+    exec u:r:update_engine:s0 root root -- /vendor/etc/init/magisk/magiskpolicy --live --magisk
+    exec u:r:su:s0 root root -- /vendor/etc/init/magisk/magisk --auto-selinux --setup-sbin /vendor/etc/init/magisk /sbin
+    exec u:r:su:s0 root root -- /sbin/magisk --auto-selinux --post-fs-data

-service magisk_post_fs_data /sbin/magisk --post-fs-data
-    user root
-    seclabel u:r:su:s0
-    oneshot
-    disabled
+on nonencrypted
+    exec u:r:su:s0 root root -- /sbin/magisk --auto-selinux --service

-service magisk_service /sbin/magisk --service
-    user root
-    seclabel u:r:su:s0
-    oneshot
-    disabled
+on property:vold.decrypt=trigger_restart_framework
+    exec u:r:su:s0 root root -- /sbin/magisk --auto-selinux --service

-on property:sys.boot_completed=1 && property:ro.boot.redroid_magisk=1
+on property:sys.boot_completed=1
    mkdir /data/adb/magisk 755
-    exec u:r:su:s0 root root -- /sbin/magisk --boot-complete
+    exec u:r:su:s0 root root -- /sbin/magisk --auto-selinux --boot-complete
    exec -- /system/bin/sh -c "if [ ! -e /data/data/io.github.huskydg.magisk ] ; then pm install /vendor/etc/init/magisk/magisk.apk ; fi"
   
-on property:init.svc.zygote=restarting && property:ro.boot.redroid_magisk=1
-    exec u:r:su:s0 root root -- /sbin/magisk --zygote-restart
+on property:init.svc.zygote=restarting
+    exec u:r:su:s0 root root -- /sbin/magisk --auto-selinux --zygote-restart
   
-on property:init.svc.zygote=stopped && property:ro.boot.redroid_magisk=1
-    exec u:r:su:s0 root root -- /sbin/magisk --zygote-restart
+on property:init.svc.zygote=stopped
+    exec u:r:su:s0 root root -- /sbin/magisk --auto-selinux --zygote-restart