diff options
| author | Mathias Kresin <dev@kresin.me> | 2019-01-25 21:30:36 +0100 |
|---|---|---|
| committer | Mathias Kresin <dev@kresin.me> | 2019-01-26 15:23:36 +0100 |
| commit | 0ffa6bae0af0057000bdc3f57603f0a8b539855e (patch) | |
| tree | 83ab95c81dfc6e6dfcc0b105a5811e4a44ea76a5 /target/linux | |
| parent | ec0d58ede42e5c8d9829933dd98265e452b7c63d (diff) | |
| download | upstream-0ffa6bae0af0057000bdc3f57603f0a8b539855e.tar.gz upstream-0ffa6bae0af0057000bdc3f57603f0a8b539855e.tar.bz2 upstream-0ffa6bae0af0057000bdc3f57603f0a8b539855e.zip | |
gemini: don't hardcode image filenames
Use the existing image build code mechanisms to specify the image output
filename.
Signed-off-by: Mathias Kresin <dev@kresin.me>
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/gemini/image/Makefile | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/target/linux/gemini/image/Makefile b/target/linux/gemini/image/Makefile index 5f987875d3..f3086dee78 100644 --- a/target/linux/gemini/image/Makefile +++ b/target/linux/gemini/image/Makefile @@ -12,12 +12,14 @@ include $(INCLUDE_DIR)/image.mk # D-Link devices. define Build/dir685-images mkwrggimg -i $(IMAGE_KERNEL) \ - -o $(BIN_DIR)/$(IMG_PREFIX)-dir685-fwupdate.bin \ + -o $@.new \ -d /dev/mtdblock/1 \ -s wrgns01_dlwbr_dir685RBWW \ -v 'N/A' \ -m dir685 \ -B 96bb + + mv $@.new $@ endef # Build D-Link DNS-313 images using the special header tool. @@ -35,7 +37,7 @@ define Build/dns313-images dns313-header $(IMAGE_KERNEL) \ $(BIN_DIR)/.boot/zImage rm -f $(BIN_DIR)/.boot/dummyfile - (cd $(BIN_DIR); tar -czf $(IMG_PREFIX)-dns313-bootpart.tar.gz .boot) + (cd $(BIN_DIR); tar -czf $@ .boot) if [ -d $(BIN_DIR)/.boot ] ; then rm -rf $(BIN_DIR)/.boot ; fi endef @@ -96,16 +98,16 @@ define Device/dlink-dir-685 DEVICE_PACKAGES := $(GEMINI_NAS_PACKAGES) \ kmod-switch-rtl8366rb swconfig \ rt2800-pci - IMAGES += dir685-image - IMAGE/dir685-image := dir685-images + IMAGES := fwupdate.bin + IMAGE/fwupdate.bin := dir685-images endef TARGET_DEVICES += dlink-dir-685 define Device/dlink-dns-313 DEVICE_TITLE := D-Link DNS-313 1-Bay Network Storage Enclosure DEVICE_PACKAGES := $(GEMINI_NAS_PACKAGES) - IMAGES += dns313-image - IMAGE/dns313-image := dns313-images + IMAGES := dns313-bootpart.tar.gz + IMAGE/dns313-bootpart.tar.gz := dns313-images endef TARGET_DEVICES += dlink-dns-313 |