iiiypuk/buildroot
1
0
Fork 0
mirror of https://github.com/MiyooCFW/buildroot.git synced 2025-09-27 22:24:19 +03:00
Code Issues Projects Releases Wiki Activity

Add version and toolchain to img filename (#18)

Browse Source 
* add version and toolchain to img filename
---------

Co-authored-by: Apaczer <94932128+Apaczer@users.noreply.github.com>
This commit is contained in:
tiopex
2023-03-27 09:08:23 +02:00
committed by GitHub
parent a9bd72ce78
commit 8bd4a5d2e2
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/rootfs.yml vendored
View File

@@ -30,7 +30,7 @@ jobs:
- uses: actions/cache@v3 - uses: actions/cache@v3
if: inputs.submodule if: inputs.submodule
with: 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 }} key: ${{ steps.cache-key.outputs.key }}
id: cache id: cache
@@ -48,7 +48,7 @@ jobs:
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v2
with: with:
name: build image (uClibc) 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` if-no-files-found: error # 'error', 'warn', 'ignore'; defaults to `warn`
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v2
@@ -76,7 +76,7 @@ jobs:
- uses: actions/cache@v3 - uses: actions/cache@v3
if: inputs.submodule if: inputs.submodule
with: 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 }} key: ${{ steps.cache-key.outputs.key }}
id: cache id: cache
@@ -93,7 +93,7 @@ jobs:
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v2
with: with:
name: build image (musl) 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` if-no-files-found: error # 'error', 'warn', 'ignore'; defaults to `warn`
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v2

2
board/miyoo/genimage-sdcard.cfg
View File

@@ -34,7 +34,7 @@ image mainfs.vfat {
} }
image miyoo-cfw-2.0.0.img { image ${IMAGE_NAME:-miyoo-cfw-2.0.0.img} {
hdimage {} hdimage {}
partition u-boot { partition u-boot {

2
board/miyoo/scripts/genimage.sh
View File

@@ -1,9 +1,9 @@
#!/bin/bash #!/bin/bash
set -e set -e
export IMAGE_NAME=${2}
STARTDIR=`pwd` STARTDIR=`pwd`
SELFDIR=`dirname \`realpath ${0}\`` SELFDIR=`dirname \`realpath ${0}\``
cp -r board/miyoo/boot "${BINARIES_DIR}" cp -r board/miyoo/boot "${BINARIES_DIR}"
cp -r board/miyoo/main "${BINARIES_DIR}" cp -r board/miyoo/main "${BINARIES_DIR}"
support/scripts/genimage.sh ${1} -c board/miyoo/genimage-sdcard.cfg support/scripts/genimage.sh ${1} -c board/miyoo/genimage-sdcard.cfg

2
configs/miyoo_musl_defconfig
View File

@@ -20,7 +20,7 @@ BR2_TARGET_GENERIC_HOSTNAME="miyoo"
BR2_TARGET_GENERIC_ISSUE="Welcome to Miyoo" BR2_TARGET_GENERIC_ISSUE="Welcome to Miyoo"
BR2_ROOTFS_OVERLAY="board/miyoo/rootfs" BR2_ROOTFS_OVERLAY="board/miyoo/rootfs"
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/miyoo/scripts/genimage.sh" 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=y
BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_GIT=y
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/MiyooCFW/kernel.git" BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/MiyooCFW/kernel.git"

2
configs/miyoo_uclibc_defconfig
View File

@@ -19,7 +19,7 @@ BR2_TARGET_GENERIC_HOSTNAME="miyoo"
BR2_TARGET_GENERIC_ISSUE="Welcome to Miyoo" BR2_TARGET_GENERIC_ISSUE="Welcome to Miyoo"
BR2_ROOTFS_OVERLAY="board/miyoo/rootfs" BR2_ROOTFS_OVERLAY="board/miyoo/rootfs"
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/miyoo/scripts/genimage.sh" 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=y
BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_GIT=y
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/MiyooCFW/kernel.git" BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/MiyooCFW/kernel.git"