domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SysupgradeNAND: include rootfs-type in image name

Browse Source 
also add quotes to paths

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

SVN-Revision: 41326
This commit is contained in:
John Crispin
2014-06-24 18:13:51 +00:00
parent bcc7374d7d
commit 22a35a7b11
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/image.mk
View File

@@ -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) \

2
target/linux/ar71xx/image/Makefile
View File

@@ -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