From 2364c36dbb481de4d589b54046b055f48729d9b5 Mon Sep 17 00:00:00 2001 From: Howard Wu Date: Sun, 14 May 2023 00:33:09 +0800 Subject: [PATCH] Fix 2303 build failed Fix #534 The commit also fixes an issue where the version number was wrong when getting the download link online at the same time when WSA was already downloaded --- scripts/build.sh | 84 ++++++++++++++++----------------- scripts/extractMagisk.py | 24 +++++++--- scripts/extractWSA.py | 30 ++++++++++-- scripts/generateKernelSULink.py | 26 +++++++++- scripts/generateWSALinks.py | 18 ++++--- 5 files changed, 121 insertions(+), 61 deletions(-) diff --git a/scripts/build.sh b/scripts/build.sh index fbf88bc..d999953 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -194,10 +194,9 @@ mk_erofs_umount() { } ro_ext4_img_to_rw() { - resize_img "$2" "$(($(du --apparent-size -sB512 "$2" | cut -f1) * 2))"s || return 1 - e2fsck -fp -E unshare_blocks "$2" || return 1 - resize_img "$2" || return 1 - rm -f "$1" || return 1 + resize_img "$1" "$(($(du --apparent-size -sB512 "$1" | cut -f1) * 2))"s || return 1 + e2fsck -fp -E unshare_blocks "$1" || return 1 + resize_img "$1" || return 1 return 0 } @@ -463,9 +462,9 @@ update_gapps_zip_name() { fi GAPPS_PATH=$DOWNLOAD_DIR/$GAPPS_ZIP_NAME } -DOWN_WSA_MAIN_VERSION=0 +WSA_MAIN_VER=0 update_ksu_zip_name() { - if [ "$DOWN_WSA_MAIN_VERSION" -lt "2303" ]; then + if [ "$WSA_MAIN_VER" -lt "2303" ]; then KERNEL_VER="5.10.117.2" else KERNEL_VER="5.15.78.1" @@ -484,13 +483,13 @@ if [ -z ${OFFLINE+x} ]; then # shellcheck disable=SC1090 source "$WSA_WORK_ENV" || abort else - DOWN_WSA_MAIN_VERSION=$(python3 getWSAMainVersion.py "$ARCH" "$WSA_ZIP_PATH") + WSA_MAIN_VER=$(python3 getWSAMainVersion.py "$ARCH" "$WSA_ZIP_PATH") fi - if [[ "$DOWN_WSA_MAIN_VERSION" -lt 2211 ]]; then + if [[ "$WSA_MAIN_VER" -lt 2211 ]]; then ANDROID_API=32 update_gapps_zip_name fi - if [[ "$DOWN_WSA_MAIN_VERSION" -ge 2303 ]]; then + if [[ "$WSA_MAIN_VER" -ge 2303 ]]; then update_ksu_zip_name fi if [ "$ROOT_SOL" = "magisk" ] || [ "$GAPPS_BRAND" != "none" ]; then @@ -515,12 +514,12 @@ if [ -z ${OFFLINE+x} ]; then exit 1 fi else # Offline mode - DOWN_WSA_MAIN_VERSION=$(python3 getWSAMainVersion.py "$ARCH" "$WSA_ZIP_PATH") - if [[ "$DOWN_WSA_MAIN_VERSION" -lt 2211 ]]; then + WSA_MAIN_VER=$(python3 getWSAMainVersion.py "$ARCH" "$WSA_ZIP_PATH") + if [[ "$WSA_MAIN_VER" -lt 2211 ]]; then ANDROID_API=32 update_gapps_zip_name fi - if [[ "$DOWN_WSA_MAIN_VERSION" -ge 2303 ]]; then + if [[ "$WSA_MAIN_VER" -ge 2303 ]]; then update_ksu_zip_name fi declare -A FILES_CHECK_LIST=([WSA_ZIP_PATH]="$WSA_ZIP_PATH" [xaml_PATH]="$xaml_PATH" [vclibs_PATH]="$vclibs_PATH" [UWPVCLibs_PATH]="$UWPVCLibs_PATH") @@ -634,7 +633,10 @@ if [ "$GAPPS_BRAND" != 'none' ]; then echo -e "Extract done\n" fi -if [[ "$DOWN_WSA_MAIN_VERSION" -ge 2302 ]]; then +cat "$WSA_WORK_ENV" +echo -e "\n" + +if [[ "$WSA_MAIN_VER" -ge 2302 ]]; then echo "Convert vhdx to RAW image" vhdx_to_raw_img "$WORK_DIR/wsa/$ARCH/system_ext.vhdx" "$WORK_DIR/wsa/$ARCH/system_ext.img" || abort vhdx_to_raw_img "$WORK_DIR/wsa/$ARCH/product.vhdx" "$WORK_DIR/wsa/$ARCH/product.img" || abort @@ -642,7 +644,7 @@ if [[ "$DOWN_WSA_MAIN_VERSION" -ge 2302 ]]; then vhdx_to_raw_img "$WORK_DIR/wsa/$ARCH/vendor.vhdx" "$WORK_DIR/wsa/$ARCH/vendor.img" || abort echo -e "Convert vhdx to RAW image done\n" fi -if [[ "$DOWN_WSA_MAIN_VERSION" -ge 2304 ]]; then +if [[ "$WSA_MAIN_VER" -ge 2304 ]]; then echo "Mount images" sudo mkdir -p -m 755 "$ROOT_MNT_RO" || abort sudo chown "0:0" "$ROOT_MNT_RO" || abort @@ -658,15 +660,15 @@ if [[ "$DOWN_WSA_MAIN_VERSION" -ge 2304 ]]; then mk_overlayfs "$PRODUCT_MNT_RO" product "$PRODUCT_MNT" || abort mk_overlayfs "$SYSTEM_EXT_MNT_RO" system_ext "$SYSTEM_EXT_MNT" || abort echo -e "Create overlayfs for EROFS done\n" -elif [[ "$DOWN_WSA_MAIN_VERSION" -ge 2302 ]]; then +elif [[ "$WSA_MAIN_VER" -ge 2302 ]]; then echo "Remove read-only flag for read-only EXT4 image" - ro_ext4_img_to_rw "$WORK_DIR/wsa/$ARCH/system_ext.img" "$WORK_DIR/wsa/$ARCH/system_ext.img" || abort - ro_ext4_img_to_rw "$WORK_DIR/wsa/$ARCH/product.img" "$WORK_DIR/wsa/$ARCH/product.img" || abort - ro_ext4_img_to_rw "$WORK_DIR/wsa/$ARCH/system.img" "$WORK_DIR/wsa/$ARCH/system.img" || abort - ro_ext4_img_to_rw "$WORK_DIR/wsa/$ARCH/vendor.img" "$WORK_DIR/wsa/$ARCH/vendor.img" || abort - echo -e "Remove read-only flag for read-only EXT4 image\n" + ro_ext4_img_to_rw "$WORK_DIR/wsa/$ARCH/system_ext.img" || abort + ro_ext4_img_to_rw "$WORK_DIR/wsa/$ARCH/product.img" || abort + ro_ext4_img_to_rw "$WORK_DIR/wsa/$ARCH/system.img" || abort + ro_ext4_img_to_rw "$WORK_DIR/wsa/$ARCH/vendor.img" || abort + echo -e "Remove read-only flag for read-only EXT4 image done\n" fi -if [[ "$DOWN_WSA_MAIN_VERSION" -lt 2304 ]]; then +if [[ "$WSA_MAIN_VER" -lt 2304 ]]; then echo "Calculate the required space" EXTRA_SIZE=10240 @@ -738,28 +740,24 @@ echo -e "done\n" if [ "$ROOT_SOL" = 'magisk' ]; then echo "Integrate Magisk" - sudo mkdir "$ROOT_MNT/sbin" - sudo setfattr -n security.selinux -v "u:object_r:rootfs:s0" "$ROOT_MNT/sbin" || abort - sudo chown root:root "$ROOT_MNT/sbin" - sudo chmod 0700 "$ROOT_MNT/sbin" - sudo cp "$WORK_DIR/magisk/magisk/"* "$ROOT_MNT/sbin/" - sudo cp "$MAGISK_PATH" "$ROOT_MNT/sbin/magisk.apk" || abort - sudo tee -a "$ROOT_MNT/sbin/loadpolicy.sh" </dev/null || abort + sudo cp "$WORK_DIR/magisk/magisk/"* "$ROOT_MNT/debug_ramdisk/" + sudo cp "$MAGISK_PATH" "$ROOT_MNT/debug_ramdisk/magisk.apk" || abort + sudo tee -a "$ROOT_MNT/debug_ramdisk/loadpolicy.sh" </dev/null || abort #!/system/bin/sh mkdir -p /data/adb/magisk -cp /sbin/* /data/adb/magisk/ +cp /debug_ramdisk/* /data/adb/magisk/ sync chmod -R 755 /data/adb/magisk restorecon -R /data/adb/magisk for module in \$(ls /data/adb/modules); do if ! [ -f "/data/adb/modules/\$module/disable" ] && [ -f "/data/adb/modules/\$module/sepolicy.rule" ]; then - /sbin/magiskpolicy --live --apply "/data/adb/modules/\$module/sepolicy.rule" + /debug_ramdisk/magiskpolicy --live --apply "/data/adb/modules/\$module/sepolicy.rule" fi done EOF - sudo find "$ROOT_MNT/sbin" -type f -exec chmod 0755 {} \; - sudo find "$ROOT_MNT/sbin" -type f -exec chown root:root {} \; - sudo find "$ROOT_MNT/sbin" -type f -exec setfattr -n security.selinux -v "u:object_r:system_file:s0" {} \; || abort + sudo find "$ROOT_MNT/debug_ramdisk" -type f -exec chmod 0755 {} \; + sudo find "$ROOT_MNT/debug_ramdisk" -type f -exec chown root:root {} \; + sudo find "$ROOT_MNT/debug_ramdisk" -type f -exec setfattr -n security.selinux -v "u:object_r:system_file:s0" {} \; || abort MAGISK_TMP_PATH=$(Gen_Rand_Str 14) echo "/dev/$MAGISK_TMP_PATH(/.*)? u:object_r:magisk_file:s0" | sudo tee -a "$VENDOR_MNT/etc/selinux/vendor_file_contexts" @@ -772,23 +770,25 @@ EOF on post-fs-data mkdir /dev/$MAGISK_TMP_PATH mount tmpfs tmpfs /dev/$MAGISK_TMP_PATH mode=0755 - copy /sbin/magisk64 /dev/$MAGISK_TMP_PATH/magisk64 + + copy /debug_ramdisk/magisk64 /dev/$MAGISK_TMP_PATH/magisk64 chmod 0755 /dev/$MAGISK_TMP_PATH/magisk64 symlink ./magisk64 /dev/$MAGISK_TMP_PATH/magisk symlink ./magisk64 /dev/$MAGISK_TMP_PATH/su symlink ./magisk64 /dev/$MAGISK_TMP_PATH/resetprop - copy /sbin/magisk32 /dev/$MAGISK_TMP_PATH/magisk32 + copy /debug_ramdisk/magisk32 /dev/$MAGISK_TMP_PATH/magisk32 chmod 0755 /dev/$MAGISK_TMP_PATH/magisk32 - copy /sbin/magiskinit /dev/$MAGISK_TMP_PATH/magiskinit + copy /debug_ramdisk/magiskinit /dev/$MAGISK_TMP_PATH/magiskinit chmod 0755 /dev/$MAGISK_TMP_PATH/magiskinit - copy /sbin/magiskpolicy /dev/$MAGISK_TMP_PATH/magiskpolicy + copy /debug_ramdisk/magiskpolicy /dev/$MAGISK_TMP_PATH/magiskpolicy chmod 0755 /dev/$MAGISK_TMP_PATH/magiskpolicy mkdir /dev/$MAGISK_TMP_PATH/.magisk 755 mkdir /dev/$MAGISK_TMP_PATH/.magisk/mirror 0 mkdir /dev/$MAGISK_TMP_PATH/.magisk/block 0 mkdir /dev/$MAGISK_TMP_PATH/.magisk/worker 0 - copy /sbin/magisk.apk /dev/$MAGISK_TMP_PATH/stub.apk + copy /debug_ramdisk/magisk.apk /dev/$MAGISK_TMP_PATH/stub.apk chmod 0644 /dev/$MAGISK_TMP_PATH/stub.apk + rm /dev/.magisk_unblock exec_start $LOAD_POLICY_SVC_NAME start $PFD_SVC_NAME @@ -796,7 +796,7 @@ on post-fs-data rm /dev/.magisk_unblock exec u:r:magisk:s0 0 0 -- /system/bin/mknod -m 0600 /dev/$MAGISK_TMP_PATH/.magisk/block/preinit b 8 0 -service $LOAD_POLICY_SVC_NAME /system/bin/sh /sbin/loadpolicy.sh +service $LOAD_POLICY_SVC_NAME /system/bin/sh /debug_ramdisk/loadpolicy.sh user root seclabel u:r:magisk:s0 oneshot @@ -814,7 +814,7 @@ service $LS_SVC_NAME /dev/$MAGISK_TMP_PATH/magisk --service on property:sys.boot_completed=1 mkdir /data/adb/magisk 755 - copy /sbin/magisk.apk /data/adb/magisk/magisk.apk + copy /debug_ramdisk/magisk.apk /data/adb/magisk/magisk.apk exec /dev/$MAGISK_TMP_PATH/magisk --boot-complete on property:init.svc.zygote=restarting @@ -905,7 +905,7 @@ if [ "$GAPPS_BRAND" != 'none' ]; then fi fi -if [[ "$DOWN_WSA_MAIN_VERSION" -ge 2304 ]]; then +if [[ "$WSA_MAIN_VER" -ge 2304 ]]; then echo "Create EROFS images" mk_erofs_umount "$VENDOR_MNT" "$WORK_DIR/wsa/$ARCH/vendor.img" || abort mk_erofs_umount "$PRODUCT_MNT" "$WORK_DIR/wsa/$ARCH/product.img" || abort @@ -934,7 +934,7 @@ else echo -e "Shrink images done\n" fi -if [[ "$DOWN_WSA_MAIN_VERSION" -ge 2302 ]]; then +if [[ "$WSA_MAIN_VER" -ge 2302 ]]; then echo "Convert images to vhdx" qemu-img convert -q -f raw -o subformat=fixed -O vhdx "$WORK_DIR/wsa/$ARCH/system_ext.img" "$WORK_DIR/wsa/$ARCH/system_ext.vhdx" || abort qemu-img convert -q -f raw -o subformat=fixed -O vhdx "$WORK_DIR/wsa/$ARCH/product.img" "$WORK_DIR/wsa/$ARCH/product.vhdx" || abort diff --git a/scripts/extractMagisk.py b/scripts/extractMagisk.py index 4c2a30e..15ded6a 100644 --- a/scripts/extractMagisk.py +++ b/scripts/extractMagisk.py @@ -23,10 +23,11 @@ import zipfile from pathlib import Path import platform import os -from typing import OrderedDict +from typing import Any, OrderedDict + class Prop(OrderedDict): - def __init__(self, props: str=...) -> None: + def __init__(self, props: str = ...) -> None: super().__init__() for i, line in enumerate(props.splitlines(False)): if '=' in line: @@ -35,8 +36,12 @@ class Prop(OrderedDict): else: self[f".{i}"] = line - def get(self, key: str) -> str: - return self[key] + def __setattr__(self, __name: str, __value: Any) -> None: + self[__name] = __value + + def __repr__(self): + return '\n'.join(f'{item}={self[item]}' for item in self) + is_x86_64 = platform.machine() in ("AMD64", "x86_64") host_abi = "x64" if is_x86_64 else "arm64" @@ -48,19 +53,24 @@ if not Path(workdir).is_dir(): abi_map = {"x64": ["x86_64", "x86"], "arm64": ["arm64-v8a", "armeabi-v7a"]} + def extract_as(zip, name, as_name, dir): info = zip.getinfo(name) info.filename = as_name zip.extract(info, workdir / dir) + with zipfile.ZipFile(magisk_zip) as zip: props = Prop(zip.comment.decode().replace('\000', '\n')) versionName = props.get("version") versionCode = props.get("versionCode") print(f"Magisk version: {versionName} ({versionCode})", flush=True) - with open(os.environ['WSA_WORK_ENV'], 'a') as environ_file: - environ_file.write(f'MAGISK_VERSION_NAME={versionName}\n') - environ_file.write(f'MAGISK_VERSION_CODE={versionCode}\n') + with open(os.environ['WSA_WORK_ENV'], 'r') as environ_file: + env = Prop(environ_file.read()) + env.MAGISK_VERSION_NAME = versionName + env.MAGISK_VERSION_CODE = versionCode + with open(os.environ['WSA_WORK_ENV'], 'w') as environ_file: + environ_file.write(str(env)) extract_as( zip, f"lib/{ abi_map[arch][0] }/libmagisk64.so", "magisk64", "magisk") extract_as( diff --git a/scripts/extractWSA.py b/scripts/extractWSA.py index 143f22f..2b09d2a 100644 --- a/scripts/extractWSA.py +++ b/scripts/extractWSA.py @@ -20,12 +20,31 @@ import os import sys +from typing import Any, OrderedDict import zipfile from pathlib import Path import re import shutil + +class Prop(OrderedDict): + def __init__(self, props: str = ...) -> None: + super().__init__() + for i, line in enumerate(props.splitlines(False)): + if '=' in line: + k, v = line.split('=', 1) + self[k] = v + else: + self[f".{i}"] = line + + def __setattr__(self, __name: str, __value: Any) -> None: + self[__name] = __value + + def __repr__(self): + return '\n'.join(f'{item}={self[item]}' for item in self) + + arch = sys.argv[1] zip_name = "" @@ -66,10 +85,13 @@ with zipfile.ZipFile(wsa_zip_path) as zip: main_ver = ver[0] rel = ver_no[3].split(".") rel_long = str(rel[0]) - with open(env_file, 'a') as environ_file: - environ_file.write(f'WSA_VER={long_ver}\n') - environ_file.write(f'WSA_MAIN_VER={main_ver}\n') - environ_file.write(f'WSA_REL={rel_long}\n') + with open(env_file, 'r') as environ_file: + env = Prop(environ_file.read()) + env.WSA_VER = long_ver + env.WSA_MAIN_VER = main_ver + env.WSA_REL = rel_long + with open(env_file, 'w') as environ_file: + environ_file.write(str(env)) filename_lower = f.filename.lower() if 'language' in filename_lower or 'scale' in filename_lower: name = f.filename.split("_")[2].split(".")[0] diff --git a/scripts/generateKernelSULink.py b/scripts/generateKernelSULink.py index 0273b87..3c36bd9 100644 --- a/scripts/generateKernelSULink.py +++ b/scripts/generateKernelSULink.py @@ -21,12 +21,31 @@ from datetime import datetime import sys import os +from typing import Any, OrderedDict import requests import json import re from pathlib import Path + +class Prop(OrderedDict): + def __init__(self, props: str = ...) -> None: + super().__init__() + for i, line in enumerate(props.splitlines(False)): + if '=' in line: + k, v = line.split('=', 1) + self[k] = v + else: + self[f".{i}"] = line + + def __setattr__(self, __name: str, __value: Any) -> None: + self[__name] = __value + + def __repr__(self): + return '\n'.join(f'{item}={self[item]}' for item in self) + + arch = sys.argv[1] arg2 = sys.argv[2] download_dir = Path.cwd().parent / "download" if arg2 == "" else Path(arg2) @@ -50,8 +69,11 @@ if res.status_code == 200: print(f"Error: No KernelSU release found for arch={abi_map[arch]}, kernel version={kernelVersion}", flush=True) exit(1) release_name = json_data["name"] - with open(os.environ['WSA_WORK_ENV'], 'a') as environ_file: - environ_file.write(f'KERNELSU_VER={release_name}\n') + with open(os.environ['WSA_WORK_ENV'], 'r') as environ_file: + env = Prop(environ_file.read()) + env.KERNELSU_VER = release_name + with open(os.environ['WSA_WORK_ENV'], 'w') as environ_file: + environ_file.write(str(env)) elif res.status_code == 403 and x_ratelimit_remaining == '0': message = json_data["message"] print(f"Github API Error: {message}", flush=True) diff --git a/scripts/generateWSALinks.py b/scripts/generateWSALinks.py index d0fe8b5..f4d059d 100644 --- a/scripts/generateWSALinks.py +++ b/scripts/generateWSALinks.py @@ -26,7 +26,7 @@ import sys from pathlib import Path from threading import Thread -from typing import OrderedDict +from typing import Any, OrderedDict from xml.dom import minidom from requests import Session @@ -42,8 +42,11 @@ class Prop(OrderedDict): else: self[f".{i}"] = line - def get(self, key: str) -> str: - return self[key] + def __setattr__(self, __name: str, __value: Any) -> None: + self[__name] = __value + + def __repr__(self): + return '\n'.join(f'{item}={self[item]}' for item in self) logging.captureWarnings(True) @@ -154,9 +157,12 @@ for filename, values in identities.items(): wsa_long_ver = re.search(u'\d{4}.\d{5}.\d{1,}.\d{1,}', filename).group() print(f'WSA Version={wsa_long_ver}\n', flush=True) main_ver = wsa_long_ver.split(".")[0] - with open(os.environ['WSA_WORK_ENV'], 'a') as environ_file: - environ_file.write(f"DOWN_WSA_VERSION={wsa_long_ver}\n") - environ_file.write(f"DOWN_WSA_MAIN_VERSION={main_ver}\n") + with open(os.environ['WSA_WORK_ENV'], 'r') as environ_file: + env = Prop(environ_file.read()) + env.WSA_VER = wsa_long_ver + env.WSA_MAIN_VER = main_ver + with open(os.environ['WSA_WORK_ENV'], 'w') as environ_file: + environ_file.write(str(env)) out_file_name = f"wsa-{release_type}.zip" out_file = download_dir / out_file_name else: