nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ar71xx-generic: Generate OpenMesh sysupgrades in OpenWrt

Browse Source 
The workaround to generate sysupgrade images for OpenMesh devices in gluon
is replaced in LEDE/OpenWrt by a special patch. It is therefore better to
drop the workaround and use the upstream version.

Reported-by: Matthias Schiffer <mschiffer@universe-factory.net>
Signed-off-by: Sven Eckelmann <sven.eckelmann@open-mesh.com>
This commit is contained in:
Sven Eckelmann 2016-05-19 20:59:34 +02:00
parent 97879e80ad
commit 62feb04fe1
2 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
patches/openwrt/0046-ar71xx-Generate-sysupgrade-images-for-OpenMesh-devic.patch Normal file
View File

@ -0,0 +1,30 @@
From: Sven Eckelmann <sven.eckelmann@open-mesh.com>
Date: Tue, 17 May 2016 16:38:29 +0200
Subject: ar71xx: Generate sysupgrade images for OpenMesh devices
Some OpenWrt based firmwares like Gluon expect that a sysupgrade image
exists when a device firmware can be updated via sysupgrade. This image
wasn't created until now because OpenMesh devices use the same image for
factory and sysupgrade flash. Copying the image from *factory.bin to
*sysupgrade.bin is therefore enough to make the sysupgrade functionality
visible.
Reported-by: Matthias Schiffer <mschiffer@universe-factory.net>
Signed-off-by: Sven Eckelmann <sven.eckelmann@open-mesh.com>
Forwarded: https://patchwork.ozlabs.org/patch/624172/
diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
index 916d4e2..f91e20e 100644
--- a/target/linux/ar71xx/image/Makefile
+++ b/target/linux/ar71xx/image/Makefile
@@ -1877,6 +1877,9 @@ define Image/Build/OpenMesh
"$(BUILD_DIR)/fwupgrade.cfg-$(4)" "fwupgrade.cfg" \
"$(KDIR_TMP)/vmlinux-$(2).uImage" "kernel" \
"$(KDIR)/root.$(1)" "rootfs"
+ if [ -e "$(call factoryname,$(1),$(2))" ]; then \
+ cp "$(call factoryname,$(1),$(2))" "$(call sysupname,$(1),$(2))"; \
+ fi
endef

4
targets/ar71xx-generic/profiles.mk
View File

@ -299,19 +299,16 @@ $(eval $(call GluonModel,OMEGA,onion-omega,onion-omega))
# MR600 # MR600
$(eval $(call GluonProfile,MR600,om-watchdog uboot-envtools)) $(eval $(call GluonProfile,MR600,om-watchdog uboot-envtools))
$(eval $(call GluonProfileSysupgradeSuffix,MR600,-squashfs-factory,.bin))
$(eval $(call GluonModel,MR600,mr600,openmesh-mr600)) $(eval $(call GluonModel,MR600,mr600,openmesh-mr600))
$(eval $(call GluonModelAlias,MR600,openmesh-mr600,openmesh-mr600-v2)) $(eval $(call GluonModelAlias,MR600,openmesh-mr600,openmesh-mr600-v2))
# MR900 # MR900
$(eval $(call GluonProfile,MR900,om-watchdog uboot-envtools)) $(eval $(call GluonProfile,MR900,om-watchdog uboot-envtools))
$(eval $(call GluonProfileSysupgradeSuffix,MR900,-squashfs-factory,.bin))
$(eval $(call GluonModel,MR900,mr900,openmesh-mr900)) $(eval $(call GluonModel,MR900,mr900,openmesh-mr900))
$(eval $(call GluonModelAlias,MR900,openmesh-mr900,openmesh-mr900-v2)) $(eval $(call GluonModelAlias,MR900,openmesh-mr900,openmesh-mr900-v2))
# OM2P # OM2P
$(eval $(call GluonProfile,OM2P,om-watchdog uboot-envtools)) $(eval $(call GluonProfile,OM2P,om-watchdog uboot-envtools))
$(eval $(call GluonProfileSysupgradeSuffix,OM2P,-squashfs-factory,.bin))
$(eval $(call GluonModel,OM2P,om2p,openmesh-om2p)) $(eval $(call GluonModel,OM2P,om2p,openmesh-om2p))
$(eval $(call GluonModelAlias,OM2P,openmesh-om2p,openmesh-om2p-v2)) $(eval $(call GluonModelAlias,OM2P,openmesh-om2p,openmesh-om2p-v2))
$(eval $(call GluonModelAlias,OM2P,openmesh-om2p,openmesh-om2p-hs)) $(eval $(call GluonModelAlias,OM2P,openmesh-om2p,openmesh-om2p-hs))
@ -320,7 +317,6 @@ $(eval $(call GluonModelAlias,OM2P,openmesh-om2p,openmesh-om2p-lc))
# OM5P # OM5P
$(eval $(call GluonProfile,OM5P,om-watchdog uboot-envtools)) $(eval $(call GluonProfile,OM5P,om-watchdog uboot-envtools))
$(eval $(call GluonProfileSysupgradeSuffix,OM5P,-squashfs-factory,.bin))
$(eval $(call GluonModel,OM5P,om5p,openmesh-om5p)) $(eval $(call GluonModel,OM5P,om5p,openmesh-om5p))
$(eval $(call GluonModelAlias,OM5P,openmesh-om5p,openmesh-om5p-an)) $(eval $(call GluonModelAlias,OM5P,openmesh-om5p,openmesh-om5p-an))