From 3a6289c70a5a1ef1bd24b4b55afac08334bab984 Mon Sep 17 00:00:00 2001 From: elseif Date: Tue, 14 Jul 2026 20:33:28 +0800 Subject: [PATCH] modified: .github/workflows/patch_v6.yml modified: .github/workflows/patch_v7.yml --- .github/workflows/patch_v6.yml | 6 +++--- .github/workflows/patch_v7.yml | 32 ++++++++++++++++---------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/patch_v6.yml b/.github/workflows/patch_v6.yml index 1caa2dc..2f53fb3 100644 --- a/.github/workflows/patch_v6.yml +++ b/.github/workflows/patch_v6.yml @@ -142,11 +142,11 @@ jobs: echo "ARCH_EXT=$ARCH_EXT" >> $GITHUB_ENV echo "ARCH_EXT: $ARCH_EXT" - sudo rm -rf "$BUILD_DIR" + rm -rf "$BUILD_DIR" mkdir -p "$BUILD_DIR" echo "BUILD_DIR: $BUILD_DIR" - sudo rm -rf "$PUBLISH_DIR" + rm -rf "$PUBLISH_DIR" mkdir -p "$PUBLISH_DIR" echo "PUBLISH_DIR: $PUBLISH_DIR" @@ -398,7 +398,7 @@ jobs: sudo $BUILD_DIR/chr/bin/milo $BUILD_DIR/chr/boot sudo mountpoint -q $BUILD_DIR/chr && sudo umount $BUILD_DIR/chr sudo losetup -d $LOOP_DEV 2>/dev/null || true - sudo rm -rf ./chr + rm $BUILD_DIR/chr qemu-img convert -f raw -O qcow2 $BUILD_DIR/chr-$VERSION$ARCH_EXT.img $BUILD_DIR/chr-$VERSION$ARCH_EXT.qcow2 qemu-img convert -f raw -O vmdk $BUILD_DIR/chr-$VERSION$ARCH_EXT.img $BUILD_DIR/chr-$VERSION$ARCH_EXT.vmdk qemu-img convert -f raw -O vpc $BUILD_DIR/chr-$VERSION$ARCH_EXT.img $BUILD_DIR/chr-$VERSION$ARCH_EXT.vhd diff --git a/.github/workflows/patch_v7.yml b/.github/workflows/patch_v7.yml index 7ed6667..66c48b5 100644 --- a/.github/workflows/patch_v7.yml +++ b/.github/workflows/patch_v7.yml @@ -161,11 +161,11 @@ jobs: echo "ARCH_EXT=$ARCH_EXT" >> $GITHUB_ENV echo "ARCH_EXT: $ARCH_EXT" - sudo rm -rf "$BUILD_DIR" + rm -rf "$BUILD_DIR" mkdir -p "$BUILD_DIR" echo "BUILD_DIR: $BUILD_DIR" - sudo rm -rf "$PUBLISH_DIR" + rm -rf "$PUBLISH_DIR" mkdir -p "$PUBLISH_DIR" echo "PUBLISH_DIR: $PUBLISH_DIR" @@ -635,12 +635,12 @@ jobs: sudo umount /dev/nbd0p1 sudo mount /dev/nbd0p2 $BUILD_DIR/chr/routeros - sudo mkdir -p $BUILD_DIR/chr/routeros/{var/pdb/{system,option},boot,bin,rw/disk} + mkdir -p $BUILD_DIR/chr/routeros/{var/pdb/{system,option},boot,bin,rw/disk} # cmdStartVerify bin/milo - sudo cp -v $BUILD_DIR/chr/milo $BUILD_DIR/chr/routeros/bin/milo - sudo cp -v $PUBLISH_DIR/option-$VERSION$ARCH_EXT.npk $BUILD_DIR/chr/routeros/var/pdb/option/image - sudo cp -v $PUBLISH_DIR/routeros-$VERSION$ARCH_EXT.npk $BUILD_DIR/chr/routeros/var/pdb/system/image - echo -e '#!/bin/sh\n# This script will be executed *before* RouterOS *loader* start.\n# You can put your own initialization stuff in here\n' | sudo tee $BUILD_DIR/chr/routeros/rw/disk/rc.local + cp -v $BUILD_DIR/chr/milo $BUILD_DIR/chr/routeros/bin/milo + cp -v $PUBLISH_DIR/option-$VERSION$ARCH_EXT.npk $BUILD_DIR/chr/routeros/var/pdb/option/image + cp -v $PUBLISH_DIR/routeros-$VERSION$ARCH_EXT.npk $BUILD_DIR/chr/routeros/var/pdb/system/image + echo -e '#!/bin/sh\n# This script will be executed *before* RouterOS *loader* start.\n# You can put your own initialization stuff in here\n' | tee $BUILD_DIR/chr/routeros/rw/disk/rc.local sudo umount /dev/nbd0p2 sudo qemu-nbd -d /dev/nbd0 @@ -690,7 +690,7 @@ jobs: --gpttombr=1:2 \ $BUILD_DIR/chr-$VERSION$ARCH_EXT-$FIRMWARE_TYPE.img dd if=$BUILD_DIR/chr-$VERSION$ARCH_EXT-$FIRMWARE_TYPE.img of=$BUILD_DIR/mbr.bin bs=1 count=512 conv=notrunc - echo "FA31C08ED0BC007C89E65007501FFBFCBF0006B90001F2A5EA1D060000BEBE07B304803C807423803C00750983C610FECB75EFCD18BE9B06AC3C00740B56BB0700B40ECD105EEBF0EBFE8B148B4C0289F5BF0500BB007CB8010257CD135F730C31C0CD134F75EDBE7C06EBCCBFFE7D813D55AA75C289EEEA007C00004572726F72206C6F6164696E67206F7065726174696E672073797374656D004D697373696E67206F7065726174696E672073797374656D0000000000" | xxd -r -p | sudo dd of=$BUILD_DIR/mbr.bin bs=1 count=440 conv=notrunc + echo "FA31C08ED0BC007C89E65007501FFBFCBF0006B90001F2A5EA1D060000BEBE07B304803C807423803C00750983C610FECB75EFCD18BE9B06AC3C00740B56BB0700B40ECD105EEBF0EBFE8B148B4C0289F5BF0500BB007CB8010257CD135F730C31C0CD134F75EDBE7C06EBCCBFFE7D813D55AA75C289EEEA007C00004572726F72206C6F6164696E67206F7065726174696E672073797374656D004D697373696E67206F7065726174696E672073797374656D0000000000" | xxd -r -p | dd of=$BUILD_DIR/mbr.bin bs=1 count=440 conv=notrunc printf '\x01' | dd of=$BUILD_DIR/mbr.bin bs=1 count=1 seek=336 conv=notrunc printf '\x80' | dd of=$BUILD_DIR/mbr.bin bs=1 count=1 seek=446 conv=notrunc sgdisk \ @@ -707,17 +707,17 @@ jobs: sudo mkfs.ext2 -F -m 0 -L "RouterOS Boot" /dev/nbd0p1 sudo mkfs.ext4 -F -m 0 -L "RouterOS" /dev/nbd0p2 sudo mount /dev/nbd0p1 $BUILD_DIR/chr/boot - sudo mkdir -p $BUILD_DIR/chr/boot/EFI/BOOT - sudo cp -vf $BUILD_DIR/chr/BOOTX64.EFI $BUILD_DIR/chr/boot/EFI/BOOT/BOOTX64.EFI + mkdir -p $BUILD_DIR/chr/boot/EFI/BOOT + cp -vf $BUILD_DIR/chr/BOOTX64.EFI $BUILD_DIR/chr/boot/EFI/BOOT/BOOTX64.EFI sudo $BUILD_DIR/chr/milo $BUILD_DIR/chr/boot sudo umount /dev/nbd0p1 sudo mount /dev/nbd0p2 $BUILD_DIR/chr/routeros sudo mkdir -p $BUILD_DIR/chr/routeros/{var/pdb/{system,option},boot,bin,rw/disk} - sudo cp -v $BUILD_DIR/chr/milo $BUILD_DIR/chr/routeros/bin/milo - sudo cp -v $PUBLISH_DIR/option-$VERSION$ARCH_EXT.npk $BUILD_DIR/chr/routeros/var/pdb/option/image - sudo cp -v $PUBLISH_DIR/routeros-$VERSION$ARCH_EXT.npk $BUILD_DIR/chr/routeros/var/pdb/system/image - echo -e '#!/bin/sh\n# This script will be executed *before* RouterOS *loader* start.\n# You can put your own initialization stuff in here\n' | sudo tee $BUILD_DIR/chr/routeros/rw/disk/rc.local + cp -v $BUILD_DIR/chr/milo $BUILD_DIR/chr/routeros/bin/milo + cp -v $PUBLISH_DIR/option-$VERSION$ARCH_EXT.npk $BUILD_DIR/chr/routeros/var/pdb/option/image + cp -v $PUBLISH_DIR/routeros-$VERSION$ARCH_EXT.npk $BUILD_DIR/chr/routeros/var/pdb/system/image + echo -e '#!/bin/sh\n# This script will be executed *before* RouterOS *loader* start.\n# You can put your own initialization stuff in here\n' | tee $BUILD_DIR/chr/routeros/rw/disk/rc.local sudo umount /dev/nbd0p2 sudo qemu-nbd -d /dev/nbd0 @@ -794,8 +794,8 @@ jobs: sudo mount /dev/nbd0p2 $BUILD_DIR/chr/routeros sudo mkdir -p $BUILD_DIR/chr/routeros/{var/pdb/{system,option},boot,rw/disk} - sudo cp -v $PUBLISH_DIR/option-$VERSION$ARCH_EXT.npk $BUILD_DIR/chr/routeros/var/pdb/option/image - sudo cp -v $PUBLISH_DIR/routeros-$VERSION$ARCH_EXT.npk $BUILD_DIR/chr/routeros/var/pdb/system/image + cp -v $PUBLISH_DIR/option-$VERSION$ARCH_EXT.npk $BUILD_DIR/chr/routeros/var/pdb/option/image + cp -v $PUBLISH_DIR/routeros-$VERSION$ARCH_EXT.npk $BUILD_DIR/chr/routeros/var/pdb/system/image echo -e '#!/bin/sh\n# This script will be executed *before* RouterOS *loader* start.\n# You can put your own initialization stuff in here\n' | sudo tee $BUILD_DIR/chr/routeros/rw/disk/rc.local sudo umount /dev/nbd0p2 sudo qemu-nbd -d /dev/nbd0