diff --git a/buildscript b/buildscript index 02cb6c4ef66e1e5fc7712e69f1f546ae7bbd4ba0..3ba36a6a5a62e89cf88b9d0675f5ca5401d5270d 100755 --- a/buildscript +++ b/buildscript @@ -285,6 +285,7 @@ cp_firmware() { filename_build=${image//openwrt/fff-${version}} filename_build=${filename_build//generic/g} filename_build=${filename_build//tiny/t} + filename_build=${filename_build//squashfs-/} cp "$target/bin/targets/${chipset}/${subtarget}/$image" "./bin/$filename_build" for region in "" "-eu" "-us"; do diff --git a/src/packages/fff/fff-sysupgrade/Makefile b/src/packages/fff/fff-sysupgrade/Makefile index 1f7b65eb4c9415620d2f3ac1debb899cae7ed5b9..90ef66af83b14a36f2180d29bec667237abce010 100644 --- a/src/packages/fff/fff-sysupgrade/Makefile +++ b/src/packages/fff/fff-sysupgrade/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-sysupgrade -PKG_VERSION:=8 +PKG_VERSION:=9 PKG_RELEASE:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) diff --git a/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh b/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh index 87ac48abab6b1a247032b50152f19c0c3caff403..c8d037ce060ab3453ffa09077f74bf433d13754e 100755 --- a/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh +++ b/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh @@ -69,7 +69,7 @@ if [ "$VERSION" = "$FIRMWARE_VERSION" ]; then done fi -FILE="fff-${VERSION}-${SOC}-${BOARD}-squashfs-sysupgrade.bin" +FILE="fff-${VERSION}-${SOC}-${BOARD}-sysupgrade.bin" echo "Downloading $FILE" echo "" wget "${UPGRADE_PATH}/${FILE}"