Author: blogic
Date: 2014-06-16 20:55:18 +0200 (Mon, 16 Jun 2014)
New Revision: 41223

Modified:
   trunk/include/image.mk
Log:
include/image.mk: cleanup the SysupgradeNAND template

Signed-off-by: John Crispin <[email protected]>

Modified: trunk/include/image.mk
===================================================================
--- trunk/include/image.mk      2014-06-16 18:55:14 UTC (rev 41222)
+++ trunk/include/image.mk      2014-06-16 18:55:18 UTC (rev 41223)
@@ -129,17 +129,19 @@
     endef
 endif
 
-# $(1): Board name (small caps)
+# $(1): board name
 # $(2): kernel image
 # $(3): rootfs image
+# $(4): ubi image
 ifneq ($(CONFIG_NAND_SUPPORT),)
    define Image/Build/SysupgradeNAND
        mkdir -p $(KDIR_TMP)/sysupgrade-$(1)/
        echo "BOARD=$(1)" > $(KDIR_TMP)/sysupgrade-$(1)/CONTROL
-       $(CP) $(2) $(KDIR_TMP)/sysupgrade-$(1)/kernel
-       $(CP) $(3) $(KDIR_TMP)/sysupgrade-$(1)/root
-       (cd $(KDIR_TMP); $(TAR) cvzf \
-               $(call imgname,ubi,$(1))-sysupgrade.tgz sysupgrade-$(1))
+       [ -z "$(2)" ] || $(CP) $(2) $(KDIR_TMP)/sysupgrade-$(1)/kernel
+       [ -z "$(3)" ] || $(CP) $(3) $(KDIR_TMP)/sysupgrade-$(1)/root
+       [ -z "$(4)" ] || $(CP) $(4) $(KDIR_TMP)/sysupgrade-$(1)/ubi
+       (cd $(KDIR_TMP); $(TAR) cvf \
+               $(BIN_DIR)/$(IMG_PREFIX)-$(1)-ubi-sysupgrade.tar 
sysupgrade-$(1))
    endef
 endif
 
_______________________________________________
openwrt-commits mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits

Reply via email to