RepoMirrors
/
openwrt
mirror of git://git.openwrt.org/openwrt/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ipq807x: sax1v1k: fix sysupgrade not touching rootfs_data 

Before this commit, sysupgrade saved the settings backup data to
the area following rootfs even though the device has an actual
rootfs_data partition. The backup data was completely ignored on
the following boot, but since rootfs_data was not being cleared
during sysupgrade, the issue was not noticed earlier.

Note that this commit changes the filesystem of rootfs_data from
ext4 to F2FS (if OEM partitioning is used).

Signed-off-by: Rodrigo Balerdi <lanchon@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/16463
Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
Rodrigo Balerdi 2024-09-23 07:31:08 -03:00 committed by Robert Marko
parent 76a75b43ba
commit 3b221ba5af
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/linux/qualcommax/image/ipq807x.mk
View File

@ -340,7 +340,7 @@ define Device/spectrum_sax1v1k
DEVICE_DTS_CONFIG := config@rt5010w-d187-rev6 DEVICE_DTS_CONFIG := config@rt5010w-d187-rev6
SOC := ipq8072 SOC := ipq8072
IMAGES := sysupgrade.bin IMAGES := sysupgrade.bin
DEVICE_PACKAGES := ipq-wifi-spectrum_sax1v1k DEVICE_PACKAGES := kmod-fs-f2fs f2fs-tools ipq-wifi-spectrum_sax1v1k
endef endef
TARGET_DEVICES += spectrum_sax1v1k TARGET_DEVICES += spectrum_sax1v1k

17
target/linux/qualcommax/ipq807x/base-files/lib/upgrade/platform.sh
View File

@ -184,8 +184,7 @@ platform_do_upgrade() {
nand_do_upgrade "$1" nand_do_upgrade "$1"
;; ;;
prpl,haze|\ prpl,haze|\
qnap,301w|\ qnap,301w)
spectrum,sax1v1k)
kernelname="0:HLOS" kernelname="0:HLOS"
rootfsname="rootfs" rootfsname="rootfs"
mmc_do_upgrade "$1" mmc_do_upgrade "$1"
@ -212,6 +211,12 @@ platform_do_upgrade() {
CI_ROOT_UBIPART="rootfs" CI_ROOT_UBIPART="rootfs"
nand_do_upgrade "$1" nand_do_upgrade "$1"
;; ;;
spectrum,sax1v1k)
CI_KERNPART="0:HLOS"
CI_ROOTPART="rootfs"
CI_DATAPART="rootfs_data"
emmc_do_upgrade "$1"
;;
yuncore,ax880) yuncore,ax880)
active="$(fw_printenv -n active)" active="$(fw_printenv -n active)"
if [ "$active" -eq "1" ]; then if [ "$active" -eq "1" ]; then
@ -260,3 +265,11 @@ platform_do_upgrade() {
;; ;;
esac esac
} }
platform_copy_config() {
case "$(board_name)" in
spectrum,sax1v1k)
emmc_copy_config
;;
esac
}