From: Mathias Kresin <dev@kresin.me>
Date: Tue, 13 Sep 2016 05:18:10 +0000 (+0200)
Subject: image: use check-size from new image build code
X-Git-Tag: v17.01.0-rc1~1448
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=commitdiff_plain;h=14b40d61e13ce0408d5ed9dff2ad3a18ab0c2471;hp=1cd0a4c688f02918cb96ff7f5f21cddc281d4f2c;ds=sidebyside

image: use check-size from new image build code

Use the new image build code and deduplicate the code.

Signed-off-by: Mathias Kresin <dev@kresin.me>
---

diff --git a/include/image.mk b/include/image.mk
index 324582a5d4..261f0f8aea 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -422,13 +422,6 @@ define Device/Build/initramfs
 endef
 endif
 
-define Device/Build/check_size
-	@[ $$(($(subst k,* 1024,$(subst m, * 1024k,$(1))))) -ge "$$(stat -c%s $@)" ] || { \
-		echo "WARNING: Image file $@ is too big" >&2; \
-		rm -f $@; \
-	}
-endef
-
 define Device/Build/compile
   $$(_COMPILE_TARGET): $(KDIR)/$(1)
   $(eval $(call Device/Export,$(KDIR)/$(1)))
@@ -450,7 +443,7 @@ define Device/Build/kernel
     $$(KDIR_KERNEL_IMAGE): $(KDIR)/$$(KERNEL_NAME) $(CURDIR)/Makefile $$(KERNEL_DEPENDS)
 	@rm -f $$@
 	$$(call concat_cmd,$$(KERNEL))
-	$$(if $$(KERNEL_SIZE),$$(call Device/Build/check_size,$$(KERNEL_SIZE)))
+	$$(if $$(KERNEL_SIZE),$$(call Build/check-size,$$(KERNEL_SIZE)))
   endif
 endef