-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Webupgrade image building for WRT350Nv2 needs zip package.
Copy command for WRT350Nv2 recovery image overrides error code of
webupgrade builder, moved behind brackets.
Removed indention of comments to avoid output in log.
Signed-off by: Matthias Buecher <m...@maddes.net>
-----BEGIN PGP SIGNATURE-----
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iEYEARECAAYFAktPUokACgkQUXXT+9wZdbVRwwCgl6cewKsBuHICiBdFOYAsbr8k
9P0AoPhwlGOWIbOwnhoxaQ18JEjmiwXY
=u+Gd
-----END PGP SIGNATURE-----
Index: target/linux/orion/image/Makefile
===================================================================
--- target/linux/orion/image/Makefile (revision 19124)
+++ target/linux/orion/image/Makefile (working copy)
@@ -49,24 +49,26 @@
endef
define Image/Build/Linksys
- # WRT350N v2 sysupgrade image
+# WRT350N v2 images
+# sysupgrade image
( \
dd if="${KDIR}/$2-uImage" bs=$5 conv=sync; \
dd if="${KDIR}/root.$1" bs=64k conv=sync; \
) > "${BIN_DIR}/openwrt-$2-$1.img"
- # WRT350N v2 webupgrade image for stock firmware
+# recovery image and webupgrade image for stock firmware
rm -rf "${TMP_DIR}/$2_webupgrade"
mkdir "${TMP_DIR}/$2_webupgrade"
- # create parameter file
+# create parameter file
echo ":kernel $5 ${BIN_DIR}/openwrt-$2-uImage" >"${TMP_DIR}/$2_webupgrade/$2.par"
echo ":rootfs 0 ${KDIR}/root.$1" >>"${TMP_DIR}/$2_webupgrade/$2.par"
- # create webupgrade file
+# create webupgrade image
( cd "${TMP_DIR}/$2_webupgrade"; \
"${STAGING_DIR_HOST}/bin/$2-builder" \
-v "${TMP_DIR}/$2_webupgrade/$2.par" \
- "${BIN_DIR}/openwrt-$2-$(1)-webupgrade.img"; \
- $(CP) openwrt-$2-$(1)-webupgrade.bin $(BIN_DIR)/openwrt-$2-$(1)-recovery.bin; \
+ "${BIN_DIR}/openwrt-$2-$1-webupgrade.img"; \
)
+# copy bin file as recovery image
+ $(CP) "${TMP_DIR}/$2_webupgrade/openwrt-$2-$1-webupgrade.bin" "$(BIN_DIR)/openwrt-$2-$1-recovery.bin"
rm -rf "${TMP_DIR}/$2_webupgrade"
endef
@@ -96,3 +98,8 @@
endef
$(eval $(call BuildImage))
+
+# Dependency for WRT350N v2 webupgrade image
+$(eval $(call RequireCommand,zip, \
+ Please install zip. \
+))
-----BEGIN PGP SIGNATURE-----
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iEYEABECAAYFAktPUokACgkQUXXT+9wZdbU/iACfVAoiH3HnTK0ySwl8vw4TCO67
I98Aniq5zvQeJoPrG2+QyPnyeyxCuFjs
=J1c+
-----END PGP SIGNATURE-----
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
