From: Mathias Kresin <dev@kresin.me>
Date: Sat, 3 Sep 2016 05:36:12 +0000 (+0200)
Subject: image: add support for k unit suffix to pad-offset
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b99a93ebaf0dc34ab0de452e3034b28f21085988;p=openwrt%2Fstaging%2Frmilecki.git

image: add support for k unit suffix to pad-offset

Allows to specificy the padding and offset in kilobytes to be
consistent with pad-to.

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

diff --git a/include/image-commands.mk b/include/image-commands.mk
index 40a9619c31c..3b9ea3ccba8 100644
--- a/include/image-commands.mk
+++ b/include/image-commands.mk
@@ -137,8 +137,8 @@ endef
 define Build/pad-offset
 	let \
 		size="$$(stat -c%s $@)" \
-		pad="$(word 1, $(1))" \
-		offset="$(word 2, $(1))" \
+		pad="$(subst k,* 1024,$(word 1, $(1)))" \
+		offset="$(subst k,* 1024,$(word 2, $(1)))" \
 		pad="(pad - ((size + offset) % pad)) % pad" \
 		newsize='size + pad'; \
 		dd if=$@ of=$@.new bs=$$newsize count=1 conv=sync