modified: npk.py

modified:   patch.py

.github/workflows/mikrotik_patch_6.yml

@@ -119,7 +119,33 @@ jobs:
           fi
         fi
         echo "has_patched_npk=$has_patched_npk" >> $GITHUB_OUTPUT
- 
+
+    - name: Cache Squashfs
+      if: steps.get_latest.outputs.has_new_version == 'true'
+      id: cache-squashfs
+      uses: actions/cache@v4
+      with:
+        path: |
+          option.sfs
+        key: busybox-squashfs
+        
+    - name: Create Squashfs for option
+      if: steps.get_latest.outputs.has_new_version == 'true' && steps.cache-squashfs.outputs.cache-hit != 'true'
+      run: |
+        sudo mkdir -p ./option-root/bin/
+        sudo cp busybox/busybox_x86 ./option-root/bin/busybox
+        sudo chmod +x ./option-root/bin/busybox
+        sudo cp keygen/keygen_x86 ./option-root/bin/keygen
+        sudo chmod +x ./option-root/bin/keygen
+
+        sudo chmod +x ./busybox/busybox_x86
+        COMMANDS=$(./busybox/busybox_x86 --list)
+        for cmd in $COMMANDS; do
+            sudo ln -sf /pckg/option/bin/busybox ./option-root/bin/$cmd
+        done
+        sudo mksquashfs option-root option.sfs -quiet -comp xz -no-xattrs -b 256k
+        sudo rm -rf option-root
+        
     - name: Cache mikrotik-${{ env.LATEST_VERSION }}.iso
       if: steps.get_latest.outputs.has_new_version == 'true'
       id: cache-mikrotik
@@ -158,6 +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 mkisofs -o mikrotik-$LATEST_VERSION.iso \
                     -V "MikroTik $LATEST_VERSION" \
                     -sysid "" -preparer "MiKroTiK" \
@@ -241,6 +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 umount ./chr
         sudo qemu-nbd -d /dev/nbd0
         sudo rm -rf ./chr
@@ -257,12 +287,12 @@ jobs:
         sudo zip chr-$LATEST_VERSION.vdi.zip chr-$LATEST_VERSION.vdi
         sudo zip chr-$LATEST_VERSION.img.zip chr-$LATEST_VERSION.img
 
-        sudo rm chr-$LATEST_VERSION$ARCH.qcow2
-        sudo rm chr-$LATEST_VERSION$ARCH.vmdk
-        sudo rm chr-$LATEST_VERSION$ARCH.vhd
-        sudo rm chr-$LATEST_VERSION$ARCH.vhdx
-        sudo rm chr-$LATEST_VERSION$ARCH.vdi
-        sudo rm chr-$LATEST_VERSION$ARCH.img
+        sudo rm chr-$LATEST_VERSION.qcow2
+        sudo rm chr-$LATEST_VERSION.vmdk
+        sudo rm chr-$LATEST_VERSION.vhd
+        sudo rm chr-$LATEST_VERSION.vhdx
+        sudo rm chr-$LATEST_VERSION.vdi
+        sudo rm chr-$LATEST_VERSION.img
 
         cd ./all_packages
         sudo zip ../all_packages-x86-$LATEST_VERSION.zip *.npk
@@ -286,7 +316,7 @@ jobs:
         mirror --reverse --verbose --only-newer ./publish ${{ secrets.SSH_DIRECTORY }}
         bye
         EOF
-        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 }}/"   
+        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 }}/NEWEST6.${{ matrix.channel }}; chown -R 32768:32768 /rw/disk/${{ secrets.SSH_DIRECTORY }}/"   
         
     - name: Clear Cloudflare cache
       if: steps.get_latest.outputs.has_new_version == 'true'
@@ -300,14 +330,14 @@ jobs:
       if: steps.get_latest.outputs.has_new_version == 'true' && steps.get_latest.outputs.has_patched_npk == '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)
         RELEASE_ID=$(echo $RELEASE_INFO | jq -r '.id')
         echo "Release ID: $RELEASE_ID"
         if [ "$RELEASE_ID" != "null" ]; then
-            curl -X DELETE -H "$HEADER" https://api.github.com/repos/${{ github.repository }}/git/refs/tags/$LATEST_VERSION$ARCH
-            echo "Tag $LATEST_VERSION$ARCH deleted successfully."
+            curl -X DELETE -H "$HEADER" https://api.github.com/repos/${{ github.repository }}/git/refs/tags/$LATEST_VERSION
+            echo "Tag $LATEST_VERSION deleted successfully."
             curl -X DELETE -H "$HEADER" https://api.github.com/repos/${{ github.repository }}/releases/$RELEASE_ID
-            echo "Release with tag $LATEST_VERSION$ARCH deleted successfully."
+            echo "Release with tag $LATEST_VERSION deleted successfully."
         else
             echo "Release not found for tag: $LATEST_VERSION)"
         fi

.github/workflows/mikrotik_patch_7.yml

@@ -23,15 +23,21 @@ on:
           - stable
           - testing
       version:
-        description: "Version ('', 7.17, 7.17.1, 7.17.2,...)"
+        description: "Specify version (e.g., 7.17.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 +60,55 @@ 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":"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 +122,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 +142,23 @@ 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
+        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'
@@ -184,32 +204,6 @@ 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'
       id: cache-mikrotik
@@ -232,16 +226,11 @@ jobs:
         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
@@ -294,58 +283,8 @@ 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'
       id: cache-chr-img
       uses: actions/cache@v4
       with:
@@ -354,7 +293,7 @@ jobs:
         key: chr-${{ env.LATEST_VERSION }}-${{ matrix.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'
       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 +301,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' 
       run: |
         sudo modprobe nbd
         sudo apt-get install -y qemu-utils > /dev/null
@@ -372,6 +311,7 @@ jobs:
             --new=2::-0 --typecode=2:8300 --change-name=2:"RouterOS" \
             --gpttombr=1:2 \
             chr-$LATEST_VERSION$ARCH.img
+        dd if=chr.img of=mbr.bin bs=1 count=446 skip=0
         dd if=chr-$LATEST_VERSION$ARCH.img of=pt.bin bs=1 count=66 skip=446
         echo -e "\x80" | dd of=pt.bin  bs=1 count=1  conv=notrunc
         sgdisk --mbrtogpt --clear --set-alignment=2 \
@@ -465,27 +405,117 @@ jobs:
         sudo rm chr-$LATEST_VERSION$ARCH.img
 
 
-    - name: Upload Files
-      if: steps.get_latest.outputs.has_new_version == 'true'
+    - 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 }}.img
+      if: steps.get_latest.outputs.has_new_version == 'true' && matrix.arch == 'x86' && 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 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 }}
+      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 }}
+      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' && env.RELEASE == 'true'
+      run: |
+        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; /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" \
@@ -493,10 +523,10 @@ jobs:
             --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'
+      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
@@ -509,7 +539,7 @@ jobs:
         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'
+      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 }}"
@@ -525,33 +555,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"
-              fi
-              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
-          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 }}-${{ matrix.arch }}
+        path: |
+          all_packages-*-${{ env.LATEST_VERSION }}.zip
+          mikrotik-${{ env.LATEST_VERSION }}${{ env.ARCH }}.iso
+          chr-${{ env.LATEST_VERSION }}*.zip

.gitignore

@@ -2,4 +2,5 @@ __pycache__/
 .vscode/
 venv/
 app/
+loader/
 test_*.py

README_PT.md

@@ -0,0 +1,61 @@
+[![Patch Mikrotik RouterOS 6.x](https://github.com/elseif/MikroTikPatch/actions/workflows/mikrotik_patch_6.yml/badge.svg)](https://github.com/elseif/MikroTikPatch/actions/workflows/mikrotik_patch_6.yml)  
+[![Patch Mikrotik RouterOS 7.x](https://github.com/elseif/MikroTikPatch/actions/workflows/mikrotik_patch_7.yml/badge.svg)](https://github.com/elseif/MikroTikPatch/actions/workflows/mikrotik_patch_7.yml)
+
+# Patch para MikroTik RouterOS [[中文](README.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
+
+![](image/install.png)  
+![](image/routeros.png)
+
+### Licenciar o RouterOS para x86  
+![](image/x86.png)
+
+### Renovar a licença para x86 v6.x  
+![](image/renew_v6.png)
+
+### Renovar a licença para CHR  
+![](image/renew.png)
+
+### Licenciar o RouterOS para CHR  
+![](image/chr.png)
+
+![](image/arm.png)  
+![](image/mips.png)
+
+## 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
+```
+
+## Todos os patches são aplicados automaticamente com [GitHub Actions](https://github.com/elseif/MikroTikPatch/blob/main/.github/workflows/)

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.1/chr-7.19.1-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

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)

patch.py

@@ -22,8 +22,11 @@ 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' and os.environ['LATEST_VERSION'] == '7.17.2':
+    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)]
+        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]
         new_bytes = new_chunks[4] + new_chunks[5] + new_chunks[2] + new_chunks[0] + new_chunks[1] + new_chunks[6] + new_chunks[7]
         if old_bytes in data:
@@ -279,13 +282,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)