mirror of
https://huihui.cat/mirrors/MikroTikPatch.git
synced 2025-12-10 03:24:37 +01:00
modified: npk.py
modified: patch.py
This commit is contained in:
parent
4cdd6d5619
commit
70bca68232
2 changed files with 4 additions and 5 deletions
2
npk.py
2
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)
|
||||
|
|
|
|||
7
patch.py
7
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)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue