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

.github/workflows/matrix_build.yml

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

general/overlay/usr/sbin/sysupgrade

@@ -3,7 +3,7 @@
 # OpenIPC.org | v.20220831
 #
 
-scr_version=1.0.9
+scr_version=1.0.10
 
 args=" $@"
 
@@ -77,9 +77,9 @@ do_wipe_overlay() {
 download_firmware() {
 	echo_c 33 "\nFirmware"
 	osr=$(get_system_build)
-	build="-"
-	[ -n "${osr}" ] && [ "lite" != "${osr}" ] && build="${build}${osr}-"
-	[ -z "$url" ] && url="https://github.com/OpenIPC/firmware/releases/download/latest/openipc.${soc}${build}br.tgz"
+	ftype=$(get_flash_type)
+	build="${soc}-${osr}-${ftype}"
+	[ -z "$url" ] && url="https://github.com/OpenIPC/firmware/releases/download/latest/openipc.${build}.tgz"
 	echo "Download from $url"
 	[ -z "$HASERLVER" ] && progress="-#" || progress="-s"
 	[ "$(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
 }
 
+get_flash_type() {
+	has_nand=$(fw_printenv bootcmd | grep nand | wc -l)
+	[ "1" = "$has_nand" ] && echo "nand" || echo "nor"
+}
+
 print_sysinfo() {
 	get_system_info
 	echo_c 33 "OpenIPC System Updater v${scr_version}"