define a shared IMG_PREFIX variable used as a basename for image files, it contains...

[librecmc/librecmc.git] / target / linux / orion / image / Makefile

diff --git a/target/linux/orion/image/Makefile b/target/linux/orion/image/Makefile
index c6c790ffbe33b751565b1bffc6bd193d4e056233..180183bf675b6f9d71b4c304f1eed2f5a6c03cf9 100644 (file)
--- a/target/linux/orion/image/Makefile
+++ b/target/linux/orion/image/Makefile
@@ -1,10 +1,9 @@
 #
-# Copyright (C) 2008-2009 OpenWrt.org
+# Copyright (C) 2008-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
@@ -61,14 +60,19 @@ define Image/Build/Linksys
 # 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 image
+       [ ! -f "$(STAGING_DIR_HOST)/share/wrt350nv2-builder/u-boot.bin" ] || ( \
+               echo ":u-boot 0 $(STAGING_DIR_HOST)/share/wrt350nv2-builder/u-boot.bin" >>"${TMP_DIR}/$2_webupgrade/$2.par"; )
+       echo "#version 0x2020" >>"${TMP_DIR}/$2_webupgrade/$2.par"
+# create bin file for recovery and 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"; \
+                       -v -b "${TMP_DIR}/$2_webupgrade/$2.par"; \
        )
 # copy bin file as recovery image
-       $(CP) "${TMP_DIR}/$2_webupgrade/openwrt-$2-$1-webupgrade.bin" "$(BIN_DIR)/openwrt-$2-$1-recovery.bin"
+       $(CP) "${TMP_DIR}/$2_webupgrade/wrt350n.bin" "$(BIN_DIR)/openwrt-$2-$1-recovery.bin"
+# create webupgrade image for stock firmware update mechanism
+       zip "${TMP_DIR}/$2_webupgrade/wrt350n.zip" "${TMP_DIR}/$2_webupgrade/wrt350n.bin"
+       "${STAGING_DIR_HOST}/bin/$2-builder" -v -z "${TMP_DIR}/$2_webupgrade/wrt350n.zip" "${BIN_DIR}/openwrt-$2-$1-webupgrade.img"
        rm -rf "${TMP_DIR}/$2_webupgrade"
 endef
 
@@ -85,8 +89,10 @@ endef
 define Image/Build
        $(call Image/Build/$(1),$(1))
        $(call Image/Build/Netgear,$(1),wnr854t,NG_WNR854T,$(1))
-       $(call Image/Build/Linksys,$(1),wrt350nv2,WNR350Nv2,$(1),1048576)       # 5th parameter is kernel mtd size 0x00100000 = 1048576 / 0x001A0000 = 1703936
        $(call Image/Build/Freecom,$(1),dt2,DT,$(1))
+# Leave WRT350Nv2 at last position due to webimage dependency for zip
+# 5th parameter is kernel mtd size, e.g. 0x00100000 = 1048576 or 0x001A0000 = 1703936
+       $(call Image/Build/Linksys,$(1),wrt350nv2,WNR350Nv2,$(1),1048576)
 endef
 
 define Image/Build/squashfs
@@ -94,7 +100,7 @@ define Image/Build/squashfs
        ( \
                dd if=$(KDIR)/uImage bs=1024k conv=sync; \
                dd if=$(KDIR)/root.$(1) bs=128k conv=sync; \
-       ) > $(BIN_DIR)/openwrt-$(BOARD)-$(1).img
+       ) > $(BIN_DIR)/$(IMG_PREFIX)-$(1).img
 endef
 
 $(eval $(call BuildImage))