KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

build: rename sysupgrade-nand to sysupgrade-tar

Browse source 
Now that the "sysupgrade-nand" step is used by non-NAND targets as well,
rename it to "sysupgrade-tar" to make it more generic.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2016-07-29 15:05:51 +02:00
parent fccc4298df
commit db49dd894e
11 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/image-commands.mk
View file

@ -148,8 +148,8 @@ define Build/combined-image
@mv $@.new $@ @mv $@.new $@
endef endef
define Build/sysupgrade-nand define Build/sysupgrade-tar
sh $(TOPDIR)/scripts/sysupgrade-nand.sh \ sh $(TOPDIR)/scripts/sysupgrade-tar.sh \
--board $(if $(BOARD_NAME),$(BOARD_NAME),$(DEVICE_NAME)) \ --board $(if $(BOARD_NAME),$(BOARD_NAME),$(DEVICE_NAME)) \
--kernel $(word 1,$^) \ --kernel $(word 1,$^) \
--rootfs $(word 2,$^) \ --rootfs $(word 2,$^) \

0
scripts/sysupgrade-nand.sh → scripts/sysupgrade-tar.sh
View file

4
target/linux/apm821xx/image/Makefile
View file

@ -76,7 +76,7 @@ define Device/mr24
IMAGE_SIZE := 8191k IMAGE_SIZE := 8191k
KERNEL := kernel-bin | lzma | uImage lzma | MerakiAdd-dtb | MerakiNAND KERNEL := kernel-bin | lzma | uImage lzma | MerakiAdd-dtb | MerakiNAND
KERNEL_INITRAMFS := copy-file $(KDIR)/vmlinux | gzip | uImage gzip | MerakiAdd-dtb | pad-to 2047k | MerakiAdd-initramfs | MerakiNAND KERNEL_INITRAMFS := copy-file $(KDIR)/vmlinux | gzip | uImage gzip | MerakiAdd-dtb | pad-to 2047k | MerakiAdd-initramfs | MerakiNAND
IMAGE/sysupgrade.tar := sysupgrade-nand IMAGE/sysupgrade.tar := sysupgrade-tar
endef endef
TARGET_DEVICES += mr24 TARGET_DEVICES += mr24
@ -156,7 +156,7 @@ define Device/WNDR4700
KERNEL_INITRAMFS := kernel-bin | gzip | dtb | wndr4700-specialImage gzip KERNEL_INITRAMFS := kernel-bin | gzip | dtb | wndr4700-specialImage gzip
IMAGE/factory.img := dtb | create-uImage-dtb | append-kernel | pad-to 2M | append-ubi | \ IMAGE/factory.img := dtb | create-uImage-dtb | append-kernel | pad-to 2M | append-ubi | \
netgear-dni | check-size $$$$(IMAGE_SIZE) netgear-dni | check-size $$$$(IMAGE_SIZE)
IMAGE/sysupgrade.tar := sysupgrade-nand IMAGE/sysupgrade.tar := sysupgrade-tar
NETGEAR_BOARD_ID := WNDR4700 NETGEAR_BOARD_ID := WNDR4700
NETGEAR_HW_ID := 29763875+128+256 NETGEAR_HW_ID := 29763875+128+256
endef endef

2
target/linux/ar71xx/image/nand.mk
View file

@ -16,7 +16,7 @@ define Device/mr18
IMAGES := sysupgrade.tar IMAGES := sysupgrade.tar
KERNEL := kernel-bin | patch-cmdline | MerakiNAND KERNEL := kernel-bin | patch-cmdline | MerakiNAND
KERNEL_INITRAMFS := kernel-bin | patch-cmdline | MerakiNAND KERNEL_INITRAMFS := kernel-bin | patch-cmdline | MerakiNAND
IMAGE/sysupgrade.tar := sysupgrade-nand IMAGE/sysupgrade.tar := sysupgrade-tar
endef endef
TARGET_DEVICES += mr18 TARGET_DEVICES += mr18

4
target/linux/ipq806x/image/Makefile
View file

@ -59,7 +59,7 @@ define Device/UbiFit
KERNEL_IN_UBI := 1 KERNEL_IN_UBI := 1
IMAGES := nand-factory.ubi nand-sysupgrade.tar IMAGES := nand-factory.ubi nand-sysupgrade.tar
IMAGE/nand-factory.ubi := append-ubi IMAGE/nand-factory.ubi := append-ubi
IMAGE/nand-sysupgrade.tar := sysupgrade-nand IMAGE/nand-sysupgrade.tar := sysupgrade-tar
endef endef
define Device/DniImage define Device/DniImage
@ -157,7 +157,7 @@ define Device/EA8500
BOARD_NAME := ea8500 BOARD_NAME := ea8500
IMAGES := factory.bin sysupgrade.tar IMAGES := factory.bin sysupgrade.tar
IMAGE/factory.bin := append-kernel 3145728 | append-ubi IMAGE/factory.bin := append-kernel 3145728 | append-ubi
IMAGE/sysupgrade.tar := sysupgrade-nand IMAGE/sysupgrade.tar := sysupgrade-tar
DEVICE_TITLE := Linksys EA8500 DEVICE_TITLE := Linksys EA8500
DEVICE_PACKAGES := ath10k-firmware-qca99x0 DEVICE_PACKAGES := ath10k-firmware-qca99x0
endef endef

2
target/linux/kirkwood/image/Makefile
View file

@ -28,7 +28,7 @@ define Device/Default
SUBPAGESIZE := 512 SUBPAGESIZE := 512
BLOCKSIZE := 128KiB BLOCKSIZE := 128KiB
IMAGES := sysupgrade.tar IMAGES := sysupgrade.tar
IMAGE/sysupgrade.tar := sysupgrade-nand IMAGE/sysupgrade.tar := sysupgrade-tar
endef endef
define Device/dockstar define Device/dockstar

2
target/linux/lantiq/image/Makefile
View file

@ -202,7 +202,7 @@ endef
define Device/NAND define Device/NAND
$(Device/NAND/$(SUBTARGET)) $(Device/NAND/$(SUBTARGET))
IMAGE/sysupgrade.bin := sysupgrade-nand IMAGE/sysupgrade.bin := sysupgrade-tar
endef endef
define Device/lantiqBrnImage define Device/lantiqBrnImage

2
target/linux/mvebu/image/Makefile
View file

@ -24,7 +24,7 @@ endef
define Device/UBI define Device/UBI
IMAGES := sysupgrade.bin IMAGES := sysupgrade.bin
IMAGE/sysupgrade.bin := sysupgrade-nand IMAGE/sysupgrade.bin := sysupgrade-tar
endef endef
define Device/UBI-factory define Device/UBI-factory

2
target/linux/octeon/image/Makefile
View file

@ -14,7 +14,7 @@ define Device/Default
KERNEL_INITRAMFS_NAME := vmlinux-initramfs.elf KERNEL_INITRAMFS_NAME := vmlinux-initramfs.elf
KERNEL := kernel-bin | strip-kernel | patch-cmdline KERNEL := kernel-bin | strip-kernel | patch-cmdline
IMAGES := sysupgrade.tar IMAGES := sysupgrade.tar
IMAGE/sysupgrade.tar := sysupgrade-nand IMAGE/sysupgrade.tar := sysupgrade-tar
endef endef
define Build/strip-kernel define Build/strip-kernel

2
target/linux/oxnas/image/Makefile
View file

@ -36,7 +36,7 @@ define Device/Default
PROFILES = Default $$(DTS) PROFILES = Default $$(DTS)
IMAGES := ubinized.bin sysupgrade.tar IMAGES := ubinized.bin sysupgrade.tar
IMAGE/ubinized.bin := append-ubi IMAGE/ubinized.bin := append-ubi
IMAGE/sysupgrade.tar := sysupgrade-nand IMAGE/sysupgrade.tar := sysupgrade-tar
KERNEL_IN_UBI := 1 KERNEL_IN_UBI := 1
UBOOTENV_IN_UBI := 1 UBOOTENV_IN_UBI := 1
endef endef

2
target/linux/ramips/image/mt7621.mk
View file

@ -158,7 +158,7 @@ define Device/ubnt-erx
KERNEL := $(KERNEL_DTB) | uImage lzma KERNEL := $(KERNEL_DTB) | uImage lzma
IMAGES := sysupgrade.tar IMAGES := sysupgrade.tar
KERNEL_INITRAMFS := $$(KERNEL) | ubnt-erx-factory-image $(KDIR)/tmp/$$(KERNEL_INITRAMFS_PREFIX)-factory.tar KERNEL_INITRAMFS := $$(KERNEL) | ubnt-erx-factory-image $(KDIR)/tmp/$$(KERNEL_INITRAMFS_PREFIX)-factory.tar
IMAGE/sysupgrade.tar := sysupgrade-nand IMAGE/sysupgrade.tar := sysupgrade-tar
DEVICE_TITLE := Ubiquiti EdgeRouter X DEVICE_TITLE := Ubiquiti EdgeRouter X
DEVICE_PACKAGES := -kmod-mt76 -kmod-rt2800-pci -kmod-cfg80211 -wpad-mini -iwinfo DEVICE_PACKAGES := -kmod-mt76 -kmod-rt2800-pci -kmod-cfg80211 -wpad-mini -iwinfo
endef endef