diff options
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/image.mk | 4 | ||||
| -rw-r--r-- | mk/rootfs.mk | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/mk/image.mk b/mk/image.mk index e80ac5d1e..9c0053727 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -57,9 +57,11 @@ ${BIN_DIR}/${ROOTFSSQUASHFS}: ${TARGET_DIR} PATH='${TARGET_PATH}' \ mksquashfs ${TARGET_DIR} ${BUILD_DIR}/root.squashfs \ -nopad -noappend -root-owned $(MAKE_TRACE) - # padding of images is required cat ${BIN_DIR}/${DEVICE}-${ARCH}-kernel ${BUILD_DIR}/root.squashfs > \ ${BUILD_DIR}/${ROOTFSSQUASHFS} + # padding of images is required + dd if=${BUILD_DIR}/${ROOTFSSQUASHFS} of=${BIN_DIR}/${ROOTFSSQUASHFS} \ + bs=4063232 conv=sync $(MAKE_TRACE) imageclean: rm -f $(BIN_DIR)/$(DEVICE)-* diff --git a/mk/rootfs.mk b/mk/rootfs.mk index 67f2ec80c..4ab2f71e2 100644 --- a/mk/rootfs.mk +++ b/mk/rootfs.mk @@ -19,5 +19,6 @@ $(eval $(call rootfs_template,initramfs,INITRAMFS)) $(eval $(call rootfs_template,squashfs,SQUASHFS)) $(eval $(call rootfs_template,yaffs,YAFFS)) $(eval $(call rootfs_template,nfsroot,NFSROOT,root=/dev/nfs ip=dhcp)) +$(eval $(call rootfs_template,encrypted,ENCRYPTED)) export FS |