X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=include%2Fimage-commands.mk;h=e7db7128b4cac775ca424c96bebf1405db6937b4;hb=1444e31a7bf54b796f8ef88e77fee255b959c6bb;hp=3b091f26aca1e39482639015471531c44cfd921a;hpb=9b0e8d0aa464f51460ff33179e247f1071564471;p=oweals%2Fopenwrt.git

diff --git a/include/image-commands.mk b/include/image-commands.mk
index 3b091f26ac..e7db7128b4 100644
--- a/include/image-commands.mk
+++ b/include/image-commands.mk
@@ -269,12 +269,19 @@ define Build/xor-image
 endef
 
 define Build/check-size
-	@[ $$(($(subst k,* 1024,$(subst m, * 1024k,$(1))))) -ge "$$(stat -c%s $@)" ] || { \
+	@[ $$(($(subst k,* 1024,$(subst m, * 1024k,$(if $(1),$(1),$(IMAGE_SIZE)))))) -ge "$$(stat -c%s $@)" ] || { \
 		echo "WARNING: Image file $@ is too big" >&2; \
 		rm -f $@; \
 	}
 endef
 
+define Build/check-kernel-size
+	@[ $$(($(subst k,* 1024,$(subst m, * 1024k,$(1))))) -ge "$$(stat -c%s $(IMAGE_KERNEL))" ] || { \
+		echo "WARNING: Kernel for $@ is too big > $(1)" >&2; \
+		rm -f $@; \
+	}
+endef
+
 define Build/combined-image
 	-sh $(TOPDIR)/scripts/combined-image.sh \
 		"$(IMAGE_KERNEL)" \
@@ -407,3 +414,10 @@ define Build/kernel2minor
 	kernel2minor -k $@ -r $@.new $(1)
 	mv $@.new $@
 endef
+
+# Convert a raw image into a $1 type image.
+# E.g. | qemu-image vdi
+define Build/qemu-image
+	qemu-img convert -f raw -O $1 $@ $@.new
+	@mv $@.new $@
+endef