[openwrt/openwrt] ipq40xx: Change name for openmesh.sh to vendor-free name

LEDE Commits lede-commits at lists.infradead.org
Tue Dec 22 13:13:47 EST 2020


ynezz pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/8a891bfaa01d9592ea86c6b0cbbd5c04688c09f8

commit 8a891bfaa01d9592ea86c6b0cbbd5c04688c09f8
Author: Sven Eckelmann <sven at narfation.org>
AuthorDate: Sat Nov 21 22:27:11 2020 +0100

    ipq40xx: Change name for openmesh.sh to vendor-free name
    
    Other vendors are using functionality similar to the ones OpenMesh used to
    implement two areas on the flash to store the default image and a fallback
    image. So just change the name to dualboot_datachk.sh to avoid duplicated
    code just to have the same script for different vendors.
    
    Signed-off-by: Sven Eckelmann <sven at narfation.org>
---
 .../base-files/lib/upgrade/{openmesh.sh => dualboot_datachk.sh}   | 8 ++++----
 target/linux/ipq40xx/base-files/lib/upgrade/platform.sh           | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/target/linux/ipq40xx/base-files/lib/upgrade/openmesh.sh b/target/linux/ipq40xx/base-files/lib/upgrade/dualboot_datachk.sh
similarity index 94%
rename from target/linux/ipq40xx/base-files/lib/upgrade/openmesh.sh
rename to target/linux/ipq40xx/base-files/lib/upgrade/dualboot_datachk.sh
index 8e02186eb8..807a85d43c 100644
--- a/target/linux/ipq40xx/base-files/lib/upgrade/openmesh.sh
+++ b/target/linux/ipq40xx/base-files/lib/upgrade/dualboot_datachk.sh
@@ -1,11 +1,11 @@
-# The U-Boot loader of the OpenMesh devices requires image sizes and
-# checksums to be provided in the U-Boot environment.
-# The OpenMesh devices come with 2 main partitions - while one is active
+# The U-Boot loader with the datachk patchset for dualbooting requires image
+# sizes and checksums to be provided in the U-Boot environment.
+# The devices come with 2 main partitions - while one is active
 # sysupgrade will flash the other. The boot order is changed to boot the
 # newly flashed partition. If the new partition can't be booted due to
 # upgrade failures the previously used partition is loaded.
 
-platform_do_upgrade_openmesh() {
+platform_do_upgrade_dualboot_datachk() {
 	local tar_file="$1"
 	local restore_backup
 	local primary_kernel_mtd
diff --git a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
index 09ea396469..0fbce92f3b 100644
--- a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
@@ -113,7 +113,7 @@ platform_do_upgrade() {
 	openmesh,a42 |\
 	openmesh,a62)
 		PART_NAME="inactive"
-		platform_do_upgrade_openmesh "$1"
+		platform_do_upgrade_dualboot_datachk "$1"
 		;;
 	zyxel,nbg6617)
 		zyxel_do_upgrade "$1"



More information about the lede-commits mailing list