4 files changed, 9 insertions, 2 deletions
diff --git a/mk/build.mk b/mk/build.mk
index 9f2683642..00875e71d 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -127,7 +127,7 @@ clean:
 	$(MAKE) -C $(CONFIG) clean
 	for d in ${STAGING_PARENT_PFX}; do \
 		echo "clean: entering $$d" ; \
-		for f in $$d/pkg/[a-z]*; do  \
+		for f in $$(ls $$d/pkg/[a-z]* 2>/dev/null); do  \
 			echo "clean: cleaning for $$f" ; \
 			while read file ; do \
 				rm $$d/target/$$file ; \
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/modules.mk b/mk/modules.mk
index ca494e300..875b93c62 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -751,6 +751,10 @@ $(eval $(call KMOD_template,OCF_TALITOS,cryptodev-talitos,\
 #
 # Filesystems
 #
+$(eval $(call KMOD_template,AUFS_FS,fs-aufs,\
+	$(MODULES_DIR)/kernel/fs/aufs/aufs \
+,30))
+
 $(eval $(call KMOD_template,CIFS,fs-cifs,\
 	$(MODULES_DIR)/kernel/fs/cifs/cifs \
 ,30))
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