X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=include%2Fimage-commands.mk;h=6386e55b7958b36945385e84a519f0cb1a59c764;hb=f7670a2d07ec795e82d8acc0e58b86e958cc289a;hp=3b9ea3ccba887fe7cc32ed657ec2543c25feec7f;hpb=b99a93ebaf0dc34ab0de452e3034b28f21085988;p=openwrt%2Fstaging%2Fdedeckeh.git

diff --git a/include/image-commands.mk b/include/image-commands.mk
index 3b9ea3ccba..6386e55b79 100644
--- a/include/image-commands.mk
+++ b/include/image-commands.mk
@@ -103,11 +103,11 @@ define Build/patch-cmdline
 endef
 
 define Build/append-kernel
-	dd if=$(IMAGE_KERNEL) $(if $(1),bs=$(1) conv=sync) >> $@
+	dd if=$(IMAGE_KERNEL) >> $@
 endef
 
 define Build/append-rootfs
-	dd if=$(IMAGE_ROOTFS) $(if $(1),bs=$(1) conv=sync) >> $@
+	dd if=$(IMAGE_ROOTFS) >> $@
 endef
 
 define Build/append-ubi
@@ -117,7 +117,7 @@ define Build/append-ubi
 		$(foreach part,$(UBINIZE_PARTS),--part $(part)) \
 		$(IMAGE_ROOTFS) \
 		$@.tmp \
-		-p $(BLOCKSIZE) -m $(PAGESIZE) \
+		-p $(BLOCKSIZE:%k=%KiB) -m $(PAGESIZE) \
 		$(if $(SUBPAGESIZE),-s $(SUBPAGESIZE)) \
 		$(if $(VID_HDR_OFFSET),-O $(VID_HDR_OFFSET)) \
 		$(UBINIZE_OPTS)
@@ -130,8 +130,13 @@ define Build/pad-to
 	mv $@.new $@
 endef
 
+define Build/pad-extra
+	dd if=/dev/zero bs=$(1) count=1 >> $@
+endef
+
 define Build/pad-rootfs
-	$(STAGING_DIR_HOST)/bin/padjffs2 $@ $(1) 4 8 16 64 128 256
+	$(STAGING_DIR_HOST)/bin/padjffs2 $@ $(1) \
+		$(if $(BLOCKSIZE),$(BLOCKSIZE:%k=%),4 8 16 64 128 256)
 endef
 
 define Build/pad-offset