2
0
Эх сурвалжийг харах

ar71xx: image: rework EnGenius ENS202EXT factory image

Current EnGenius ENS202EXT factory image recipe version causes factory
images of the following devices to be corrupted. This issue wasn't
visible until recent changes of image Makefile snippets order.

Signed-off-by: Mathias Kresin <[email protected]>
Signed-off-by: Piotr Dymacz <[email protected]>
Piotr Dymacz 7 жил өмнө
parent
commit
030176e0e7

+ 4 - 7
target/linux/ar71xx/image/generic-senao.mk

@@ -1,12 +1,9 @@
 define Build/senao-factory-image
-	$(eval board=$(word 1,$(1)))
-	$(eval rootfs=$(word 2,$(1)))
-
 	mkdir -p [email protected]
 
-	touch [email protected]/FWINFO-OpenWrt-$(REVISION)-$(board)
-	$(CP) $(IMAGE_KERNEL) [email protected]/openwrt-senao-$(board)-uImage-lzma.bin
-	$(CP) $(rootfs) [email protected]/openwrt-senao-$(board)-root.squashfs
+	touch [email protected]/FWINFO-OpenWrt-$(REVISION)-$(1)
+	$(CP) $(IMAGE_KERNEL) [email protected]/openwrt-senao-$(1)-uImage-lzma.bin
+	$(CP) $@ [email protected]/openwrt-senao-$(1)-root.squashfs
 
 	$(TAR) -c \
 		--numeric-owner --owner=0 --group=0 --sort=name \
@@ -25,7 +22,7 @@ define Device/ens202ext
   IMAGE_SIZE := 13632k
   IMAGES += factory.bin
   MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env),320k(custom)ro,1536k(kernel),12096k(rootfs),2048k(failsafe)ro,64k(art)ro,13632k@0xa0000(firmware)
-  IMAGE/factory.bin/squashfs := append-rootfs | pad-rootfs | senao-factory-image ens202ext $$$$@
+  IMAGE/factory.bin := append-rootfs | pad-rootfs | senao-factory-image ens202ext
   IMAGE/sysupgrade.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE)
 endef
 TARGET_DEVICES += ens202ext