Author: blogic Date: 2014-06-24 20:13:51 +0200 (Tue, 24 Jun 2014) New Revision: 41326
Modified: trunk/include/image.mk trunk/target/linux/ar71xx/image/Makefile Log: SysupgradeNAND: include rootfs-type in image name also add quotes to paths Signed-off-by: Daniel Golle <[email protected]> Modified: trunk/include/image.mk =================================================================== --- trunk/include/image.mk 2014-06-24 18:13:47 UTC (rev 41325) +++ trunk/include/image.mk 2014-06-24 18:13:51 UTC (rev 41326) @@ -130,16 +130,16 @@ 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) \ Modified: trunk/target/linux/ar71xx/image/Makefile =================================================================== --- trunk/target/linux/ar71xx/image/Makefile 2014-06-24 18:13:47 UTC (rev 41325) +++ trunk/target/linux/ar71xx/image/Makefile 2014-06-24 18:13:51 UTC (rev 41326) @@ -878,7 +878,7 @@ -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 _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
