diff --git a/board/miyoo/scripts/genimage.sh b/board/miyoo/scripts/genimage.sh index e2734f8e..e9ed1f7f 100755 --- a/board/miyoo/scripts/genimage.sh +++ b/board/miyoo/scripts/genimage.sh @@ -3,10 +3,18 @@ set -e export IMAGE_NAME=${2} STARTDIR=`pwd` SELFDIR=`dirname \`realpath ${0}\`` +CFW_RELEASE="2.0.0" +BR2_HASH=`git rev-parse --short HEAD` +LIBC=${3} cp -r board/miyoo/boot "${BINARIES_DIR}" cp -r board/miyoo/main "${BINARIES_DIR}" mkdir -p "${BINARIES_DIR}/gmenu2x" cp -r "${BINARIES_DIR}/gmenu2x" "${BINARIES_DIR}/main/" -convert board/miyoo/miyoo-boot.png -pointsize 12 -fill white -annotate +10+230 "v2.0.0-CFW=${CFW_HASH}-B2R="`git rev-parse --short HEAD` -alpha off -type truecolor -strip -define bmp:format=bmp4 -define bmp:subtype=RGB565 "${BINARIES_DIR}"/boot/miyoo-boot.bmp +if test "$CFW_HASH" == "$BR2_HASH"; then + CFW_VERSION="BR2=${BR2_HASH}" +else + CFW_VERSION="CFW=${CFW_HASH}" +fi +convert board/miyoo/miyoo-boot.png -pointsize 12 -fill white -annotate +10+230 "v${CFW_RELEASE} ${CFW_VERSION} (${LIBC})" -alpha off -type truecolor -strip -define bmp:format=bmp4 -define bmp:subtype=RGB565 "${BINARIES_DIR}"/boot/miyoo-boot.bmp support/scripts/genimage.sh ${1} -c board/miyoo/genimage-sdcard.cfg diff --git a/configs/miyoo_musl_defconfig b/configs/miyoo_musl_defconfig index 85a77281..5e019f8a 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_TOOLCHAIN_BUILDROOT_VENDOR}-cfw-2.0.0${BR2_VERSION_FULL}_${BR2_TOOLCHAIN_BUILDROOT_LIBC}.img" +BR2_ROOTFS_POST_SCRIPT_ARGS="${BR2_TOOLCHAIN_BUILDROOT_VENDOR}-cfw-2.0.0${BR2_VERSION_FULL}_${BR2_TOOLCHAIN_BUILDROOT_LIBC}.img ${BR2_TOOLCHAIN_BUILDROOT_LIBC}" 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 08827968..895cc672 100644 --- a/configs/miyoo_uclibc_defconfig +++ b/configs/miyoo_uclibc_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_TOOLCHAIN_BUILDROOT_VENDOR}-cfw-2.0.0${BR2_VERSION_FULL}_${BR2_TOOLCHAIN_BUILDROOT_LIBC}.img" +BR2_ROOTFS_POST_SCRIPT_ARGS="${BR2_TOOLCHAIN_BUILDROOT_VENDOR}-cfw-2.0.0${BR2_VERSION_FULL}_${BR2_TOOLCHAIN_BUILDROOT_LIBC}.img ${BR2_TOOLCHAIN_BUILDROOT_LIBC}" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/MiyooCFW/kernel.git"