From 6b59f72907d0317cace3a93e47780231926c13f4 Mon Sep 17 00:00:00 2001
From: Bruce Leidl <bruce@subgraph.com>
Date: Sat, 5 Jan 2019 22:32:59 -0500
Subject: [PATCH] add cryptsetup-native as dependency, use symlinks to .ext2
 image files

---
 meta-citadel/classes/citadel-image.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-citadel/classes/citadel-image.bbclass b/meta-citadel/classes/citadel-image.bbclass
index 8c3bd8c..f52ffbf 100644
--- a/meta-citadel/classes/citadel-image.bbclass
+++ b/meta-citadel/classes/citadel-image.bbclass
@@ -1,5 +1,5 @@
 
-DEPENDS_append = " citadel-image-native mtools-native"
+DEPENDS_append = " citadel-image-native mtools-native cryptsetup-native"
 
 # Block size must be 4096 or dm-verity won't work
 EXTRA_IMAGECMD_ext2 = "-i 4096 -b 4096"
@@ -14,7 +14,7 @@ do_citadel_mkimage() {
 image-type = "${CITADEL_IMAGE_TYPE}"
 channel = "${CITADEL_IMAGE_CHANNEL}"
 version = ${CITADEL_IMAGE_VERSION}
-source = "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.ext2"
+source = "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.ext2"
 EOF
 
     ver=$(printf "%03d" ${CITADEL_IMAGE_VERSION})