From 70bca68232784933e0869a4a7e9cc4f90028b25b Mon Sep 17 00:00:00 2001 From: zyb Date: Thu, 19 Jun 2025 13:38:45 +0800 Subject: [PATCH] modified: npk.py modified: patch.py --- npk.py | 2 ++ patch.py | 7 ++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/npk.py b/npk.py index ec573b1..a5e7267 100644 --- a/npk.py +++ b/npk.py @@ -229,6 +229,8 @@ class NovaPackage(Package): import hashlib from mikro import mikro_kcdsa_sign,mikro_eddsa_sign build_time = os.getenv('BUILD_TIME',None) + if build_time: + print(f'Signing package with build time: {build_time}') if len(self._packages) > 0: if build_time: self[NpkPartID.PKG_INFO].data._build_time = int(build_time) diff --git a/patch.py b/patch.py index 95def05..eb8e81e 100644 --- a/patch.py +++ b/patch.py @@ -22,8 +22,7 @@ def replace_key(old,new,data,name=''): old_chunks = [bytes([old[i]]) for i in key_map] new_chunks = [bytes([new[i]]) for i in key_map] data = replace_chunks(old_chunks, new_chunks, data,name) - - if os.getenv('ARCH','') == '-arm64': + if os.getenv('ARCH', 'x86').replace('-', '').strip() == 'arm64': old_chunks = [old[i:i+4] for i in range(0, len(old), 4)] new_chunks = [new[i:i+4] for i in range(0, len(new), 4)] old_bytes = old_chunks[4] + old_chunks[5] + old_chunks[2] + old_chunks[0] + old_chunks[1] + old_chunks[6] + old_chunks[7] @@ -286,9 +285,7 @@ def patch_loader(loader_file): from package import check_install_package check_install_package(['pyelftools']) from loader.patch_loader import patch_loader as do_patch_loader - arch = os.getenv('ARCH','x86') - if arch != 'x86': - arch = arch.replace('-','') + arch = os.getenv('ARCH', 'x86').replace('-', '').strip() do_patch_loader(loader_file,loader_file,arch) except ImportError as e: print(e)