mirror of
https://github.com/elseif/MikroTikPatch.git
synced 2026-08-26 10:05:50 +00:00
Compare commits
89 Commits
7.19.1-arm
...
7.20beta7
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8f15749897 | ||
|
|
9712d7d464 | ||
|
|
7bebf605a0 | ||
|
|
f018e0de99 | ||
|
|
7ef69a1e31 | ||
|
|
1ba7057fc7 | ||
|
|
8a52ef8df4 | ||
|
|
7292ad7a80 | ||
|
|
88de7162b7 | ||
|
|
f3497a9a4b | ||
|
|
702efdb828 | ||
|
|
a2038ece24 | ||
|
|
0b3fd16ba7 | ||
|
|
8367df6ef0 | ||
|
|
2b9db1436c | ||
|
|
6dccdda7bb | ||
|
|
1d0b4f9563 | ||
|
|
ce13b4b959 | ||
|
|
3f98072f2d | ||
|
|
ceb85aaf72 | ||
|
|
ad132d5a8d | ||
|
|
0e6364e06a | ||
|
|
c7f31476e7 | ||
|
|
674370280d | ||
|
|
9a7ea04b45 | ||
|
|
4965f266db | ||
|
|
6c33b4c2c9 | ||
|
|
5729c4746a | ||
|
|
0e89b026b8 | ||
|
|
88925b0057 | ||
|
|
18f7b4cf36 | ||
|
|
77b0644c95 | ||
|
|
e72436306b | ||
|
|
d32177f1e7 | ||
|
|
2ad3d69a4d | ||
|
|
70819de5a4 | ||
|
|
f22db63a10 | ||
|
|
178ffcbadb | ||
|
|
70bca68232 | ||
|
|
4cdd6d5619 | ||
|
|
af97ad2a07 | ||
|
|
fd50885bf4 | ||
|
|
2551551828 | ||
|
|
d8f092eb80 | ||
|
|
fe68e753c6 | ||
|
|
9ca203dcad | ||
|
|
939e01725c | ||
|
|
1935f35864 | ||
|
|
676f0e0f82 | ||
|
|
b50ba21932 | ||
|
|
78f63469c9 | ||
|
|
511392906b | ||
|
|
2d2ca3e493 | ||
|
|
3f988f27ed | ||
|
|
8a2b8f629c | ||
|
|
2ce0f85f8a | ||
|
|
a07fe281f1 | ||
|
|
70321348ad | ||
|
|
6b1d9a4a62 | ||
|
|
9f5f72bb03 | ||
|
|
173dfd69e3 | ||
|
|
f0698d8814 | ||
|
|
db75ad1711 | ||
|
|
f54f9f15b6 | ||
|
|
17b37b7124 | ||
|
|
48ce77cf80 | ||
|
|
202dab0201 | ||
|
|
ef13a0cf68 | ||
|
|
cc05886c0a | ||
|
|
018f060462 | ||
|
|
fcd6926272 | ||
|
|
6cd71c9efe | ||
|
|
a350e2badd | ||
|
|
9bad9f06f1 | ||
|
|
a5db54eca5 | ||
|
|
dedfe06698 | ||
|
|
cdae26e673 | ||
|
|
33cd5313f0 | ||
|
|
2b0548ba76 | ||
|
|
4a9d5672c1 | ||
|
|
23dd4c7f43 | ||
|
|
80bda12745 | ||
|
|
954fcfdbe3 | ||
|
|
78516e3695 | ||
|
|
e43686eca2 | ||
|
|
3f3bd3978b | ||
|
|
d6c9e7c528 | ||
|
|
476691ac29 | ||
|
|
8e3ff90b2d |
8
.github/workflows/mikrotik_patch_6.yml
vendored
8
.github/workflows/mikrotik_patch_6.yml
vendored
@@ -184,8 +184,8 @@ jobs:
|
||||
sudo -E python3 npk.py sign $file $file
|
||||
done
|
||||
sudo cp system-$LATEST_VERSION.npk ./new_iso/
|
||||
sudo -E python3 npk.py create ./new_iso/gps-$LATEST_VERSION.npk ./option-$LATEST_VERSION.npk option ./option.sfs -desc="busybox"
|
||||
sudo cp option-$LATEST_VERSION.npk ./new_iso/
|
||||
#sudo -E python3 npk.py create ./new_iso/gps-$LATEST_VERSION.npk ./option-$LATEST_VERSION.npk option ./option.sfs -desc="busybox"
|
||||
#sudo cp option-$LATEST_VERSION.npk ./new_iso/
|
||||
sudo mkisofs -o mikrotik-$LATEST_VERSION.iso \
|
||||
-V "MikroTik $LATEST_VERSION" \
|
||||
-sysid "" -preparer "MiKroTiK" \
|
||||
@@ -269,8 +269,8 @@ jobs:
|
||||
sudo cp -f routeros-x86-$LATEST_VERSION.npk ./chr/var/pdb/routeros-x86/image
|
||||
sudo cp routeros-x86-$LATEST_VERSION.npk ./all_packages/routeros-x86-$LATEST_VERSION.npk
|
||||
fi
|
||||
sudo mkdir -p ./chr/var/pdb/option
|
||||
sudo cp ./all_packages/option-$LATEST_VERSION.npk ./chr/var/pdb/option/image
|
||||
#sudo mkdir -p ./chr/var/pdb/option
|
||||
#sudo cp ./all_packages/option-$LATEST_VERSION.npk ./chr/var/pdb/option/image
|
||||
sudo umount ./chr
|
||||
sudo qemu-nbd -d /dev/nbd0
|
||||
sudo rm -rf ./chr
|
||||
|
||||
441
.github/workflows/mikrotik_patch_7.yml
vendored
441
.github/workflows/mikrotik_patch_7.yml
vendored
@@ -2,18 +2,19 @@ name: Patch Mikrotik RouterOS 7.x
|
||||
on:
|
||||
# push:
|
||||
# branches: [ "main" ]
|
||||
# schedule:
|
||||
# - cron: "0 0 * * *"
|
||||
schedule:
|
||||
- cron: "0 0 * * *" # At UTC 00:00 on every day
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
arch:
|
||||
description: 'Architecture (x86, arm64)'
|
||||
description: 'Architecture (x86, arm64, arm)'
|
||||
required: true
|
||||
default: 'x86'
|
||||
type: choice
|
||||
options:
|
||||
- x86
|
||||
- arm64
|
||||
- arm
|
||||
channel:
|
||||
description: 'Channel (stable, testing)'
|
||||
required: true
|
||||
@@ -23,15 +24,21 @@ on:
|
||||
- stable
|
||||
- testing
|
||||
version:
|
||||
description: "Version ('', 7.17, 7.17.1, 7.17.2,...)"
|
||||
description: "Specify version (e.g., 7.19.2), empty for latest"
|
||||
required: false
|
||||
default: ''
|
||||
type: string
|
||||
buildtime:
|
||||
description: "Build Time"
|
||||
description: "Custom build time, leave empty for now"
|
||||
required: false
|
||||
default: ''
|
||||
type: string
|
||||
release:
|
||||
description: "Release to GitHub & Upload "
|
||||
required: false
|
||||
default: false
|
||||
type: boolean
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
|
||||
@@ -54,32 +61,51 @@ env:
|
||||
CUSTOM_CLOUD_URL: ${{ secrets.CUSTOM_CLOUD_URL }}
|
||||
|
||||
jobs:
|
||||
Set_BuildTime:
|
||||
Set_Variables:
|
||||
runs-on: ubuntu-22.04
|
||||
outputs:
|
||||
BUILD_TIME: ${{ steps.set_buildtime.outputs.BUILD_TIME }}
|
||||
BUILD_TIME: ${{ steps.set_vars.outputs.BUILD_TIME }}
|
||||
RELEASE: ${{ steps.set_vars.outputs.RELEASE }}
|
||||
MATRIX_JSON: ${{ steps.set_vars.outputs.MATRIX_JSON }}
|
||||
steps:
|
||||
- name: Set build time
|
||||
id: set_buildtime
|
||||
- name: Set variables
|
||||
id: set_vars
|
||||
run: |
|
||||
_BUILD_TIME=${{ github.event.inputs.buildtime }}
|
||||
if [ -z "$_BUILD_TIME" ]; then
|
||||
echo "BUILD_TIME=$(date +'%s')" >> $GITHUB_OUTPUT
|
||||
if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
|
||||
BUILD_TIME="${{ github.event.inputs.buildtime }}"
|
||||
RELEASE="${{ github.event.inputs.release }}"
|
||||
if [ -z "$BUILD_TIME" ]; then
|
||||
BUILD_TIME=$(date +'%s')
|
||||
fi
|
||||
if [ -z "$RELEASE" ]; then
|
||||
RELEASE=false
|
||||
fi
|
||||
ARCH="${{ github.event.inputs.arch }}"
|
||||
CHANNEL="${{ github.event.inputs.channel }}"
|
||||
MATRIX_JSON=$(jq -nc --arg arch "$ARCH" --arg channel "$CHANNEL" '[{arch: $arch, channel: $channel}]')
|
||||
else
|
||||
echo "BUILD_TIME=$_BUILD_TIME" >> $GITHUB_OUTPUT
|
||||
BUILD_TIME=$(date +'%s')
|
||||
RELEASE=true
|
||||
MATRIX_JSON='[{"arch":"x86","channel":"stable"},{"arch":"arm64","channel":"stable"},{"arch":"arm","channel":"stable"},{"arch":"x86","channel":"testing"},{"arch":"arm64","channel":"testing"},{"arch":"arm","channel":"testing"}]'
|
||||
MATRIX_JSON='[{"arch":"x86","channel":"stable"},{"arch":"arm64","channel":"stable"},{"arch":"x86","channel":"testing"},{"arch":"arm64","channel":"testing"}]'
|
||||
fi
|
||||
echo "BUILD_TIME=$BUILD_TIME" >> $GITHUB_OUTPUT
|
||||
echo "RELEASE=$RELEASE" >> $GITHUB_OUTPUT
|
||||
echo "MATRIX_JSON=$MATRIX_JSON" >> $GITHUB_OUTPUT
|
||||
echo "BUILD_TIME: $BUILD_TIME"
|
||||
echo "RELEASE: $RELEASE"
|
||||
echo "MATRIX_JSON: $MATRIX_JSON"
|
||||
|
||||
Patch_RouterOS:
|
||||
needs: Set_BuildTime
|
||||
needs: Set_Variables
|
||||
runs-on: ubuntu-22.04
|
||||
strategy:
|
||||
matrix:
|
||||
arch: ${{ fromJSON(format('["{0}"]', github.event.inputs.arch || 'x86')) }}
|
||||
channel: ${{ fromJSON(format('["{0}"]', github.event.inputs.channel || 'stable')) }}
|
||||
matrix:
|
||||
include: ${{ fromJSON(needs.Set_Variables.outputs.MATRIX_JSON) }}
|
||||
env:
|
||||
TZ: 'Asia/Shanghai'
|
||||
LATEST_VERSION: ""
|
||||
ARCH: ""
|
||||
BUILD_TIME: ${{ needs.Set_Variables.outputs.BUILD_TIME }}
|
||||
RELEASE: ${{ needs.Set_Variables.outputs.RELEASE }}
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v4
|
||||
@@ -93,8 +119,14 @@ jobs:
|
||||
id: get_latest
|
||||
run: |
|
||||
echo $(uname -a)
|
||||
LATEST_VERSION=${{ github.event.inputs.version }}
|
||||
if [ -z "$_LATEST_VERSION" ]; then
|
||||
echo Build Time:$BUILD_TIME
|
||||
if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
|
||||
if [ -n "${{ github.event.inputs.version }}" ]; then
|
||||
LATEST_VERSION="${{ github.event.inputs.version }}"
|
||||
else
|
||||
LATEST_VERSION=$(wget -nv -O - https://${{ env.MIKRO_UPGRADE_URL }}/routeros/NEWESTa7.${{ matrix.channel }} | cut -d ' ' -f1)
|
||||
fi
|
||||
else
|
||||
LATEST_VERSION=$(wget -nv -O - https://${{ env.MIKRO_UPGRADE_URL }}/routeros/NEWESTa7.${{ matrix.channel }} | cut -d ' ' -f1)
|
||||
fi
|
||||
echo Latest Version:$LATEST_VERSION
|
||||
@@ -107,38 +139,25 @@ jobs:
|
||||
fi
|
||||
fi
|
||||
echo "has_new_version=true" >> $GITHUB_OUTPUT
|
||||
BUILD_TIME=${{ needs.Set_BuildTime.outputs.BUILD_TIME }}
|
||||
echo Build Time:$BUILD_TIME
|
||||
wget -nv -O CHANGELOG https://${{ env.MIKRO_UPGRADE_URL }}/routeros/$LATEST_VERSION/CHANGELOG
|
||||
cat CHANGELOG
|
||||
if [[ "${{ matrix.arch }}" == "arm64" ]]; then
|
||||
echo "ARCH=-arm64" >> $GITHUB_ENV
|
||||
elif [[ "${{ matrix.arch }}" == "arm" ]]; then
|
||||
echo "ARCH=-arm" >> $GITHUB_ENV
|
||||
else
|
||||
echo "ARCH=" >> $GITHUB_ENV
|
||||
fi
|
||||
echo "LATEST_VERSION=${LATEST_VERSION}" >> $GITHUB_ENV
|
||||
echo "BUILD_TIME=${BUILD_TIME}" >> $GITHUB_ENV
|
||||
if [ "${{ matrix.arch }}" == "x86" ]; then
|
||||
ARCH=''
|
||||
echo "ARCH=$ARCH" >> $GITHUB_ENV
|
||||
elif [ "${{ matrix.arch }}" == "arm64" ]; then
|
||||
ARCH='-arm64'
|
||||
echo "ARCH=$ARCH" >> $GITHUB_ENV
|
||||
fi
|
||||
has_patched_npk=false
|
||||
if wget -nv --spider https://${{ env.CUSTOM_UPGRADE_URL }}/routeros/$LATEST_VERSION/routeros-$LATEST_VERSION$ARCH.npk; then
|
||||
echo "RouterOS NPK file exists, attempting to download..."
|
||||
if wget -nv -O routeros-$LATEST_VERSION$ARCH.npk https://${{ env.CUSTOM_UPGRADE_URL }}/routeros/$LATEST_VERSION/routeros-$LATEST_VERSION$ARCH.npk; then
|
||||
echo "RouterOS NPK file downloaded successfully."
|
||||
has_patched_npk=true
|
||||
fi
|
||||
fi
|
||||
echo "has_patched_npk=$has_patched_npk" >> $GITHUB_OUTPUT
|
||||
|
||||
echo "{\"arch\": \"${{ matrix.arch }}\", \"channel\": \"${{ matrix.channel }}\", \"latest_version\": \"$LATEST_VERSION\",\"build_time\": \"$BUILD_TIME\",\"patched\": \"$has_patched_npk\"}" > latest_version_${{ matrix.arch }}_${{ matrix.channel }}.json
|
||||
sudo apt-get update > /dev/null
|
||||
|
||||
- name: Upload artifacts
|
||||
- name: Get loader patch files
|
||||
if: steps.get_latest.outputs.has_new_version == 'true'
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: latest_version_${{ matrix.arch }}_${{ matrix.channel }}
|
||||
path: latest_version_${{ matrix.arch }}_${{ matrix.channel }}.json
|
||||
run: |
|
||||
wget -nv -O loader.7z https://${{ env.CUSTOM_UPGRADE_URL }}/routeros/loader.7z
|
||||
sudo apt-get install -y p7zip-full > /dev/null
|
||||
7z x -p"${{ secrets.LOADER_7Z_PASSWORD }}" loader.7z >> /dev/null
|
||||
rm loader.7z
|
||||
|
||||
- name: Cache Squashfs
|
||||
if: steps.get_latest.outputs.has_new_version == 'true'
|
||||
@@ -164,6 +183,14 @@ jobs:
|
||||
sudo chmod +x ./option-root/bin/busybox
|
||||
sudo cp keygen/keygen_aarch64 ./option-root/bin/keygen
|
||||
sudo chmod +x ./option-root/bin/keygen
|
||||
elif [ "${{ matrix.arch }}" == "arm" ]; then
|
||||
sudo cp busybox/busybox_arm ./option-root/bin/busybox
|
||||
sudo chmod +x ./option-root/bin/busybox
|
||||
sudo cp keygen/keygen_arm ./option-root/bin/keygen
|
||||
sudo chmod +x ./option-root/bin/keygen
|
||||
else
|
||||
echo "Unsupported architecture: ${{ matrix.arch }}"
|
||||
exit 1
|
||||
fi
|
||||
sudo chmod +x ./busybox/busybox_x86
|
||||
COMMANDS=$(./busybox/busybox_x86 --list)
|
||||
@@ -173,9 +200,11 @@ jobs:
|
||||
sudo mksquashfs option-root option.sfs -quiet -comp xz -no-xattrs -b 256k
|
||||
sudo rm -rf option-root
|
||||
if [ "${{ matrix.arch }}" == "x86" ]; then
|
||||
sudo wget -O cpython.tar.gz -nv https://github.com/indygreg/python-build-standalone/releases/download/20241016/cpython-3.11.10+20241016-x86_64-unknown-linux-musl-install_only_stripped.tar.gz
|
||||
sudo wget -O cpython.tar.gz -nv https://github.com/indygreg/python-build-standalone/releases/download/20250708/cpython-3.11.13+20250708-x86_64-unknown-linux-musl-install_only_stripped.tar.gz
|
||||
elif [ "${{ matrix.arch }}" == "arm64" ]; then
|
||||
sudo wget -O cpython.tar.gz -nv https://github.com/indygreg/python-build-standalone/releases/download/20241016/cpython-3.11.10+20241016-aarch64-unknown-linux-gnu-install_only_stripped.tar.gz
|
||||
sudo wget -O cpython.tar.gz -nv https://github.com/indygreg/python-build-standalone/releases/download/20250708/cpython-3.11.13+20250708-aarch64-unknown-linux-gnu-install_only_stripped.tar.gz
|
||||
elif [ "${{ matrix.arch }}" == "arm" ]; then
|
||||
sudo wget -O cpython.tar.gz -nv https://github.com/indygreg/python-build-standalone/releases/download/20250708/cpython-3.11.13+20250708-armv7-unknown-linux-gnueabi-install_only_stripped.tar.gz
|
||||
fi
|
||||
sudo tar -xf cpython.tar.gz
|
||||
sudo rm cpython.tar.gz
|
||||
@@ -184,64 +213,33 @@ jobs:
|
||||
sudo mksquashfs python python3.sfs -quiet -comp xz -no-xattrs -b 256k
|
||||
sudo rm -rf ./python
|
||||
|
||||
- name: Cache NetInstall ${{ env.LATEST_VERSION }}
|
||||
if: steps.get_latest.outputs.has_new_version == 'true' && matrix.arch == 'x86' && steps.get_latest.outputs.has_patched_npk == 'true'
|
||||
id: cache-netinstall
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: |
|
||||
netinstall.zip
|
||||
netinstall.tar.gz
|
||||
key: netinstall-${{ env.LATEST_VERSION }}
|
||||
|
||||
- name: Get netinstall ${{ env.LATEST_VERSION }}
|
||||
if: steps.get_latest.outputs.has_new_version == 'true' && matrix.arch == 'x86' && steps.cache-netinstall.outputs.cache-hit != 'true' && steps.get_latest.outputs.has_patched_npk == 'true'
|
||||
run: |
|
||||
sudo wget -nv -O netinstall.zip https://download.mikrotik.com/routeros/$LATEST_VERSION/netinstall-$LATEST_VERSION.zip
|
||||
sudo wget -nv -O netinstall.tar.gz https://download.mikrotik.com/routeros/$LATEST_VERSION/netinstall-$LATEST_VERSION.tar.gz
|
||||
|
||||
- name: Patch netinstall ${{ env.LATEST_VERSION }}
|
||||
if: steps.get_latest.outputs.has_new_version == 'true' && matrix.arch == 'x86' && steps.get_latest.outputs.has_patched_npk == 'true'
|
||||
run: |
|
||||
sudo unzip netinstall.zip
|
||||
sudo -E python3 patch.py netinstall netinstall.exe
|
||||
sudo zip netinstall-$LATEST_VERSION.zip ./netinstall.exe
|
||||
sudo tar -xvf netinstall.tar.gz
|
||||
sudo -E python3 patch.py netinstall netinstall-cli
|
||||
sudo tar -czvf netinstall-$LATEST_VERSION.tar.gz ./netinstall-cli
|
||||
|
||||
- name: Cache mikrotik-${{ env.LATEST_VERSION }}${{ env.ARCH }}.iso
|
||||
if: steps.get_latest.outputs.has_new_version == 'true'
|
||||
if: steps.get_latest.outputs.has_new_version == 'true' && (matrix.arch == 'x86' || matrix.arch == 'arm64')
|
||||
id: cache-mikrotik
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: |
|
||||
mikrotik.iso
|
||||
key: mikrotik-${{ env.LATEST_VERSION }}-${{ matrix.arch }}
|
||||
key: mikrotik-${{ env.LATEST_VERSION }}${{ env.ARCH }}
|
||||
|
||||
- name: Get mikrotik-${{ env.LATEST_VERSION }}${{ env.ARCH }}.iso
|
||||
if: steps.get_latest.outputs.has_new_version == 'true' && steps.cache-mikrotik.outputs.cache-hit != 'true'
|
||||
if: steps.get_latest.outputs.has_new_version == 'true' && steps.cache-mikrotik.outputs.cache-hit != 'true' && (matrix.arch == 'x86' || matrix.arch == 'arm64')
|
||||
run: |
|
||||
sudo wget -nv -O mikrotik.iso https://download.mikrotik.com/routeros/$LATEST_VERSION/mikrotik-$LATEST_VERSION$ARCH.iso
|
||||
|
||||
|
||||
- name: Patch mikrotik-${{ env.LATEST_VERSION }}${{ env.ARCH }}.iso
|
||||
if: steps.get_latest.outputs.has_new_version == 'true'
|
||||
if: steps.get_latest.outputs.has_new_version == 'true' && (matrix.arch == 'x86' || matrix.arch == 'arm64')
|
||||
run: |
|
||||
sudo apt-get install -y mkisofs xorriso > /dev/null
|
||||
sudo mkdir ./iso
|
||||
sudo mount -o loop,ro mikrotik.iso ./iso
|
||||
sudo mkdir ./new_iso
|
||||
sudo cp -r ./iso/* ./new_iso/
|
||||
sudo rsync -a ./iso/ ./new_iso/
|
||||
sudo umount ./iso
|
||||
sudo rm -rf ./iso
|
||||
if [ "${{ steps.get_latest.outputs.has_patched_npk }}" == "false" ]; then
|
||||
sudo mv ./new_iso/routeros-$LATEST_VERSION$ARCH.npk ./
|
||||
sudo -E python3 patch.py npk routeros-$LATEST_VERSION$ARCH.npk
|
||||
else
|
||||
sudo -E python3 npk.py sign routeros-$LATEST_VERSION$ARCH.npk routeros-$LATEST_VERSION$ARCH.npk
|
||||
fi
|
||||
sudo mv ./new_iso/routeros-$LATEST_VERSION$ARCH.npk ./
|
||||
sudo -E python3 patch.py npk routeros-$LATEST_VERSION$ARCH.npk
|
||||
NPK_FILES=$(find ./new_iso/*.npk)
|
||||
for file in $NPK_FILES; do
|
||||
sudo -E python3 npk.py sign $file $file
|
||||
@@ -249,7 +247,7 @@ jobs:
|
||||
sudo cp -f routeros-$LATEST_VERSION$ARCH.npk ./new_iso/
|
||||
sudo -E python3 npk.py create ./new_iso/gps-$LATEST_VERSION$ARCH.npk ./option-$LATEST_VERSION$ARCH.npk option ./option.sfs -desc="busybox"
|
||||
sudo cp option-$LATEST_VERSION$ARCH.npk ./new_iso/
|
||||
sudo -E python3 npk.py create ./new_iso/gps-$LATEST_VERSION$ARCH.npk ./python3-$LATEST_VERSION$ARCH.npk python3 ./python3.sfs -desc="python 3.11.9"
|
||||
sudo -E python3 npk.py create ./new_iso/gps-$LATEST_VERSION$ARCH.npk ./python3-$LATEST_VERSION$ARCH.npk python3 ./python3.sfs -desc="python 3.11.13"
|
||||
sudo cp python3-$LATEST_VERSION$ARCH.npk ./new_iso/
|
||||
sudo mkdir ./efiboot
|
||||
sudo mount -o loop ./new_iso/efiboot.img ./efiboot
|
||||
@@ -294,67 +292,17 @@ jobs:
|
||||
sudo zip ../all_packages-${{ matrix.arch }}-$LATEST_VERSION.zip *.npk
|
||||
cd ..
|
||||
|
||||
- name: Cache refind
|
||||
if: steps.get_latest.outputs.has_new_version == 'true' && matrix.arch == 'x86' && steps.get_latest.outputs.has_patched_npk == 'true'
|
||||
id: cache-refind
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: refind-bin-0.14.2.zip
|
||||
key: refind
|
||||
|
||||
- name: Get refind
|
||||
if: steps.get_latest.outputs.has_new_version == 'true' && matrix.arch == 'x86' && steps.cache-refind.outputs.cache-hit != 'true' && steps.get_latest.outputs.has_patched_npk == 'true'
|
||||
run: sudo wget -nv -O refind-bin-0.14.2.zip https://nchc.dl.sourceforge.net/project/refind/0.14.2/refind-bin-0.14.2.zip
|
||||
|
||||
- name: Create install-image-${{ env.LATEST_VERSION }}.img
|
||||
if: steps.get_latest.outputs.has_new_version == 'true' && matrix.arch == 'x86' && steps.get_latest.outputs.has_patched_npk == 'true'
|
||||
run: |
|
||||
sudo modprobe nbd
|
||||
sudo apt-get install -y qemu-utils extlinux > /dev/null
|
||||
truncate --size 128M install-image-$LATEST_VERSION.img
|
||||
sudo qemu-nbd -c /dev/nbd0 -f raw install-image-$LATEST_VERSION.img
|
||||
sudo mkfs.vfat -n "Install" /dev/nbd0
|
||||
sudo mkdir ./install
|
||||
sudo mount /dev/nbd0 ./install
|
||||
sudo mkdir -p ./install/EFI/BOOT
|
||||
sudo unzip refind-bin-0.14.2.zip refind-bin-0.14.2/refind/refind_x64.efi
|
||||
sudo cp refind-bin-0.14.2/refind/refind_x64.efi ./install/EFI/BOOT/BOOTX64.EFI
|
||||
sudo rm -rf refind-bin-0.14.2
|
||||
echo -e 'timeout 0\ntextonly\ntextmode 0\nshowtools shutdown, reboot, exit\nmenuentry "Install RouterOS" {\n\tloader /linux\n\toptions "load_ramdisk=1 root=/dev/ram0 -install -hdd"\n}\ndefault_selection /EFI/BOOT/BOOTX64.EFI' \
|
||||
> refind.conf
|
||||
sudo cp refind.conf ./install/EFI/BOOT/
|
||||
sudo rm refind.conf
|
||||
sudo extlinux --install -H 64 -S 32 ./install/
|
||||
echo -e 'default system\nLABEL system\n\tKERNEL linux\n\tAPPEND load_ramdisk=1 -install -hdd' \
|
||||
> syslinux.cfg
|
||||
sudo cp syslinux.cfg ./install/
|
||||
sudo rm syslinux.cfg
|
||||
sudo cp ./BOOTX64.EFI ./install/linux
|
||||
NPK_FILES=($(find ./all_packages/*.npk))
|
||||
for ((i=1; i<=${#NPK_FILES[@]}; i++))
|
||||
do
|
||||
echo "${NPK_FILES[$i-1]}=>$i.npk"
|
||||
sudo cp ${NPK_FILES[$i-1]} ./install/$i.npk
|
||||
done
|
||||
sudo touch ./install/CHOOSE
|
||||
sudo touch ./install/autorun.scr
|
||||
sudo umount /dev/nbd0
|
||||
sudo qemu-nbd -d /dev/nbd0
|
||||
sudo rm -rf ./install
|
||||
sudo zip install-image-$LATEST_VERSION.zip ./install-image-$LATEST_VERSION.img
|
||||
sudo rm ./install-image-$LATEST_VERSION.img
|
||||
|
||||
- name: Cache chr-${{ env.LATEST_VERSION }}${{ env.ARCH }}.img.zip
|
||||
if: steps.get_latest.outputs.has_new_version == 'true' && steps.get_latest.outputs.has_patched_npk == 'true'
|
||||
if: steps.get_latest.outputs.has_new_version == 'true' && (matrix.arch == 'x86' || matrix.arch == 'arm64')
|
||||
id: cache-chr-img
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: |
|
||||
chr.img
|
||||
key: chr-${{ env.LATEST_VERSION }}-${{ matrix.arch }}.img
|
||||
key: chr-${{ env.LATEST_VERSION }}${{ env.ARCH }}.img
|
||||
|
||||
- name: Get chr-${{ env.LATEST_VERSION }}${{ env.ARCH }}.img
|
||||
if: steps.get_latest.outputs.has_new_version == 'true' && steps.cache-chr-img.outputs.cache-hit != 'true' && steps.get_latest.outputs.has_patched_npk == 'true'
|
||||
if: steps.get_latest.outputs.has_new_version == 'true' && steps.cache-chr-img.outputs.cache-hit != 'true' && (matrix.arch == 'x86' || matrix.arch == 'arm64')
|
||||
run: |
|
||||
sudo wget -nv -O chr.img.zip https://download.mikrotik.com/routeros/$LATEST_VERSION/chr-$LATEST_VERSION$ARCH.img.zip
|
||||
sudo unzip chr.img.zip
|
||||
@@ -362,7 +310,7 @@ jobs:
|
||||
sudo mv chr-$LATEST_VERSION$ARCH.img chr.img
|
||||
|
||||
- name: Create chr-${{ env.LATEST_VERSION }}${{ env.ARCH }}.img
|
||||
if: steps.get_latest.outputs.has_new_version == 'true' && steps.get_latest.outputs.has_patched_npk == 'true'
|
||||
if: steps.get_latest.outputs.has_new_version == 'true' && (matrix.arch == 'x86' || matrix.arch == 'arm64')
|
||||
run: |
|
||||
sudo modprobe nbd
|
||||
sudo apt-get install -y qemu-utils > /dev/null
|
||||
@@ -378,7 +326,7 @@ jobs:
|
||||
--new=1::+32M --typecode=1:8300 --change-name=1:"RouterOS Boot" --attributes=1:set:2 \
|
||||
--new=2::-0 --typecode=2:8300 --change-name=2:"RouterOS" \
|
||||
chr-$LATEST_VERSION$ARCH.img
|
||||
dd if=mbr.bin of=chr-$LATEST_VERSION$ARCH.img bs=1 count=446 conv=notrunc
|
||||
dd if=chr.img of=chr-$LATEST_VERSION$ARCH.img bs=1 count=446 conv=notrunc
|
||||
dd if=pt.bin of=chr-$LATEST_VERSION$ARCH.img bs=1 count=66 seek=446 conv=notrunc
|
||||
sudo qemu-nbd -c /dev/nbd0 -f raw chr-$LATEST_VERSION$ARCH.img
|
||||
sudo mkfs.vfat -n "Boot" /dev/nbd0p1
|
||||
@@ -463,40 +411,172 @@ jobs:
|
||||
sudo rm chr-$LATEST_VERSION$ARCH.vhdx
|
||||
sudo rm chr-$LATEST_VERSION$ARCH.vdi
|
||||
sudo rm chr-$LATEST_VERSION$ARCH.img
|
||||
|
||||
- name: Cache all_packages${{ env.ARCH }}-${{ env.LATEST_VERSION }}.zip
|
||||
if: steps.get_latest.outputs.has_new_version == 'true' && matrix.arch != 'x86' && matrix.arch != 'arm64'
|
||||
id: cache-all-packages
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: all_packages.zip
|
||||
key: all_packages${{ env.ARCH }}-${{ env.LATEST_VERSION }}.zip
|
||||
|
||||
- name: Get all_packages{{ env.ARCH }}-${{ env.LATEST_VERSION }}.zip
|
||||
if: steps.get_latest.outputs.has_new_version == 'true' && steps.cache-all-packages.outputs.cache-hit != 'true' && matrix.arch != 'x86' && matrix.arch != 'arm64'
|
||||
run: |
|
||||
sudo wget -nv -O all_packages.zip https://download.mikrotik.com/routeros/$LATEST_VERSION/all_packages-${{ matrix.arch }}-$LATEST_VERSION.zip
|
||||
|
||||
- name: Cache Main package routeros-${{ env.LATEST_VERSION }}${{ env.ARCH }}.npk
|
||||
if: steps.get_latest.outputs.has_new_version == 'true' && matrix.arch != 'x86' && matrix.arch != 'arm64'
|
||||
id: cache-main-package
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: routeros.npk
|
||||
key: routeros-${{ env.LATEST_VERSION }}${{ env.ARCH }}.npk
|
||||
|
||||
- name: Get Main package routeros-${{ env.LATEST_VERSION }}${{ env.ARCH }}.npk
|
||||
if: steps.get_latest.outputs.has_new_version == 'true' && steps.cache-main-package.outputs.cache-hit != 'true' && matrix.arch != 'x86' && matrix.arch != 'arm64'
|
||||
run: |
|
||||
sudo wget -nv -O routeros.npk https://download.mikrotik.com/routeros/$LATEST_VERSION/routeros-$LATEST_VERSION$ARCH.npk
|
||||
|
||||
- name: Patch all_packages{{ env.ARCH }}-${{ env.LATEST_VERSION }}.zip
|
||||
if: steps.get_latest.outputs.has_new_version == 'true' && matrix.arch != 'x86' && matrix.arch != 'arm64'
|
||||
run: |
|
||||
sudo unzip all_packages.zip -d ./all_packages
|
||||
sudo cp routeros.npk routeros-$LATEST_VERSION$ARCH.npk
|
||||
sudo -E python3 patch.py npk routeros-$LATEST_VERSION$ARCH.npk
|
||||
NPK_FILES=$(find ./all_packages/*.npk)
|
||||
for file in $NPK_FILES; do
|
||||
sudo -E python3 npk.py sign $file $file
|
||||
done
|
||||
sudo cp -f routeros-$LATEST_VERSION$ARCH.npk ./all_packages/routeros-$LATEST_VERSION$ARCH.npk
|
||||
sudo -E python3 npk.py create ./all_packages/gps-$LATEST_VERSION$ARCH.npk ./all_packages/option-$LATEST_VERSION$ARCH.npk option ./option.sfs -desc="busybox"
|
||||
sudo -E python3 npk.py create ./all_packages/gps-$LATEST_VERSION$ARCH.npk ./all_packages/python3-$LATEST_VERSION$ARCH.npk python3 ./python3.sfs -desc="python 3.11.13"
|
||||
cd ./all_packages
|
||||
sudo zip ../all_packages-${{ matrix.arch }}-$LATEST_VERSION.zip *.npk
|
||||
cd ..
|
||||
|
||||
- name: Cache refind
|
||||
if: steps.get_latest.outputs.has_new_version == 'true' && matrix.arch == 'x86' && env.RELEASE == 'true'
|
||||
id: cache-refind
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: refind-bin-0.14.2.zip
|
||||
key: refind
|
||||
|
||||
- name: Get refind
|
||||
if: steps.get_latest.outputs.has_new_version == 'true' && matrix.arch == 'x86' && steps.cache-refind.outputs.cache-hit != 'true' && env.RELEASE == 'true'
|
||||
run: sudo wget -nv -O refind-bin-0.14.2.zip https://nchc.dl.sourceforge.net/project/refind/0.14.2/refind-bin-0.14.2.zip
|
||||
|
||||
- name: Create install-image-${{ env.LATEST_VERSION }}${{ env.ARCH }}.img
|
||||
if: steps.get_latest.outputs.has_new_version == 'true' && matrix.arch == 'x86' && env.RELEASE == 'true'
|
||||
run: |
|
||||
sudo modprobe nbd
|
||||
sudo apt-get install -y qemu-utils extlinux > /dev/null
|
||||
truncate --size 128M install-image-$LATEST_VERSION.img
|
||||
sudo qemu-nbd -c /dev/nbd0 -f raw install-image-$LATEST_VERSION.img
|
||||
sudo mkfs.vfat -n "Install" /dev/nbd0
|
||||
sudo mkdir ./install
|
||||
sudo mount /dev/nbd0 ./install
|
||||
sudo mkdir -p ./install/EFI/BOOT
|
||||
sudo unzip refind-bin-0.14.2.zip refind-bin-0.14.2/refind/refind_x64.efi
|
||||
sudo cp refind-bin-0.14.2/refind/refind_x64.efi ./install/EFI/BOOT/BOOTX64.EFI
|
||||
sudo rm -rf refind-bin-0.14.2
|
||||
echo -e 'timeout 0\ntextonly\ntextmode 0\nshowtools shutdown, reboot, exit\nmenuentry "Install RouterOS" {\n\tloader /linux\n\toptions "load_ramdisk=1 root=/dev/ram0 -install -hdd"\n}\ndefault_selection /EFI/BOOT/BOOTX64.EFI' \
|
||||
> refind.conf
|
||||
sudo cp refind.conf ./install/EFI/BOOT/
|
||||
sudo rm refind.conf
|
||||
sudo extlinux --install -H 64 -S 32 ./install/
|
||||
echo -e 'default system\nLABEL system\n\tKERNEL linux\n\tAPPEND load_ramdisk=1 -install -hdd' \
|
||||
> syslinux.cfg
|
||||
sudo cp syslinux.cfg ./install/
|
||||
sudo rm syslinux.cfg
|
||||
sudo cp ./BOOTX64.EFI ./install/linux
|
||||
NPK_FILES=($(find ./all_packages/*.npk))
|
||||
for ((i=1; i<=${#NPK_FILES[@]}; i++))
|
||||
do
|
||||
echo "${NPK_FILES[$i-1]}=>$i.npk"
|
||||
sudo cp ${NPK_FILES[$i-1]} ./install/$i.npk
|
||||
done
|
||||
sudo touch ./install/CHOOSE
|
||||
sudo touch ./install/autorun.scr
|
||||
sudo umount /dev/nbd0
|
||||
sudo qemu-nbd -d /dev/nbd0
|
||||
sudo rm -rf ./install
|
||||
sudo zip install-image-$LATEST_VERSION.zip ./install-image-$LATEST_VERSION.img
|
||||
sudo rm ./install-image-$LATEST_VERSION.img
|
||||
|
||||
|
||||
- name: Cache NetInstall ${{ env.LATEST_VERSION }}${{ env.ARCH }}
|
||||
if: steps.get_latest.outputs.has_new_version == 'true' && matrix.arch == 'x86' && env.RELEASE == 'true'
|
||||
id: cache-netinstall
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: |
|
||||
netinstall.zip
|
||||
netinstall.tar.gz
|
||||
key: netinstall-${{ env.LATEST_VERSION }}
|
||||
|
||||
- name: Get netinstall ${{ env.LATEST_VERSION }}
|
||||
if: steps.get_latest.outputs.has_new_version == 'true' && matrix.arch == 'x86' && steps.cache-netinstall.outputs.cache-hit != 'true' && env.RELEASE == 'true'
|
||||
run: |
|
||||
sudo wget -nv -O netinstall.zip https://download.mikrotik.com/routeros/$LATEST_VERSION/netinstall-$LATEST_VERSION.zip
|
||||
sudo wget -nv -O netinstall.tar.gz https://download.mikrotik.com/routeros/$LATEST_VERSION/netinstall-$LATEST_VERSION.tar.gz
|
||||
|
||||
- name: Patch netinstall ${{ env.LATEST_VERSION }}${{ env.ARCH }}
|
||||
if: steps.get_latest.outputs.has_new_version == 'true' && matrix.arch == 'x86' && env.RELEASE == 'true'
|
||||
run: |
|
||||
sudo unzip netinstall.zip
|
||||
sudo -E python3 patch.py netinstall netinstall.exe
|
||||
sudo zip netinstall-$LATEST_VERSION.zip ./netinstall.exe
|
||||
sudo tar -xvf netinstall.tar.gz
|
||||
sudo -E python3 patch.py netinstall netinstall-cli
|
||||
sudo tar -czvf netinstall-$LATEST_VERSION.tar.gz ./netinstall-cli
|
||||
|
||||
- name: Upload Files
|
||||
if: steps.get_latest.outputs.has_new_version == 'true'
|
||||
if: steps.get_latest.outputs.has_new_version == 'true' && env.RELEASE == 'true'
|
||||
run: |
|
||||
if [ "${{ steps.get_latest.outputs.has_patched_npk }}" == "false" ]; then
|
||||
OUTDIR="$LATEST_VERSION-UNDONE"
|
||||
else
|
||||
OUTDIR="$LATEST_VERSION"
|
||||
fi
|
||||
sudo mkdir -p ./publish/$OUTDIR
|
||||
sudo cp CHANGELOG ./publish/$OUTDIR/
|
||||
sudo cp ./all_packages/*.npk ./publish/$OUTDIR/
|
||||
sudo mkdir -p ./publish/$LATEST_VERSION
|
||||
sudo cp CHANGELOG ./publish/$LATEST_VERSION/
|
||||
sudo cp ./all_packages/*.npk ./publish/$LATEST_VERSION/
|
||||
sudo chown -R root:root ./publish/
|
||||
|
||||
LOCAL_PATH=./publish/$LATEST_VERSION
|
||||
REMOTE_PATH=${{ secrets.SSH_DIRECTORY }}
|
||||
SERVER=${{ secrets.SSH_SERVER }}
|
||||
USER=${{ secrets.SSH_USERNAME }}
|
||||
PASS=${{ secrets.SSH_PASSWORD }}
|
||||
PORT=${{ secrets.SSH_PORT }}
|
||||
CHANNEL=${{ matrix.channel }}
|
||||
|
||||
sudo apt-get install -y lftp ssh sshpass > /dev/null 2>&1
|
||||
sudo -E lftp -u ${{ secrets.SSH_USERNAME }},'${{ secrets.SSH_PASSWORD }}' sftp://${{ secrets.SSH_SERVER }}:${{ secrets.SSH_PORT }} <<EOF
|
||||
|
||||
sudo -E lftp -u "$USER","$PASS" sftp://$SERVER:$PORT <<EOF
|
||||
set sftp:auto-confirm yes
|
||||
mirror --reverse --verbose --only-newer ./publish ${{ secrets.SSH_DIRECTORY }}
|
||||
mirror --reverse --verbose --only-newer ./publish "$REMOTE_PATH"
|
||||
bye
|
||||
EOF
|
||||
|
||||
|
||||
sshpass -p "$PASS" ssh -o StrictHostKeyChecking=no -p $PORT $USER@$SERVER \
|
||||
"echo $LATEST_VERSION $BUILD_TIME | tee /rw/disk/$REMOTE_PATH/NEWESTa7.$CHANNEL; bash /rw/disk/$REMOTE_PATH/packages.sh /rw/disk/$REMOTE_PATH/$LATEST_VERSION"
|
||||
|
||||
sshpass -p "$PASS" ssh -o StrictHostKeyChecking=no -p $PORT $USER@$SERVER \
|
||||
"chown -R 32768:32768 /rw/disk/$REMOTE_PATH/"
|
||||
|
||||
|
||||
|
||||
- name: Clear Cloudflare cache
|
||||
if: steps.get_latest.outputs.has_new_version == 'true'
|
||||
if: steps.get_latest.outputs.has_new_version == 'true' && env.RELEASE == 'true'
|
||||
run: |
|
||||
curl --request POST --url "https://api.cloudflare.com/client/v4/zones/fe6831ed6dc9e6235e69ef2a31f2e7fe/purge_cache" \
|
||||
--header "Authorization: Bearer 9GDQkzU51QXaqzp1qMjyFKpyeJyOdnNoG9GZQaGP" \
|
||||
--header "Content-Type:application/json" \
|
||||
--data '{"purge_everything": true}'
|
||||
|
||||
- name: Delete Release tag ${{ env.LATEST_VERSION }} ${{ matrix.arch }}
|
||||
if: steps.get_latest.outputs.has_new_version == 'true' && steps.get_latest.outputs.has_patched_npk == 'true'
|
||||
- name: Delete Release tag ${{ env.LATEST_VERSION }} ${{ env.ARCH }}
|
||||
if: steps.get_latest.outputs.has_new_version == 'true' && env.RELEASE == 'true'
|
||||
run: |
|
||||
HEADER="Authorization: token ${{ secrets.GITHUB_TOKEN }}"
|
||||
RELEASE_INFO=$(curl -s -H $HEADER https://api.github.com/repos/${{ github.repository }}/releases/tags/$LATEST_VERSION$ARCH)
|
||||
RELEASE_INFO=$(curl -s -H "$HEADER" https://api.github.com/repos/${{ github.repository }}/releases/tags/$LATEST_VERSION$ARCH)
|
||||
RELEASE_ID=$(echo $RELEASE_INFO | jq -r '.id')
|
||||
echo "Release ID: $RELEASE_ID"
|
||||
if [ "$RELEASE_ID" != "null" ]; then
|
||||
@@ -508,11 +588,11 @@ jobs:
|
||||
echo "Release not found for tag: $LATEST_VERSION)"
|
||||
fi
|
||||
|
||||
- name: Create Release tag ${{ env.LATEST_VERSION }} ${{ matrix.arch }}
|
||||
if: steps.get_latest.outputs.has_new_version == 'true' && steps.get_latest.outputs.has_patched_npk == 'true'
|
||||
- name: Create Release tag ${{ env.LATEST_VERSION }} ${{ env.ARCH }}
|
||||
if: steps.get_latest.outputs.has_new_version == 'true' && env.RELEASE == 'true'
|
||||
uses: softprops/action-gh-release@v2
|
||||
with:
|
||||
name: "RouterOS ${{ env.LATEST_VERSION }} ${{ matrix.arch }}"
|
||||
name: "RouterOS ${{ env.LATEST_VERSION }} ${{ env.ARCH }}"
|
||||
body_path: "CHANGELOG"
|
||||
tag_name: ${{ env.LATEST_VERSION }}${{ env.ARCH }}
|
||||
make_latest: ${{ matrix.channel == 'stable'}} && ${{ matrix.arch == 'x86'}}
|
||||
@@ -525,33 +605,12 @@ jobs:
|
||||
routeros-${{ env.LATEST_VERSION }}${{ env.ARCH }}.npk
|
||||
all_packages-*-${{ env.LATEST_VERSION }}.zip
|
||||
|
||||
Create_CSV:
|
||||
needs: Patch_RouterOS
|
||||
runs-on: ubuntu-22.04
|
||||
steps:
|
||||
- name: Download artifacts
|
||||
uses: actions/download-artifact@v4
|
||||
with:
|
||||
path: artifacts
|
||||
pattern: latest_version_*
|
||||
merge-multiple: true
|
||||
- name: Create Packages CSV File
|
||||
run: |
|
||||
sudo apt-get install ssh sshpass
|
||||
for file in artifacts/latest_version_*.json; do
|
||||
if [ -f "$file" ]; then
|
||||
arch=$(jq -r '.arch' "$file")
|
||||
channel=$(jq -r '.channel' "$file")
|
||||
latest_version=$(jq -r '.latest_version' "$file")
|
||||
build_time=$(jq -r '.build_time' "$file")
|
||||
has_patched_npk=$(jq -r '.patched' "$file")
|
||||
echo "Arch: $arch, Channel: $channel, Latest Version: $latest_version,Build Time: $build_time,Has Patched NPK: $has_patched_npk"
|
||||
if [ "$has_patched_npk" == "false" ]; then
|
||||
OUTDIR="$latest_version-UNDONE"
|
||||
else
|
||||
OUTDIR="$latest_version"
|
||||
sshpass -p "${{ secrets.SSH_PASSWORD }}" ssh -o StrictHostKeyChecking=no -p ${{ secrets.SSH_PORT }} ${{ secrets.SSH_USERNAME }}@${{ secrets.SSH_SERVER }} "echo $latest_version $build_time | tee /rw/disk/${{ secrets.SSH_DIRECTORY }}/NEWESTa7.$channel; /rw/disk/${{ secrets.SSH_DIRECTORY }}/packages.sh /rw/disk/${{ secrets.SSH_DIRECTORY }}/$OUTDIR"
|
||||
fi
|
||||
fi
|
||||
done
|
||||
sshpass -p "${{ secrets.SSH_PASSWORD }}" ssh -o StrictHostKeyChecking=no -p ${{ secrets.SSH_PORT }} ${{ secrets.SSH_USERNAME }}@${{ secrets.SSH_SERVER }} "chown -R 32768:32768 /rw/disk/${{ secrets.SSH_DIRECTORY }}/"
|
||||
- name: Upload Files as Artifact (No Release)
|
||||
if: steps.get_latest.outputs.has_new_version == 'true' && env.RELEASE == 'false'
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: mikrotik-${{ env.LATEST_VERSION }}${{ env.ARCH }}
|
||||
path: |
|
||||
all_packages-*-${{ env.LATEST_VERSION }}.zip
|
||||
mikrotik-${{ env.LATEST_VERSION }}${{ env.ARCH }}.iso
|
||||
chr-${{ env.LATEST_VERSION }}*.zip
|
||||
|
||||
1
.gitignore
vendored
1
.gitignore
vendored
@@ -2,4 +2,5 @@ __pycache__/
|
||||
.vscode/
|
||||
venv/
|
||||
app/
|
||||
loader/
|
||||
test_*.py
|
||||
8
CODE_OF_CONDUCT.md
Normal file
8
CODE_OF_CONDUCT.md
Normal file
@@ -0,0 +1,8 @@
|
||||
# WTF Code of Conduct (WTFCoC)
|
||||
*"Do What The Fuck You Want, But Don't Be A Dick"*
|
||||
|
||||
1. **Do whatever you want** with the code
|
||||
2. **Don't be a dick** to others
|
||||
3. **No bureaucracy** - handle problems like adults
|
||||
4. **You're on your own** - this isn't a safe space
|
||||
5. **Final rule**: If this bothers you, re-read the WTFPL license name (words 2-4)
|
||||
13
LICENSE
Normal file
13
LICENSE
Normal file
@@ -0,0 +1,13 @@
|
||||
DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
|
||||
Version 2, December 2004
|
||||
|
||||
Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
|
||||
|
||||
Everyone is permitted to copy and distribute verbatim or modified
|
||||
copies of this license document, and changing it is allowed as long
|
||||
as the name is changed.
|
||||
|
||||
DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
|
||||
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
||||
|
||||
0. You just DO WHAT THE FUCK YOU WANT TO.
|
||||
13
README.md
13
README.md
@@ -1,6 +1,8 @@
|
||||
[](https://github.com/elseif/MikroTikPatch/actions/workflows/mikrotik_patch_6.yml)
|
||||
[](https://github.com/elseif/MikroTikPatch/actions/workflows/mikrotik_patch_7.yml)
|
||||
# MikroTik RouterOS Patch [[English](README_EN.md)]
|
||||
[](./LICENSE)
|
||||
[](./CODE_OF_CONDUCT.md)
|
||||
|
||||
### [[Discord](https://discord.gg/keV6MWQFtX)] [[Telegram](https://t.me/mikrotikpatch)] [[Keygen(Telegram Bot)](https://t.me/ROS_Keygen_Bot)]
|
||||
|
||||
@@ -31,6 +33,7 @@
|
||||
## 如何使用Shell
|
||||
安装 option-{version}.npk 包
|
||||
telnet到RouterOS,用户名devel,密码与admin的密码相同
|
||||
要使用devel用户名登录必须安装option-{version}.npk包,且启用。
|
||||
## 如何授权许可
|
||||
进入shell
|
||||
运行 keygen
|
||||
@@ -44,10 +47,16 @@
|
||||
对npk文件进行解包,修改,创建,签名和验证
|
||||
### patch.py
|
||||
替换公钥并签名
|
||||
|
||||
|
||||
|
||||
## 所有的修补操作都自动运行在[Github Action](https://github.com/elseif/MikroTikPatch/blob/main/.github/workflows/)。
|
||||
|
||||
### 感谢赞助
|
||||
[ZMTO](https://console.zmto.com)
|
||||
|
||||
[](https://dartnode.com "Powered by DartNode - Free VPS for Open Source")
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
[](https://github.com/elseif/MikroTikPatch/actions/workflows/mikrotik_patch_6.yml)
|
||||
[](https://github.com/elseif/MikroTikPatch/actions/workflows/mikrotik_patch_7.yml)
|
||||
# MikroTik RouterOS Patch [[中文](README.md)]
|
||||
[](./LICENSE)
|
||||
[](./CODE_OF_CONDUCT.md)
|
||||
|
||||
### [[Discord](https://discord.gg/keV6MWQFtX)] [[Telegram](https://t.me/mikrotikpatch)] [[Keygen(Telegram Bot)](https://t.me/ROS_Keygen_Bot)]
|
||||
|
||||
@@ -40,6 +42,9 @@
|
||||
### patch.py
|
||||
Patch public key and sign NPK files
|
||||
|
||||
## Thanks for sponsoring
|
||||
[ZMTO](https://console.zmto.com/)
|
||||
|
||||
## all patches are applied automatically with [Github Action](https://github.com/elseif/MikroTikPatch/blob/main/.github/workflows/).
|
||||
|
||||
|
||||
|
||||
66
README_PT.md
Normal file
66
README_PT.md
Normal file
@@ -0,0 +1,66 @@
|
||||
[](https://github.com/elseif/MikroTikPatch/actions/workflows/mikrotik_patch_6.yml)
|
||||
[](https://github.com/elseif/MikroTikPatch/actions/workflows/mikrotik_patch_7.yml)
|
||||
|
||||
# Patch para MikroTik RouterOS [[中文](README.md)]
|
||||
[](./LICENSE)
|
||||
[](./CODE_OF_CONDUCT.md)
|
||||
|
||||
### [[Discord](https://discord.gg/keV6MWQFtX)] [[Telegram](https://t.me/mikrotikpatch)] [[Keygen (Bot do Telegram)](https://t.me/ROS_Keygen_Bot)]
|
||||
|
||||
### Baixe a [ISO modificada mais recente](https://github.com/elseif/MikroTikPatch/releases/latest), instale e aproveite.
|
||||
### A imagem CHR suporta modo de boot tanto BIOS quanto UEFI.
|
||||
|
||||
### Suporte a atualização online, licença online, backup em nuvem e DDNS em nuvem
|
||||
|
||||

|
||||

|
||||
|
||||
### Licenciar o RouterOS para x86
|
||||

|
||||
|
||||
### Renovar a licença para x86 v6.x
|
||||

|
||||
|
||||
### Renovar a licença para CHR
|
||||

|
||||
|
||||
### Licenciar o RouterOS para CHR
|
||||

|
||||
|
||||

|
||||

|
||||
|
||||
## Como usar o shell
|
||||
```bash
|
||||
instale o pacote option-{versão}.npk
|
||||
acesse via telnet o routeros com o usuário devel e a senha igual a do usuário admin
|
||||
```
|
||||
|
||||
## Como licenciar o RouterOS
|
||||
```bash
|
||||
acesse via telnet o routeros com o usuário devel e a senha igual a do admin
|
||||
execute o keygen
|
||||
modo CHR pode usar a renovação de licença online
|
||||
```
|
||||
|
||||
## Como usar o Python 3
|
||||
```bash
|
||||
instale o pacote python3-{versão}.npk
|
||||
acesse via telnet o routeros com o usuário devel e a senha igual a do admin
|
||||
execute `python -V`
|
||||
```
|
||||
|
||||
### npk.py
|
||||
```bash
|
||||
Assina, verifica, cria e extrai arquivos .npk
|
||||
```
|
||||
|
||||
### patch.py
|
||||
```bash
|
||||
Altera a chave pública e assina arquivos .npk
|
||||
```
|
||||
|
||||
## Thanks for sponsoring
|
||||
[ZMTO](https://console.zmto.com/)
|
||||
|
||||
## Todos os patches são aplicados automaticamente com [GitHub Actions](https://github.com/elseif/MikroTikPatch/blob/main/.github/workflows/)
|
||||
Binary file not shown.
BIN
busybox/busybox_arm
Normal file
BIN
busybox/busybox_arm
Normal file
Binary file not shown.
Binary file not shown.
41
chr.sh
41
chr.sh
@@ -1,26 +1,15 @@
|
||||
#!/bin/bash
|
||||
apt-get install -y gdisk extlinux
|
||||
dd if=/dev/zero of=/dev/sda bs=1 count=512 conv=notrunc
|
||||
sgdisk --clear --set-alignment=2 --new=1::+32M --typecode=1:8300 --change-name=1:"RouterOS Boot" --attributes=1:set:2 --new=2::-0 --typecode=2:8300 --change-name=2:"RouterOS" --gpttombr=1:2 /dev/sda
|
||||
dd if=/dev/sda of=/tmp/pt.bin bs=1 count=66 skip=446
|
||||
echo -e "\x80" | dd of=/tmp/pt.bin bs=1 count=1 conv=notrunc
|
||||
dd if=/dev/zero of=/dev/sda bs=1 count=512 conv=notrunc
|
||||
sgdisk --clear --set-alignment=2 --new=1::+32M --typecode=1:8300 --change-name=1:"RouterOS Boot" --attributes=1:set:2 --new=2::-0 --typecode=2:8300 --change-name=2:"RouterOS" /dev/sda
|
||||
wget -O /tmp/mbr.bin https://raw.gitmirror.com/elseif/MikroTikPatch/main/mbr.bin
|
||||
dd if=/tmp/mbr.bin of=/dev/sda bs=1 count=446 conv=notrunc
|
||||
dd if=/tmp/pt.bin of=/dev/sda bs=1 count=66 seek=446 conv=notrunc
|
||||
sync
|
||||
mkfs.vfat -n "Boot" /dev/sda1
|
||||
mkfs.ext4 -F -L "RouterOS" -m 0 /dev/sda2
|
||||
mkdir -p /tmp/{boot,routeros}
|
||||
mount -o loop,rw /dev/sda1 /tmp/boot
|
||||
mkdir -p /tmp/boot/{BOOT,EFI/BOOT}
|
||||
wget -O /tmp/boot/EFI/BOOT/BOOTX64.EFI https://hub.gitmirror.com/https://github.com/elseif/MikroTikPatch/releases/download/7.15.2/BOOTX64.EFI
|
||||
extlinux --install -H 64 -S 32 /tmp/boot/BOOT
|
||||
echo -e "default system\nlabel system\n\tkernel /EFI/BOOT/BOOTX64.EFI\n\tappend load_ramdisk=1 root=/dev/ram0 quiet" > /tmp/boot/BOOT/syslinux.cfg
|
||||
umount /tmp/boot
|
||||
mount -o loop,rw /dev/sda2 /tmp/routeros
|
||||
mkdir -p /tmp/routeros/{var/pdb/{system,option},boot,rw}
|
||||
wget -O /tmp/routeros/var/pdb/option/image https://hub.gitmirror.com/https://github.com/elseif/MikroTikPatch/releases/download/7.15.2/option-7.15.2.npk
|
||||
wget -O /tmp/routeros/var/pdb/system/image https://hub.gitmirror.com/https://github.com/elseif/MikroTikPatch/releases/download/7.15.2/routeros-7.15.2.npk
|
||||
umount /tmp/routeros
|
||||
curl -# -L https://github.com/elseif/MikroTikPatch/releases/download/7.19.3/chr-7.19.3-legacy-bios.img.zip -o /tmp/chr.img.zip && cd /tmp && \
|
||||
gunzip -c chr.img.zip > chr.img && \
|
||||
STORAGE=`lsblk | grep disk | cut -d ' ' -f 1 | head -n 1` && \
|
||||
echo STORAGE is $STORAGE && \
|
||||
ETH=`ip route show default | sed -n 's/.* dev \([^\ ]*\) .*/\1/p'` && \
|
||||
echo ETH is $ETH && \
|
||||
ADDRESS=`ip addr show $ETH | grep global | cut -d' ' -f 6 | head -n 1` && \
|
||||
echo ADDRESS is $ADDRESS && \
|
||||
GATEWAY=`ip route list | grep default | cut -d' ' -f 3` && \
|
||||
echo GATEWAY is $GATEWAY && \
|
||||
sleep 5 && \
|
||||
dd if=chr.img of=/dev/$STORAGE bs=4M oflag=sync && \
|
||||
echo "Ok, reboot" && \
|
||||
echo 1 > /proc/sys/kernel/sysrq && \
|
||||
echo b > /proc/sysrq-trigger
|
||||
|
||||
Binary file not shown.
BIN
keygen/keygen_arm
Normal file
BIN
keygen/keygen_arm
Normal file
Binary file not shown.
Binary file not shown.
2
npk.py
2
npk.py
@@ -228,7 +228,7 @@ class NovaPackage(Package):
|
||||
def sign(self,kcdsa_private_key:bytes,eddsa_private_key:bytes):
|
||||
import hashlib
|
||||
from mikro import mikro_kcdsa_sign,mikro_eddsa_sign
|
||||
build_time = os.environ['BUILD_TIME'] if 'BUILD_TIME' in os.environ else None
|
||||
build_time = os.getenv('BUILD_TIME',None)
|
||||
if len(self._packages) > 0:
|
||||
if build_time:
|
||||
self[NpkPartID.PKG_INFO].data._build_time = int(build_time)
|
||||
|
||||
56
patch.py
56
patch.py
@@ -22,8 +22,9 @@ 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 'ARCH' in os.environ and os.environ['ARCH'] == '-arm64':
|
||||
arch = os.getenv('ARCH') or 'x86'
|
||||
arch = arch.replace('-', '')
|
||||
if arch in ['arm64','arm']:
|
||||
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]
|
||||
@@ -31,9 +32,35 @@ def replace_key(old,new,data,name=''):
|
||||
if old_bytes in data:
|
||||
print(f'{name} public key patched {old[:16].hex().upper()}...')
|
||||
data = data.replace(old_bytes,new_bytes)
|
||||
old_codes = [bytes.fromhex('793583E2'),bytes.fromhex('FD3A83E2'),bytes.fromhex('193D83E2')]
|
||||
new_codes = [bytes.fromhex('FF34A0E3'),bytes.fromhex('753C83E2'),bytes.fromhex('FC3083E2')]
|
||||
old_codes = [bytes.fromhex('793583E2'),bytes.fromhex('FD3A83E2'),bytes.fromhex('193D83E2')] #0x1e400000+0xfd000+0x640
|
||||
new_codes = [bytes.fromhex('FF34A0E3'),bytes.fromhex('753C83E2'),bytes.fromhex('FC3083E2')] #0xff0075fc= 0xff000000+0x7500+0xfc
|
||||
data = replace_chunks(old_codes, new_codes, data,name)
|
||||
else:
|
||||
def conver_chunks(data:bytes):
|
||||
ret = [
|
||||
(data[2] << 16) | (data[1] << 8) | data[0] | ((data[3] << 24) & 0x03000000),
|
||||
(data[3] >> 2) | (data[4] << 6) | (data[5] << 14) | ((data[6] << 22) & 0x1C00000),
|
||||
(data[6] >> 3) | (data[7] << 5) | (data[8] << 13) | ((data[9] << 21) & 0x3E00000),
|
||||
(data[9] >> 5) | (data[10] << 3) | (data[11] << 11) | ((data[12] << 19) & 0x1F80000),
|
||||
(data[12] >> 6) | (data[13] << 2) | (data[14] << 10) | (data[15] << 18),
|
||||
data[16] | (data[17] << 8) | (data[18] << 16) | ((data[19] << 24) & 0x01000000),
|
||||
(data[19] >> 1) | (data[20] << 7) | (data[21] << 15) | ((data[22] << 23) & 0x03800000),
|
||||
(data[22] >> 3) | (data[23] << 5) | (data[24] << 13) | ((data[25] << 21) & 0x1E00000),
|
||||
(data[25] >> 4) | (data[26] << 4) | (data[27] << 12) | ((data[28] << 20) & 0x3F00000),
|
||||
(data[28] >> 6) | (data[29] << 2) | (data[30] << 10) | (data[31] << 18)
|
||||
]
|
||||
return [struct.pack('<I', x ) for x in ret]
|
||||
old_chunks = conver_chunks(old)
|
||||
new_chunks = conver_chunks(new)
|
||||
old_bytes = b''.join([v for i,v in enumerate(old_chunks) if i != 8])
|
||||
new_bytes = b''.join([v for i,v in enumerate(new_chunks) if i != 8])
|
||||
if old_bytes in data:
|
||||
print(f'{name} public key patched {old[:16].hex().upper()}...')
|
||||
data = data.replace(old_bytes,new_bytes)
|
||||
old_codes = [bytes.fromhex('713783E2'),bytes.fromhex('223A83E2'),bytes.fromhex('8D3F83E2')] #0x1C40000+0x22000+0x234
|
||||
new_codes = [bytes.fromhex('973303E3'),bytes.fromhex('DD3883E3'),bytes.fromhex('033483E3')] #0x03DD3397 = 0x3397|0x00DD0000|0x03000000
|
||||
data = replace_chunks(old_codes, new_codes, data,name)
|
||||
|
||||
return data
|
||||
|
||||
def patch_bzimage(data:bytes,key_dict:dict):
|
||||
@@ -281,13 +308,26 @@ def patch_kernel(data:bytes,key_dict):
|
||||
else:
|
||||
raise Exception('unknown kernel format')
|
||||
|
||||
def patch_loader(loader_file):
|
||||
try:
|
||||
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') or 'x86'
|
||||
arch = arch.replace('-', '')
|
||||
do_patch_loader(loader_file,loader_file,arch)
|
||||
except ImportError as e:
|
||||
print(e)
|
||||
print("loader module import failed. cannot run patch_loader.py")
|
||||
|
||||
def patch_squashfs(path,key_dict):
|
||||
for root, dirs, files in os.walk(path):
|
||||
for file in files:
|
||||
if file =='loader':
|
||||
continue
|
||||
file = os.path.join(root,file)
|
||||
for _file in files:
|
||||
file = os.path.join(root,_file)
|
||||
if os.path.isfile(file):
|
||||
if _file =='loader':
|
||||
patch_loader(file)
|
||||
continue
|
||||
data = open(file,'rb').read()
|
||||
for old_public_key,new_public_key in key_dict.items():
|
||||
_data = replace_key(old_public_key,new_public_key,data,file)
|
||||
|
||||
Reference in New Issue
Block a user