diff options
| author | John Crispin <john@openwrt.org> | 2014-06-24 18:13:51 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2014-06-24 18:13:51 +0000 |
| commit | 22a35a7b1171cd8ffa50675df1011fae0a3b94e5 (patch) | |
| tree | 504f03f4bf21227010e127c927ee3822dd2ceda9 | |
| parent | bcc7374d7ddbc8a1aa55c3810804aa675034c385 (diff) | |
| download | upstream-22a35a7b1171cd8ffa50675df1011fae0a3b94e5.tar.gz upstream-22a35a7b1171cd8ffa50675df1011fae0a3b94e5.tar.bz2 upstream-22a35a7b1171cd8ffa50675df1011fae0a3b94e5.zip | |
SysupgradeNAND: include rootfs-type in image name
also add quotes to paths
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
SVN-Revision: 41326
| -rw-r--r-- | include/image.mk | 16 | ||||
| -rw-r--r-- | target/linux/ar71xx/image/Makefile | 2 |
2 files changed, 9 insertions, 9 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) \ diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile index d0ee3637d2..3c68fa37fc 100644 --- a/target/linux/ar71xx/image/Makefile +++ b/target/linux/ar71xx/image/Makefile @@ -878,7 +878,7 @@ define Image/Build/NetgearNAND -i $(imageraw) \ -o $(call imgname,ubi,$(2))-factory.img - $(call Image/Build/SysupgradeNAND,$(2),$(KDIR_TMP)/vmlinux-$(2).uImage,$(KDIR_TMP)/root.squashfs) + $(call Image/Build/SysupgradeNAND,$(2),squashfs,$(KDIR_TMP)/vmlinux-$(2).uImage) endef |