ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-02-20 17:32:57 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

gemini: don't hardcode image filenames

Browse Source 
Use the existing image build code mechanisms to specify the image output
filename.

Signed-off-by: Mathias Kresin <dev@kresin.me>
This commit is contained in:
Mathias Kresin 2019-01-25 21:30:36 +01:00
parent ec0d58ede4
commit 0ffa6bae0a
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
target/linux/gemini/image/Makefile
View File

@ -12,12 +12,14 @@ include $(INCLUDE_DIR)/image.mk
# D-Link devices. # D-Link devices.
define Build/dir685-images define Build/dir685-images
mkwrggimg -i $(IMAGE_KERNEL) \ mkwrggimg -i $(IMAGE_KERNEL) \
-o $(BIN_DIR)/$(IMG_PREFIX)-dir685-fwupdate.bin \ -o $@.new \
-d /dev/mtdblock/1 \ -d /dev/mtdblock/1 \
-s wrgns01_dlwbr_dir685RBWW \ -s wrgns01_dlwbr_dir685RBWW \
-v 'N/A' \ -v 'N/A' \
-m dir685 \ -m dir685 \
-B 96bb -B 96bb
mv $@.new $@
endef endef
# Build D-Link DNS-313 images using the special header tool. # Build D-Link DNS-313 images using the special header tool.
@ -35,7 +37,7 @@ define Build/dns313-images
dns313-header $(IMAGE_KERNEL) \ dns313-header $(IMAGE_KERNEL) \
$(BIN_DIR)/.boot/zImage $(BIN_DIR)/.boot/zImage
rm -f $(BIN_DIR)/.boot/dummyfile 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 if [ -d $(BIN_DIR)/.boot ] ; then rm -rf $(BIN_DIR)/.boot ; fi
endef endef
@ -96,16 +98,16 @@ define Device/dlink-dir-685
DEVICE_PACKAGES := $(GEMINI_NAS_PACKAGES) \ DEVICE_PACKAGES := $(GEMINI_NAS_PACKAGES) \
kmod-switch-rtl8366rb swconfig \ kmod-switch-rtl8366rb swconfig \
rt2800-pci rt2800-pci
IMAGES += dir685-image IMAGES := fwupdate.bin
IMAGE/dir685-image := dir685-images IMAGE/fwupdate.bin := dir685-images
endef endef
TARGET_DEVICES += dlink-dir-685 TARGET_DEVICES += dlink-dir-685
define Device/dlink-dns-313 define Device/dlink-dns-313
DEVICE_TITLE := D-Link DNS-313 1-Bay Network Storage Enclosure DEVICE_TITLE := D-Link DNS-313 1-Bay Network Storage Enclosure
DEVICE_PACKAGES := $(GEMINI_NAS_PACKAGES) DEVICE_PACKAGES := $(GEMINI_NAS_PACKAGES)
IMAGES += dns313-image IMAGES := dns313-bootpart.tar.gz
IMAGE/dns313-image := dns313-images IMAGE/dns313-bootpart.tar.gz := dns313-images
endef endef
TARGET_DEVICES += dlink-dns-313 TARGET_DEVICES += dlink-dns-313