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

[GENIMAGE/ACTIONS] revert ver. to 2.0.0-BETAv2

Browse Source 
+ append auto-builds with "Dev_build" string
This commit is contained in:
Apaczer
2024-01-12 20:55:53 +01:00
parent c41edf640e
commit c0e05d10be
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/build.yml vendored
View File

@@ -51,7 +51,7 @@ jobs:
make miyoo_uclibc_defconfig make miyoo_uclibc_defconfig
set -o pipefail set -o pipefail
if ! ( \ if ! ( \
make sdk CFW_HASH="${{ steps.cfwsha.outputs.cfwsha }}" 2>&1 \ make sdk CFW_HASH="${{ steps.cfwsha.outputs.cfwsha }}" APPEND_VERSION="-Dev_build" 2>&1 \
| tee build.log \ | tee build.log \
| grep ">>>" \ | grep ">>>" \
); then tail -n100 build.log && exit 1 ); then tail -n100 build.log && exit 1
@@ -135,7 +135,7 @@ jobs:
make miyoo_musl_defconfig make miyoo_musl_defconfig
set -o pipefail set -o pipefail
if ! ( \ if ! ( \
make sdk CFW_HASH="${{ steps.cfwsha.outputs.cfwsha }}" 2>&1 \ make sdk CFW_HASH="${{ steps.cfwsha.outputs.cfwsha }}" APPEND_VERSION="-Dev_build" 2>&1 \
| tee build.log \ | tee build.log \
| grep ">>>" \ | grep ">>>" \
); then tail -n100 build.log && exit 1 ); then tail -n100 build.log && exit 1

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

@@ -1,11 +1,11 @@
#!/bin/bash #!/bin/bash
set -e set -e
CFW_RELEASE="2.0.1" CFW_RELEASE="2.0.0"
STATUS="BETA" STATUS="BETAv2"
BR2_VENDOR=${2} BR2_VENDOR=${2}
BR2_VERSION_FULL=${3} BR2_VERSION_FULL=${3}
LIBC=${4} LIBC=${4}
export IMAGE_NAME="${BR2_VENDOR}-cfw-${CFW_RELEASE}${BR2_VERSION_FULL}_${LIBC}-${STATUS}.img" export IMAGE_NAME="${BR2_VENDOR}-cfw-${CFW_RELEASE}${BR2_VERSION_FULL}_${LIBC}-${STATUS}${APPEND_VERSION}.img"
STARTDIR=`pwd` STARTDIR=`pwd`
SELFDIR=`dirname \`realpath ${0}\`` SELFDIR=`dirname \`realpath ${0}\``
@@ -46,7 +46,7 @@ else
fi fi
# Write CFW version to splash image # Write CFW version to splash image
convert board/miyoo/miyoo-splash.png -pointsize 12 -fill white -annotate +10+230 "v${CFW_RELEASE} ${CFW_VERSION} (${LIBC}) ${STATUS}" -type Palette -colors 224 -depth 8 -compress none -verbose BMP3:"${BINARIES_DIR}"/boot/miyoo-splash.bmp convert board/miyoo/miyoo-splash.png -pointsize 12 -fill white -annotate +10+230 "v${CFW_RELEASE} ${CFW_VERSION} (${LIBC}) ${STATUS}${APPEND_VERSION}" -type Palette -colors 224 -depth 8 -compress none -verbose BMP3:"${BINARIES_DIR}"/boot/miyoo-splash.bmp
# Generate MAIN BTRFS partition # Generate MAIN BTRFS partition
image="${BINARIES_DIR}/main.img" image="${BINARIES_DIR}/main.img"