SysupgradeNAND: include rootfs-type in image name
also add quotes to paths Signed-off-by: Daniel Golle <daniel@makrotopia.org> SVN-Revision: 41326
This commit is contained in:
parent
bcc7374d7d
commit
22a35a7b11
@ -130,16 +130,16 @@ ifneq ($(CONFIG_TARGET_ROOTFS_SQUASHFS),)
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
# $(1): board name
|
# $(1): board name
|
||||||
# $(2): kernel image
|
# $(2): rootfs type
|
||||||
# $(3): rootfs image
|
# $(3): kernel image
|
||||||
ifneq ($(CONFIG_NAND_SUPPORT),)
|
ifneq ($(CONFIG_NAND_SUPPORT),)
|
||||||
define Image/Build/SysupgradeNAND
|
define Image/Build/SysupgradeNAND
|
||||||
mkdir -p $(KDIR_TMP)/sysupgrade-$(1)/
|
mkdir -p "$(KDIR_TMP)/sysupgrade-$(1)/"
|
||||||
echo "BOARD=$(1)" > $(KDIR_TMP)/sysupgrade-$(1)/CONTROL
|
echo "BOARD=$(1)" > "$(KDIR_TMP)/sysupgrade-$(1)/CONTROL"
|
||||||
[ -z "$(2)" ] || $(CP) $(2) $(KDIR_TMP)/sysupgrade-$(1)/kernel
|
[ -z "$(2)" ] || $(CP) "$(KDIR)/root.$(2)" "$(KDIR_TMP)/sysupgrade-$(1)/root"
|
||||||
[ -z "$(3)" ] || $(CP) $(3) $(KDIR_TMP)/sysupgrade-$(1)/root
|
[ -z "$(3)" ] || $(CP) "$(3)" "$(KDIR_TMP)/sysupgrade-$(1)/kernel"
|
||||||
(cd $(KDIR_TMP); $(TAR) cvf \
|
(cd "$(KDIR_TMP)"; $(TAR) cvf \
|
||||||
$(BIN_DIR)/$(IMG_PREFIX)-$(1)-ubi-sysupgrade.tar sysupgrade-$(1))
|
"$(BIN_DIR)/$(IMG_PREFIX)-$(1)-$(2)-sysupgrade.tar" sysupgrade-$(1))
|
||||||
endef
|
endef
|
||||||
define Image/Build/UbinizeImage
|
define Image/Build/UbinizeImage
|
||||||
sh $(TOPDIR)/scripts/ubinize-image.sh $(2) \
|
sh $(TOPDIR)/scripts/ubinize-image.sh $(2) \
|
||||||
|
@ -878,7 +878,7 @@ define Image/Build/NetgearNAND
|
|||||||
-i $(imageraw) \
|
-i $(imageraw) \
|
||||||
-o $(call imgname,ubi,$(2))-factory.img
|
-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
|
endef
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user