OpenIPC
/
firmware
mirror of https://github.com/OpenIPC/firmware.git
1
0
Fork 0
Code Activity

Change release filename to names like openipc.hi3516cv300-ultimate-no… (#533)

pull/542/head
Dmitry Ilyin 2022-11-02 21:56:52 +03:00 committed by GitHub
parent 5844baa4d1
commit b48a3c21db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.github/workflows/matrix_build.yml vendored
View File

@ -381,14 +381,7 @@ jobs:
- name: Build firmware - name: Build firmware
run: | run: |
BOARD=${{ matrix.platform }} BOARD=${{ matrix.platform }}_${{ matrix.release }}
if [ "${{ matrix.release }}" != "lite" ]; then
SUFF="${{ matrix.release }}-"
BOARD="${BOARD}_${{ matrix.release }}"
else
BOARD="${BOARD}_lite"
fi
CONF_PATH=$(find . -name "${BOARD}_defconfig") CONF_PATH=$(find . -name "${BOARD}_defconfig")
echo Using $TOOLNAME echo Using $TOOLNAME
@ -491,7 +484,7 @@ jobs:
;; ;;
esac esac
NORFW_PATH="${IMAGES_DIR}/openipc.${{ matrix.platform }}-${SUFF}br.tgz" NORFW_PATH="${IMAGES_DIR}/openipc.${{ matrix.platform }}-${{ matrix.release }}-nor.tgz"
echo "NORFW_PATH=$NORFW_PATH" >> $GITHUB_ENV echo "NORFW_PATH=$NORFW_PATH" >> $GITHUB_ENV
NORFW_FILE=$(basename $NORFW_PATH) NORFW_FILE=$(basename $NORFW_PATH)
echo "NORFW_FILE=$NORFW_FILE" >> $GITHUB_ENV echo "NORFW_FILE=$NORFW_FILE" >> $GITHUB_ENV
@ -503,8 +496,8 @@ jobs:
tar -cvzf $NORFW_PATH uImage* *rootfs.squashfs.${{ matrix.platform }}* tar -cvzf $NORFW_PATH uImage* *rootfs.squashfs.${{ matrix.platform }}*
fi fi
if [ -f rootfs.ubifs ]; then if [ -f rootfs.ubifs ] ; then
NANDFW_PATH="${IMAGES_DIR}/openipc.${{ matrix.platform }}-nand-br.tgz" NANDFW_PATH="${IMAGES_DIR}/openipc.${{ matrix.platform }}-${{ matrix.release }}-nand.tgz"
echo "NANDFW_PATH=$NANDFW_PATH" >> $GITHUB_ENV echo "NANDFW_PATH=$NANDFW_PATH" >> $GITHUB_ENV
NANDFW_FILE=$(basename $NANDFW_PATH) NANDFW_FILE=$(basename $NANDFW_PATH)
echo "NANDFW_FILE=$NANDFW_FILE" >> $GITHUB_ENV echo "NANDFW_FILE=$NANDFW_FILE" >> $GITHUB_ENV

13
general/overlay/usr/sbin/sysupgrade
View File

@ -3,7 +3,7 @@
# OpenIPC.org | v.20220831 # OpenIPC.org | v.20220831
# #
scr_version=1.0.9 scr_version=1.0.10
args=" $@" args=" $@"
@ -77,9 +77,9 @@ do_wipe_overlay() {
download_firmware() { download_firmware() {
echo_c 33 "\nFirmware" echo_c 33 "\nFirmware"
osr=$(get_system_build) osr=$(get_system_build)
build="-" ftype=$(get_flash_type)
[ -n "${osr}" ] && [ "lite" != "${osr}" ] && build="${build}${osr}-" build="${soc}-${osr}-${ftype}"
[ -z "$url" ] && url="https://github.com/OpenIPC/firmware/releases/download/latest/openipc.${soc}${build}br.tgz" [ -z "$url" ] && url="https://github.com/OpenIPC/firmware/releases/download/latest/openipc.${build}.tgz"
echo "Download from $url" echo "Download from $url"
[ -z "$HASERLVER" ] && progress="-#" || progress="-s" [ -z "$HASERLVER" ] && progress="-#" || progress="-s"
[ "$(curl -o /dev/null -s -w '%{http_code}\n' "$url")" = "000" ] && die "Check your network!" [ "$(curl -o /dev/null -s -w '%{http_code}\n' "$url")" = "000" ] && die "Check your network!"
@ -194,6 +194,11 @@ get_system_build() {
grep "BUILD_OPTION" "/etc/os-release" | head -1 | cut -d= -f2 grep "BUILD_OPTION" "/etc/os-release" | head -1 | cut -d= -f2
} }
get_flash_type() {
has_nand=$(fw_printenv bootcmd | grep nand | wc -l)
[ "1" = "$has_nand" ] && echo "nand" || echo "nor"
}
print_sysinfo() { print_sysinfo() {
get_system_info get_system_info
echo_c 33 "OpenIPC System Updater v${scr_version}" echo_c 33 "OpenIPC System Updater v${scr_version}"