kernel: update 3.18 to 3.18.17

[openwrt/svn-archive/archive.git] / include / image.mk

diff --git a/include/image.mk b/include/image.mk
index 36c6c63320ffc8c9d52161452b808ef445c947b3..814e7dc5d17f4e651af03e1c3aba307da4375cf2 100644 (file)
--- a/include/image.mk
+++ b/include/image.mk
@@ -304,6 +304,11 @@ define Build/append-rootfs
        dd if=$(word 2,$^) $(if $(1),bs=$(1) conv=sync) >> $@
 endef
 
+define Build/pad-to
+       dd if=$@ of=$@.new bs=$(1) conv=sync
+       mv $@.new $@
+endef
+
 define Build/pad-rootfs
        $(call prepare_generic_squashfs,$@ $(1))
 endef
@@ -326,6 +331,13 @@ define Build/check-size
        }
 endef
 
+define Build/combined-image
+       -sh $(TOPDIR)/scripts/combined-image.sh \
+               "$(word 1,$^)" \
+               "$@" \
+               "$@.new"
+       @mv $@.new $@
+endef
 
 define Device/Init
   PROFILES := $(PROFILE)
@@ -464,6 +476,9 @@ define BuildImage
     image_prepare: compile
                mkdir -p $(KDIR)/tmp
                $(call Image/Prepare)
+  else
+    image_prepare:
+               mkdir -p $(KDIR)/tmp
   endif
 
   mkfs_prepare: image_prepare