Author: blogic Date: 2014-10-14 14:21:41 +0200 (Tue, 14 Oct 2014) New Revision: 42915
Modified: trunk/target/linux/ar71xx/image/Makefile Log: ar71xx: fix seama factory type image generation. Currently JFFS2 end-of-filesystem marker 0xdeadc0de is included the computation of image's MD5 checksum as part of the seama header. But OpenWrt will erase blocks including and after the marker thus invalidating the checksum after the first boot. Signed-off-by: Yousong Zhou <[email protected]> Modified: trunk/target/linux/ar71xx/image/Makefile =================================================================== --- trunk/target/linux/ar71xx/image/Makefile 2014-10-14 12:21:36 UTC (rev 42914) +++ trunk/target/linux/ar71xx/image/Makefile 2014-10-14 12:21:41 UTC (rev 42915) @@ -673,13 +673,15 @@ -rm -f $(KDIR_TMP)/image-$(2).tmp $(call CatFiles,$(KDIR_TMP)/loader-$(2).bin.lzma,$$$$(($(6) - 64)),$(KDIR)/root.$(1),$(7),$(KDIR_TMP)/image-$(2).tmp) [ -e "$(KDIR_TMP)/image-$(2).tmp" ] && { \ + head -c -4 "$(KDIR_TMP)/image-$(2).tmp" > "$(KDIR_TMP)/image-$(2).no-jffs2mark.tmp"; \ $(STAGING_DIR_HOST)/bin/seama \ - -i $(KDIR_TMP)/image-$(2).tmp \ + -i $(KDIR_TMP)/image-$(2).no-jffs2mark.tmp \ -m "dev=/dev/mtdblock/1" -m "type=firmware"; \ $(STAGING_DIR_HOST)/bin/seama \ -s $(call imgname,$(1),$(2))-factory.bin \ -m "signature=$(5)" \ - -i $(KDIR_TMP)/image-$(2).tmp.seama; \ + -i $(KDIR_TMP)/image-$(2).no-jffs2mark.tmp.seama; \ + tail -c 4 "$(KDIR_TMP)/image-$(2).tmp" >> $(call imgname,$(1),$(2))-factory.bin; \ } cat $(KDIR_TMP)/loader-$(2).bin.lzma > $(KDIR_TMP)/image-$(2)-sysupgrade.tmp $(STAGING_DIR_HOST)/bin/seama \ _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
