diff --git a/.github/workflows/rootfs.yml b/.github/workflows/rootfs.yml index b5addba6..c6de842e 100644 --- a/.github/workflows/rootfs.yml +++ b/.github/workflows/rootfs.yml @@ -30,7 +30,7 @@ jobs: - uses: actions/cache@v3 if: inputs.submodule with: - path: ${{ inputs.submodule || '.' }}/output/images/miyoo-cfw-2.0.0.img + path: ${{ inputs.submodule || '.' }}/output/images/miyoo-cfw-*.img key: ${{ steps.cache-key.outputs.key }} id: cache @@ -48,7 +48,7 @@ jobs: - uses: actions/upload-artifact@v2 with: name: build image (uClibc) - path: ${{ inputs.submodule || '.' }}/output/images/miyoo-cfw-2.0.0.img + path: ${{ inputs.submodule || '.' }}/output/images/miyoo-cfw-*.img if-no-files-found: error # 'error', 'warn', 'ignore'; defaults to `warn` - uses: actions/upload-artifact@v2 @@ -76,7 +76,7 @@ jobs: - uses: actions/cache@v3 if: inputs.submodule with: - path: ${{ inputs.submodule || '.' }}/output/images/miyoo-cfw-2.0.0.img + path: ${{ inputs.submodule || '.' }}/output/images/miyoo-cfw-*.img key: ${{ steps.cache-key.outputs.key }} id: cache @@ -93,7 +93,7 @@ jobs: - uses: actions/upload-artifact@v2 with: name: build image (musl) - path: ${{ inputs.submodule || '.' }}/output/images/miyoo-cfw-2.0.0.img + path: ${{ inputs.submodule || '.' }}/output/images/miyoo-cfw-*.img if-no-files-found: error # 'error', 'warn', 'ignore'; defaults to `warn` - uses: actions/upload-artifact@v2 diff --git a/board/miyoo/genimage-sdcard.cfg b/board/miyoo/genimage-sdcard.cfg index b02dcb90..62622198 100644 --- a/board/miyoo/genimage-sdcard.cfg +++ b/board/miyoo/genimage-sdcard.cfg @@ -34,7 +34,7 @@ image mainfs.vfat { } -image miyoo-cfw-2.0.0.img { +image ${IMAGE_NAME:-miyoo-cfw-2.0.0.img} { hdimage {} partition u-boot { diff --git a/board/miyoo/scripts/genimage.sh b/board/miyoo/scripts/genimage.sh index ec38f64c..9df348e8 100755 --- a/board/miyoo/scripts/genimage.sh +++ b/board/miyoo/scripts/genimage.sh @@ -1,9 +1,9 @@ #!/bin/bash set -e +export IMAGE_NAME=${2} STARTDIR=`pwd` SELFDIR=`dirname \`realpath ${0}\`` cp -r board/miyoo/boot "${BINARIES_DIR}" cp -r board/miyoo/main "${BINARIES_DIR}" - support/scripts/genimage.sh ${1} -c board/miyoo/genimage-sdcard.cfg diff --git a/configs/miyoo_musl_defconfig b/configs/miyoo_musl_defconfig index 39a169ea..ee270ebf 100644 --- a/configs/miyoo_musl_defconfig +++ b/configs/miyoo_musl_defconfig @@ -20,7 +20,7 @@ BR2_TARGET_GENERIC_HOSTNAME="miyoo" BR2_TARGET_GENERIC_ISSUE="Welcome to Miyoo" BR2_ROOTFS_OVERLAY="board/miyoo/rootfs" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/miyoo/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="${BR2_TARGET_UBOOT_SPL_NAME}" +BR2_ROOTFS_POST_SCRIPT_ARGS="${BR2_TOOLCHAIN_BUILDROOT_VENDOR}-cfw-2.0.0${BR2_VERSION_FULL}_${BR2_TOOLCHAIN_BUILDROOT_LIBC}.img" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/MiyooCFW/kernel.git" diff --git a/configs/miyoo_uclibc_defconfig b/configs/miyoo_uclibc_defconfig index 4ed1c1ff..887eb232 100644 --- a/configs/miyoo_uclibc_defconfig +++ b/configs/miyoo_uclibc_defconfig @@ -19,7 +19,7 @@ BR2_TARGET_GENERIC_HOSTNAME="miyoo" BR2_TARGET_GENERIC_ISSUE="Welcome to Miyoo" BR2_ROOTFS_OVERLAY="board/miyoo/rootfs" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/miyoo/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="${BR2_TARGET_UBOOT_SPL_NAME}" +BR2_ROOTFS_POST_SCRIPT_ARGS="${BR2_TOOLCHAIN_BUILDROOT_VENDOR}-cfw-2.0.0${BR2_VERSION_FULL}_${BR2_TOOLCHAIN_BUILDROOT_LIBC}.img" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/MiyooCFW/kernel.git"