aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2016-07-29 15:05:51 +0200
committerJo-Philipp Wich <jo@mein.io>2016-07-29 16:53:03 +0200
commitdb49dd894e7485020445043fb4eef58eebece7d8 (patch)
treee01d10b641dfa25671879c15ff406b4d2540a1d8
parentfccc4298df79b72a5715910ac3a6f03c84f4949d (diff)
downloadupstream-db49dd894e7485020445043fb4eef58eebece7d8.tar.gz
upstream-db49dd894e7485020445043fb4eef58eebece7d8.tar.bz2
upstream-db49dd894e7485020445043fb4eef58eebece7d8.zip
build: rename sysupgrade-nand to sysupgrade-tar
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>
-rw-r--r--include/image-commands.mk4
-rwxr-xr-xscripts/sysupgrade-tar.sh (renamed from scripts/sysupgrade-nand.sh)0
-rw-r--r--target/linux/apm821xx/image/Makefile4
-rw-r--r--target/linux/ar71xx/image/nand.mk2
-rw-r--r--target/linux/ipq806x/image/Makefile4
-rw-r--r--target/linux/kirkwood/image/Makefile2
-rw-r--r--target/linux/lantiq/image/Makefile2
-rw-r--r--target/linux/mvebu/image/Makefile2
-rw-r--r--target/linux/octeon/image/Makefile2
-rw-r--r--target/linux/oxnas/image/Makefile2
-rw-r--r--target/linux/ramips/image/mt7621.mk2
11 files changed, 13 insertions, 13 deletions
diff --git a/include/image-commands.mk b/include/image-commands.mk
index fc36509efd..8cf54bbaa1 100644
--- a/include/image-commands.mk
+++ b/include/image-commands.mk
@@ -148,8 +148,8 @@ define Build/combined-image
@mv $@.new $@
endef
-define Build/sysupgrade-nand
- sh $(TOPDIR)/scripts/sysupgrade-nand.sh \
+define Build/sysupgrade-tar
+ sh $(TOPDIR)/scripts/sysupgrade-tar.sh \
--board $(if $(BOARD_NAME),$(BOARD_NAME),$(DEVICE_NAME)) \
--kernel $(word 1,$^) \
--rootfs $(word 2,$^) \
diff --git a/scripts/sysupgrade-nand.sh b/scripts/sysupgrade-tar.sh
index 45b17daccd..45b17daccd 100755
--- a/scripts/sysupgrade-nand.sh
+++ b/scripts/sysupgrade-tar.sh
diff --git a/target/linux/apm821xx/image/Makefile b/target/linux/apm821xx/image/Makefile
index 6ad4d99c11..c49e57abc4 100644
--- a/target/linux/apm821xx/image/Makefile
+++ b/target/linux/apm821xx/image/Makefile
@@ -76,7 +76,7 @@ define Device/mr24
IMAGE_SIZE := 8191k
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
- IMAGE/sysupgrade.tar := sysupgrade-nand
+ IMAGE/sysupgrade.tar := sysupgrade-tar
endef
TARGET_DEVICES += mr24
@@ -156,7 +156,7 @@ define Device/WNDR4700
KERNEL_INITRAMFS := kernel-bin | gzip | dtb | wndr4700-specialImage gzip
IMAGE/factory.img := dtb | create-uImage-dtb | append-kernel | pad-to 2M | append-ubi | \
netgear-dni | check-size $$$$(IMAGE_SIZE)
- IMAGE/sysupgrade.tar := sysupgrade-nand
+ IMAGE/sysupgrade.tar := sysupgrade-tar
NETGEAR_BOARD_ID := WNDR4700
NETGEAR_HW_ID := 29763875+128+256
endef
diff --git a/target/linux/ar71xx/image/nand.mk b/target/linux/ar71xx/image/nand.mk
index 1aa8541587..c6a8d7e410 100644
--- a/target/linux/ar71xx/image/nand.mk
+++ b/target/linux/ar71xx/image/nand.mk
@@ -16,7 +16,7 @@ define Device/mr18
IMAGES := sysupgrade.tar
KERNEL := kernel-bin | patch-cmdline | MerakiNAND
KERNEL_INITRAMFS := kernel-bin | patch-cmdline | MerakiNAND
- IMAGE/sysupgrade.tar := sysupgrade-nand
+ IMAGE/sysupgrade.tar := sysupgrade-tar
endef
TARGET_DEVICES += mr18
diff --git a/target/linux/ipq806x/image/Makefile b/target/linux/ipq806x/image/Makefile
index 9bf072e171..fc73ec2571 100644
--- a/target/linux/ipq806x/image/Makefile
+++ b/target/linux/ipq806x/image/Makefile
@@ -59,7 +59,7 @@ define Device/UbiFit
KERNEL_IN_UBI := 1
IMAGES := nand-factory.ubi nand-sysupgrade.tar
IMAGE/nand-factory.ubi := append-ubi
- IMAGE/nand-sysupgrade.tar := sysupgrade-nand
+ IMAGE/nand-sysupgrade.tar := sysupgrade-tar
endef
define Device/DniImage
@@ -157,7 +157,7 @@ define Device/EA8500
BOARD_NAME := ea8500
IMAGES := factory.bin sysupgrade.tar
IMAGE/factory.bin := append-kernel 3145728 | append-ubi
- IMAGE/sysupgrade.tar := sysupgrade-nand
+ IMAGE/sysupgrade.tar := sysupgrade-tar
DEVICE_TITLE := Linksys EA8500
DEVICE_PACKAGES := ath10k-firmware-qca99x0
endef
diff --git a/target/linux/kirkwood/image/Makefile b/target/linux/kirkwood/image/Makefile
index 217ec234b4..91b0495a43 100644
--- a/target/linux/kirkwood/image/Makefile
+++ b/target/linux/kirkwood/image/Makefile
@@ -28,7 +28,7 @@ define Device/Default
SUBPAGESIZE := 512
BLOCKSIZE := 128KiB
IMAGES := sysupgrade.tar
- IMAGE/sysupgrade.tar := sysupgrade-nand
+ IMAGE/sysupgrade.tar := sysupgrade-tar
endef
define Device/dockstar
diff --git a/target/linux/lantiq/image/Makefile b/target/linux/lantiq/image/Makefile
index 52a568dac0..0718e9daea 100644
--- a/target/linux/lantiq/image/Makefile
+++ b/target/linux/lantiq/image/Makefile
@@ -202,7 +202,7 @@ endef
define Device/NAND
$(Device/NAND/$(SUBTARGET))
- IMAGE/sysupgrade.bin := sysupgrade-nand
+ IMAGE/sysupgrade.bin := sysupgrade-tar
endef
define Device/lantiqBrnImage
diff --git a/target/linux/mvebu/image/Makefile b/target/linux/mvebu/image/Makefile
index f8712291ec..0e863478d8 100644
--- a/target/linux/mvebu/image/Makefile
+++ b/target/linux/mvebu/image/Makefile
@@ -24,7 +24,7 @@ endef
define Device/UBI
IMAGES := sysupgrade.bin
- IMAGE/sysupgrade.bin := sysupgrade-nand
+ IMAGE/sysupgrade.bin := sysupgrade-tar
endef
define Device/UBI-factory
diff --git a/target/linux/octeon/image/Makefile b/target/linux/octeon/image/Makefile
index 3d1bdf7b17..a0bbc0e529 100644
--- a/target/linux/octeon/image/Makefile
+++ b/target/linux/octeon/image/Makefile
@@ -14,7 +14,7 @@ define Device/Default
KERNEL_INITRAMFS_NAME := vmlinux-initramfs.elf
KERNEL := kernel-bin | strip-kernel | patch-cmdline
IMAGES := sysupgrade.tar
- IMAGE/sysupgrade.tar := sysupgrade-nand
+ IMAGE/sysupgrade.tar := sysupgrade-tar
endef
define Build/strip-kernel
diff --git a/target/linux/oxnas/image/Makefile b/target/linux/oxnas/image/Makefile
index 3eb1212a74..097d894d50 100644
--- a/target/linux/oxnas/image/Makefile
+++ b/target/linux/oxnas/image/Makefile
@@ -36,7 +36,7 @@ define Device/Default
PROFILES = Default $$(DTS)
IMAGES := ubinized.bin sysupgrade.tar
IMAGE/ubinized.bin := append-ubi
- IMAGE/sysupgrade.tar := sysupgrade-nand
+ IMAGE/sysupgrade.tar := sysupgrade-tar
KERNEL_IN_UBI := 1
UBOOTENV_IN_UBI := 1
endef
diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk
index 2795eb13f6..59a9332294 100644
--- a/target/linux/ramips/image/mt7621.mk
+++ b/target/linux/ramips/image/mt7621.mk
@@ -158,7 +158,7 @@ define Device/ubnt-erx
KERNEL := $(KERNEL_DTB) | uImage lzma
IMAGES := sysupgrade.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_PACKAGES := -kmod-mt76 -kmod-rt2800-pci -kmod-cfg80211 -wpad-mini -iwinfo
endef