aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2016-07-30 13:47:36 +0200
committerFelix Fietkau <nbd@nbd.name>2016-07-30 14:10:33 +0200
commit84718d8736b3e8282e7a4db6cb3aee73663a3b40 (patch)
tree197c0a45baa7d08e89709c4af44c489e01e66312 /include
parent77b16bacb1e0828ae6fb5ec39a64b7759db2b1e8 (diff)
downloadupstream-84718d8736b3e8282e7a4db6cb3aee73663a3b40.tar.gz
upstream-84718d8736b3e8282e7a4db6cb3aee73663a3b40.tar.bz2
upstream-84718d8736b3e8282e7a4db6cb3aee73663a3b40.zip
image: add support for overriding kernel/rootfs images in sysupgrade-tar template
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'include')
-rw-r--r--include/image-commands.mk4
-rw-r--r--include/image.mk1
2 files changed, 3 insertions, 2 deletions
diff --git a/include/image-commands.mk b/include/image-commands.mk
index 8cf54bbaa1..f95a68dab1 100644
--- a/include/image-commands.mk
+++ b/include/image-commands.mk
@@ -151,7 +151,7 @@ endef
define Build/sysupgrade-tar
sh $(TOPDIR)/scripts/sysupgrade-tar.sh \
--board $(if $(BOARD_NAME),$(BOARD_NAME),$(DEVICE_NAME)) \
- --kernel $(word 1,$^) \
- --rootfs $(word 2,$^) \
+ --kernel $(call param_get_default,kernel,$(1),$(word 1,$^)) \
+ --rootfs $(call param_get_default,rootfs,$(1),$(word 2,$^)) \
$@
endef
diff --git a/include/image.mk b/include/image.mk
index b5e45ec155..8c3c983c06 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -29,6 +29,7 @@ override NO_TRACE_MAKE:=$(_SINGLE)$(NO_TRACE_MAKE)
target_params = $(subst +,$(space),$*)
param_get = $(patsubst $(1)=%,%,$(filter $(1)=%,$(2)))
+param_get_default = $(firstword $(call param_get,$(1),$(2)) $(3))
param_mangle = $(subst $(space),_,$(strip $(1)))
param_unmangle = $(subst _,$(space),$(1))