aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2014-06-24 18:13:51 +0000
committerJohn Crispin <blogic@openwrt.org>2014-06-24 18:13:51 +0000
commitf5d5de027c87968df75a8ca1728267304cb01f43 (patch)
treed3fd355d94e39cbf695f9399cf29c415fa53bc57 /include
parente688f6b8c4c5f9c80a2e22f55aff1ee83144e10b (diff)
downloadupstream-f5d5de027c87968df75a8ca1728267304cb01f43.tar.gz
upstream-f5d5de027c87968df75a8ca1728267304cb01f43.tar.bz2
upstream-f5d5de027c87968df75a8ca1728267304cb01f43.zip
SysupgradeNAND: include rootfs-type in image name
also add quotes to paths Signed-off-by: Daniel Golle <daniel@makrotopia.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41326 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'include')
-rw-r--r--include/image.mk16
1 files changed, 8 insertions, 8 deletions
diff --git a/include/image.mk b/include/image.mk
index a77de27238..3832b7ae84 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -130,16 +130,16 @@ ifneq ($(CONFIG_TARGET_ROOTFS_SQUASHFS),)
endif
# $(1): board name
-# $(2): kernel image
-# $(3): rootfs image
+# $(2): rootfs type
+# $(3): kernel image
ifneq ($(CONFIG_NAND_SUPPORT),)
define Image/Build/SysupgradeNAND
- mkdir -p $(KDIR_TMP)/sysupgrade-$(1)/
- echo "BOARD=$(1)" > $(KDIR_TMP)/sysupgrade-$(1)/CONTROL
- [ -z "$(2)" ] || $(CP) $(2) $(KDIR_TMP)/sysupgrade-$(1)/kernel
- [ -z "$(3)" ] || $(CP) $(3) $(KDIR_TMP)/sysupgrade-$(1)/root
- (cd $(KDIR_TMP); $(TAR) cvf \
- $(BIN_DIR)/$(IMG_PREFIX)-$(1)-ubi-sysupgrade.tar sysupgrade-$(1))
+ mkdir -p "$(KDIR_TMP)/sysupgrade-$(1)/"
+ echo "BOARD=$(1)" > "$(KDIR_TMP)/sysupgrade-$(1)/CONTROL"
+ [ -z "$(2)" ] || $(CP) "$(KDIR)/root.$(2)" "$(KDIR_TMP)/sysupgrade-$(1)/root"
+ [ -z "$(3)" ] || $(CP) "$(3)" "$(KDIR_TMP)/sysupgrade-$(1)/kernel"
+ (cd "$(KDIR_TMP)"; $(TAR) cvf \
+ "$(BIN_DIR)/$(IMG_PREFIX)-$(1)-$(2)-sysupgrade.tar" sysupgrade-$(1))
endef
define Image/Build/UbinizeImage
sh $(TOPDIR)/scripts/ubinize-image.sh $(2) \