ar71xx: stop image building if a loader is missing

[openwrt.git] / target / linux / ar71xx / image / Makefile

diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
index f697f02..8fcaa08 100644 (file)
--- a/target/linux/ar71xx/image/Makefile
+++ b/target/linux/ar71xx/image/Makefile
@@ -273,7 +273,7 @@ define Image/Build/UBNTXM
        $(call Sysupgrade/KRuImage,$(1),$(2),1048576,6684672)
        dd if=$(KDIR_TMP)/vmlinux-$(2).uImage of=$(KDIR_TMP)/vmlinux-$(2).uImage.bin bs=1024k conv=sync
        -$(STAGING_DIR_HOST)/bin/mkfwimage \
-               -B $(4) -v $(5).$(6).v5.x.x-OpenWrt-$(REVISION) \
+               -B $(4) -v $(5).$(6).v6.0.0-OpenWrt-$(REVISION) \
                -k $(KDIR_TMP)/vmlinux-$(2).uImage.bin \
                -r $(BIN_DIR)/$(IMG_PREFIX)-root.$(1) \
                -o $(call factoryname,$(1),$(2))
@@ -299,6 +299,7 @@ define Image/Build/Planex/loader
 endef
 
 define Image/Build/Planex
+       [ -e "$(KDIR)/loader-$(2).gz" ]
        $(call MkuImage,gzip,,$(KDIR)/loader-$(2).gz,$(KDIR_TMP)/vmlinux-$(2).uImage)
        $(call MkuImageOKLI,$(2))
        ( \
@@ -338,6 +339,7 @@ define Image/Build/TPLINKOLD/loader
 endef
 
 define Image/Build/TPLINKOLD
+       [ -e "$(KDIR)/loader-$(2).gz" ]
        $(call MkuImageOKLI,$(2))
        ( \
                dd if=$(KDIR)/loader-$(2).gz bs=7680 count=1 conv=sync; \
@@ -368,6 +370,7 @@ define Image/Build/TPLINK/loader
 endef
 
 define Image/Build/TPLINK
+       [ -e "$(KDIR)/loader-$(2).gz" ]
        $(call MkuImageOKLI,$(2))
        ( \
                dd if=$(KDIR)/loader-$(2).gz bs=7680 count=1 conv=sync; \