isa/citadel
1
0
Fork 0
forked from brl/citadel
Code Pull Requests Activity

use ext4 for images

Browse Source
This commit is contained in:
Bruce Leidl 2019-04-02 15:51:11 -04:00
parent 3421901536
commit d623fa1746
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
meta-citadel/classes/citadel-image.bbclass
View File

@ -2,9 +2,9 @@
DEPENDS_append = " citadel-tools-native mtools-native cryptsetup-native coreutils-native" DEPENDS_append = " citadel-tools-native mtools-native cryptsetup-native coreutils-native"
# Block size must be 4096 or dm-verity won't work # Block size must be 4096 or dm-verity won't work
EXTRA_IMAGECMD_ext2 = "-i 4096 -b 4096" EXTRA_IMAGECMD_ext4 = "-i 4096 -b 4096"
IMAGE_FSTYPES = "ext2" IMAGE_FSTYPES = "ext4"
IMAGE_OVERHEAD_FACTOR = "1.1" IMAGE_OVERHEAD_FACTOR = "1.2"
inherit image inherit image
@ -17,7 +17,7 @@ image-type = "${CITADEL_IMAGE_TYPE}"
channel = "${CITADEL_IMAGE_CHANNEL}" channel = "${CITADEL_IMAGE_CHANNEL}"
version = ${CITADEL_IMAGE_VERSION} version = ${CITADEL_IMAGE_VERSION}
timestamp = "${DATETIME}" timestamp = "${DATETIME}"
source = "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.ext2" source = "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.ext4"
compress = ${CITADEL_IMAGE_COMPRESS} compress = ${CITADEL_IMAGE_COMPRESS}
EOF EOF
@ -31,11 +31,11 @@ EOF
else else
fname="citadel-${CITADEL_IMAGE_TYPE}-${CITADEL_IMAGE_CHANNEL}-${ver}.img" fname="citadel-${CITADEL_IMAGE_TYPE}-${CITADEL_IMAGE_CHANNEL}-${ver}.img"
fi fi
citadel-image build ${B} citadel-mkimage ${B}
mv ${B}/${fname} ${IMGDEPLOYDIR} mv ${B}/${fname} ${IMGDEPLOYDIR}
} }
addtask do_citadel_mkimage after do_image_ext2 before do_image_complete addtask do_citadel_mkimage after do_image_ext4 before do_image_complete
do_citadel_mkimage[cleandirs] = "${B}" do_citadel_mkimage[cleandirs] = "${B}"
do_citadel_mkimage[vardepsexclude] = "DATETIME" do_citadel_mkimage[vardepsexclude] = "DATETIME"