diff options
| author | Felix Fietkau <nbd@nbd.name> | 2016-07-30 14:19:11 +0200 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2016-07-31 12:25:25 +0200 |
| commit | 63b525dd6b209af5554a2d053efd4b3ce6f60c9c (patch) | |
| tree | b4bf688fa7ce3b9cbbad996dd0d60730eacbede9 /target/linux/ar71xx | |
| parent | 9201e88f518dbe5246aa2f77342175805ef10cdd (diff) | |
| download | upstream-63b525dd6b209af5554a2d053efd4b3ce6f60c9c.tar.gz upstream-63b525dd6b209af5554a2d053efd4b3ce6f60c9c.tar.bz2 upstream-63b525dd6b209af5554a2d053efd4b3ce6f60c9c.zip | |
image: add a helper variable for getting kernel/rootfs from within image Build/* templates
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'target/linux/ar71xx')
| -rw-r--r-- | target/linux/ar71xx/image/generic.mk | 12 | ||||
| -rw-r--r-- | target/linux/ar71xx/image/tp-link.mk | 2 | ||||
| -rw-r--r-- | target/linux/ar71xx/image/ubnt.mk | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/ar71xx/image/generic.mk b/target/linux/ar71xx/image/generic.mk index 6e5ef2b68b..bd92a8413d 100644 --- a/target/linux/ar71xx/image/generic.mk +++ b/target/linux/ar71xx/image/generic.mk @@ -476,8 +476,8 @@ TARGET_DEVICES += hiwifi-hc6361 # - 28 bytes seama_header # - 36 bytes of META data (4-bytes aligned) define Build/seama-factory - ( dd if=/dev/zero bs=64 count=1; cat $(word 1,$^) ) >$@.loader.tmp - ( dd if=$@.loader.tmp bs=64k conv=sync; dd if=$(word 2,$^) ) >$@.tmp.0 + ( dd if=/dev/zero bs=64 count=1; cat $(IMAGE_KERNEL) ) >$@.loader.tmp + ( dd if=$@.loader.tmp bs=64k conv=sync; dd if=$(IMAGE_ROOTFS) ) >$@.tmp.0 tail -c +65 $@.tmp.0 >$@.tmp.1 $(STAGING_DIR_HOST)/bin/seama \ -i $@.tmp.1 \ @@ -491,10 +491,10 @@ endef define Build/seama-sysupgrade $(STAGING_DIR_HOST)/bin/seama \ - -i $(word 1,$^) \ + -i $(IMAGE_KERNEL) \ -m "dev=/dev/mtdblock/1" -m "type=firmware" - ( dd if=$(word 1,$^).seama bs=64k conv=sync; dd if=$(word 2,$^) ) >$@ - rm -f $(word 1,$^).seama + ( dd if=$(IMAGE_KERNEL).seama bs=64k conv=sync; dd if=$(IMAGE_ROOTFS) ) >$@ + rm -f $(IMAGE_KERNEL).seama endef define Build/seama-initramfs @@ -505,7 +505,7 @@ define Build/seama-initramfs endef define Build/seama-pad-rootfs - $(STAGING_DIR_HOST)/bin/padjffs2 $(word 2,$^) -c 64 >>$@ + $(STAGING_DIR_HOST)/bin/padjffs2 $(IMAGE_ROOTFS) -c 64 >>$@ endef define Device/seama diff --git a/target/linux/ar71xx/image/tp-link.mk b/target/linux/ar71xx/image/tp-link.mk index f93eec64f8..5fb1095bd2 100644 --- a/target/linux/ar71xx/image/tp-link.mk +++ b/target/linux/ar71xx/image/tp-link.mk @@ -12,7 +12,7 @@ define Build/mktplinkfw -$(STAGING_DIR_HOST)/bin/mktplinkfw \ -H $(TPLINK_HWID) -W $(TPLINK_HWREV) -F $(TPLINK_FLASHLAYOUT) -N OpenWrt -V $(REVISION) \ -m $(TPLINK_HEADER_VERSION) \ - -k $(word 1,$^) \ + -k $(IMAGE_KERNEL) \ -r $@ \ -o $@.new \ -j -X 0x40000 \ diff --git a/target/linux/ar71xx/image/ubnt.mk b/target/linux/ar71xx/image/ubnt.mk index ab245df987..98c9ca0066 100644 --- a/target/linux/ar71xx/image/ubnt.mk +++ b/target/linux/ar71xx/image/ubnt.mk @@ -7,7 +7,7 @@ define Build/mkubntimage $(STAGING_DIR_HOST)/bin/mkfwimage \ -B $(UBNT_BOARD) -v $(UBNT_TYPE).$(UBNT_CHIP).v6.0.0-OpenWrt-$(REVISION) \ - -k $(word 1,$^) \ + -k $(IMAGE_KERNEL) \ -r $@ \ -o $@ endef |