Changeset 19183


Ignore:
Timestamp:
2010-01-17T14:50:10+01:00 (6 years ago)
Author:
jow
Message:

[PATCH] 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@…>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/orion/image/Makefile

    r18763 r19183  
    5050 
    5151define Image/Build/Linksys 
    52         # WRT350N v2 sysupgrade image 
     52# WRT350N v2 images 
     53# sysupgrade image 
    5354        ( \ 
    5455                dd if="${KDIR}/$2-uImage" bs=$5 conv=sync; \ 
    5556                dd if="${KDIR}/root.$1" bs=64k conv=sync; \ 
    5657        ) > "${BIN_DIR}/openwrt-$2-$1.img" 
    57         # WRT350N v2 webupgrade image for stock firmware 
     58# recovery image and webupgrade image for stock firmware 
    5859        rm -rf "${TMP_DIR}/$2_webupgrade" 
    5960        mkdir "${TMP_DIR}/$2_webupgrade" 
    60         # create parameter file 
     61# create parameter file 
    6162        echo ":kernel $5 ${BIN_DIR}/openwrt-$2-uImage" >"${TMP_DIR}/$2_webupgrade/$2.par" 
    6263        echo ":rootfs 0 ${KDIR}/root.$1" >>"${TMP_DIR}/$2_webupgrade/$2.par" 
    63         # create webupgrade file 
     64# create webupgrade image 
    6465        ( cd "${TMP_DIR}/$2_webupgrade"; \ 
    6566                "${STAGING_DIR_HOST}/bin/$2-builder" \ 
    6667                        -v "${TMP_DIR}/$2_webupgrade/$2.par" \ 
    67                         "${BIN_DIR}/openwrt-$2-$(1)-webupgrade.img"; \ 
    68                 $(CP) openwrt-$2-$(1)-webupgrade.bin $(BIN_DIR)/openwrt-$2-$(1)-recovery.bin; \ 
     68                        "${BIN_DIR}/openwrt-$2-$1-webupgrade.img"; \ 
    6969        ) 
     70# copy bin file as recovery image 
     71        $(CP) "${TMP_DIR}/$2_webupgrade/openwrt-$2-$1-webupgrade.bin" "$(BIN_DIR)/openwrt-$2-$1-recovery.bin" 
    7072        rm -rf "${TMP_DIR}/$2_webupgrade" 
    7173endef 
     
    9799 
    98100$(eval $(call BuildImage)) 
     101 
     102# Dependency for WRT350N v2 webupgrade image 
     103$(eval $(call RequireCommand,zip, \ 
     104        Please install zip. \ 
     105)) 
Note: See TracChangeset for help on using the changeset viewer.