RepoMirrors
/
openwrt
mirror of git://git.openwrt.org/openwrt/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

missing prerequisite for Orion images 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 <mail@maddes.net> 

SVN-Revision: 19183
This commit is contained in:
Jo-Philipp Wich 2010-01-17 13:50:10 +00:00
parent 6f78b03bcb
commit 82e1ed603f
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
target/linux/orion/image/Makefile
View File

@ -49,24 +49,26 @@ define Image/Build/Netgear
endef endef
define Image/Build/Linksys 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}/$2-uImage" bs=$5 conv=sync; \
dd if="${KDIR}/root.$1" bs=64k conv=sync; \ dd if="${KDIR}/root.$1" bs=64k conv=sync; \
) > "${BIN_DIR}/openwrt-$2-$1.img" ) > "${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" rm -rf "${TMP_DIR}/$2_webupgrade"
mkdir "${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 ":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" echo ":rootfs 0 ${KDIR}/root.$1" >>"${TMP_DIR}/$2_webupgrade/$2.par"
# create webupgrade file # create webupgrade image
( cd "${TMP_DIR}/$2_webupgrade"; \ ( cd "${TMP_DIR}/$2_webupgrade"; \
"${STAGING_DIR_HOST}/bin/$2-builder" \ "${STAGING_DIR_HOST}/bin/$2-builder" \
-v "${TMP_DIR}/$2_webupgrade/$2.par" \ -v "${TMP_DIR}/$2_webupgrade/$2.par" \
"${BIN_DIR}/openwrt-$2-$(1)-webupgrade.img"; \ "${BIN_DIR}/openwrt-$2-$1-webupgrade.img"; \
$(CP) openwrt-$2-$(1)-webupgrade.bin $(BIN_DIR)/openwrt-$2-$(1)-recovery.bin; \
) )
# 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" rm -rf "${TMP_DIR}/$2_webupgrade"
endef endef
@ -96,3 +98,8 @@ define Image/Build/squashfs
endef endef
$(eval $(call BuildImage)) $(eval $(call BuildImage))
# Dependency for WRT350N v2 webupgrade image
$(eval $(call RequireCommand,zip, \
Please install zip. \
))