mirror of
https://huihui.cat/mirrors/MikroTikPatch.git
synced 2025-12-10 03:24:37 +01:00
modified: .github/workflows/mikrotik_patch_7.yml
modified: patch.py
This commit is contained in:
parent
70bca68232
commit
178ffcbadb
2 changed files with 9 additions and 7 deletions
9
.github/workflows/mikrotik_patch_7.yml
vendored
9
.github/workflows/mikrotik_patch_7.yml
vendored
|
|
@ -144,12 +144,11 @@ jobs:
|
||||||
echo "has_new_version=true" >> $GITHUB_OUTPUT
|
echo "has_new_version=true" >> $GITHUB_OUTPUT
|
||||||
wget -nv -O CHANGELOG https://${{ env.MIKRO_UPGRADE_URL }}/routeros/$LATEST_VERSION/CHANGELOG
|
wget -nv -O CHANGELOG https://${{ env.MIKRO_UPGRADE_URL }}/routeros/$LATEST_VERSION/CHANGELOG
|
||||||
cat CHANGELOG
|
cat CHANGELOG
|
||||||
if [ "${{ matrix.arch }}" == "x86" ]; then
|
if [[ "${{ matrix.arch }}" == "arm64" ]]; then
|
||||||
ARCH=''
|
echo "ARCH=-arm64" >> $GITHUB_ENV
|
||||||
elif [ "${{ matrix.arch }}" == "arm64" ]; then
|
else
|
||||||
ARCH='-arm64'
|
echo "ARCH=" >> $GITHUB_ENV
|
||||||
fi
|
fi
|
||||||
echo "ARCH=$ARCH" >> $GITHUB_ENV
|
|
||||||
echo "LATEST_VERSION=${LATEST_VERSION}" >> $GITHUB_ENV
|
echo "LATEST_VERSION=${LATEST_VERSION}" >> $GITHUB_ENV
|
||||||
sudo apt-get update > /dev/null
|
sudo apt-get update > /dev/null
|
||||||
|
|
||||||
|
|
|
||||||
7
patch.py
7
patch.py
|
|
@ -22,7 +22,9 @@ def replace_key(old,new,data,name=''):
|
||||||
old_chunks = [bytes([old[i]]) for i in key_map]
|
old_chunks = [bytes([old[i]]) for i in key_map]
|
||||||
new_chunks = [bytes([new[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)
|
data = replace_chunks(old_chunks, new_chunks, data,name)
|
||||||
if os.getenv('ARCH', 'x86').replace('-', '').strip() == 'arm64':
|
arch = os.getenv('ARCH') or 'x86'
|
||||||
|
arch = arch.replace('-', '')
|
||||||
|
if arch == 'arm64':
|
||||||
old_chunks = [old[i:i+4] for i in range(0, len(old), 4)]
|
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)]
|
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]
|
old_bytes = old_chunks[4] + old_chunks[5] + old_chunks[2] + old_chunks[0] + old_chunks[1] + old_chunks[6] + old_chunks[7]
|
||||||
|
|
@ -285,7 +287,8 @@ def patch_loader(loader_file):
|
||||||
from package import check_install_package
|
from package import check_install_package
|
||||||
check_install_package(['pyelftools'])
|
check_install_package(['pyelftools'])
|
||||||
from loader.patch_loader import patch_loader as do_patch_loader
|
from loader.patch_loader import patch_loader as do_patch_loader
|
||||||
arch = os.getenv('ARCH', 'x86').replace('-', '').strip()
|
arch = os.getenv('ARCH') or 'x86'
|
||||||
|
arch = arch.replace('-', '')
|
||||||
do_patch_loader(loader_file,loader_file,arch)
|
do_patch_loader(loader_file,loader_file,arch)
|
||||||
except ImportError as e:
|
except ImportError as e:
|
||||||
print(e)
|
print(e)
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue