diff --git a/.github/workflows/blank.yml b/.github/workflows/blank.yml index 888bd8b..2bc1273 100644 --- a/.github/workflows/blank.yml +++ b/.github/workflows/blank.yml @@ -23,11 +23,8 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Update package lists - run: sudo apt update - - - name: Install libfdt-dev, cmake and cross toolchain - run: sudo apt install libfdt-dev cmake squashfs-tools gcc-aarch64-linux-gnu binutils-aarch64-linux-gnu + - name: Install libfdt-dev and cmake + run: sudo apt install libfdt-dev cmake squashfs-tools - name: Run builder script run: | @@ -38,7 +35,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: images - path: "*.*i*" + path: "*.itb" release: if: inputs.no_release == '0' diff --git a/build_installer.sh b/build_installer.sh index 93b8d8f..ffb73a8 100755 --- a/build_installer.sh +++ b/build_installer.sh @@ -26,8 +26,7 @@ DTC= FILEBASE= WORKDIR= ITSFILE= -TFA_PLAT= -TFA_MAKEARGS= + prepare_openwrt_ib() { GNUPGHOME="$(mktemp -d)" @@ -253,23 +252,7 @@ bundle_initrd() { esac } - -build_bl2_for_uartboot() -{ - git clone https://github.com/mtk-openwrt/arm-trusted-firmware.git "${WORKDIR}/arm-trusted-firmware" - make -C "${WORKDIR}/arm-trusted-firmware" CROSS_COMPILE=aarch64-linux-gnu- PLAT=$TFA_PLAT RAM_BOOT_UART_DL=1 BOOT_DEVICE=ram $TFA_MAKEARGS bl2 - cp "${WORKDIR}/arm-trusted-firmware/build/mt7622/release/bl2.bin" "${DESTDIR}/bl2-for-mtk_uartboot.bin" -} - -build_bl2_for_snfi_debug() -{ - git clone https://github.com/mtk-openwrt/arm-trusted-firmware.git "${WORKDIR}/arm-trusted-firmware-debug" - make -C "${WORKDIR}/arm-trusted-firmware-debug" CROSS_COMPILE=aarch64-linux-gnu- PLAT=$TFA_PLAT UBI=1 OVERRIDE_UBI_START_ADDR=0x80000 LOG_LEVEL=50 BOOT_DEVICE=snand $TFA_MAKEARGS bl2 - cp "${WORKDIR}/arm-trusted-firmware-debug/build/mt7622/release/bl2.bin" "${DESTDIR}/bl2-for-debug-snand-issue.bin" -} - linksys_e8450_installer() { - TFA_PLAT=mt7622 # OPENWRT_RELEASE="23.05.0" OPENWRT_TARGET="https://downloads.openwrt.org/snapshots/targets/mediatek/mt7622" # OPENWRT_TARGET="https://downloads.openwrt.org/releases/${OPENWRT_RELEASE}/targets/mediatek/mt7622" @@ -316,11 +299,8 @@ linksys_e8450_installer() { rm "${INSTALLERDIR}/dl/vendor.bin" fi - build_bl2_for_uartboot - build_bl2_for_snfi_debug - mv "${WORKDIR}/${FILEBASE}-installer"* "${DESTDIR}" - rm -rf "${WORKDIR}" + rm -r "${WORKDIR}" } linksys_e8450_installer