brl/citadel
1
0
Fork 2
Code Issues Pull Requests 2 Packages Projects Releases Wiki Activity

read kernel id from a file, make compression optional

Browse Source
This commit is contained in:
Bruce Leidl 2019-01-15 12:05:28 -05:00
parent d73cd7d529
commit 9d72f9638b
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,14 +4,12 @@ DEPENDS_append = " citadel-image-native mtools-native cryptsetup-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_ext2 = "-i 4096 -b 4096"
IMAGE_FSTYPES = "ext2" IMAGE_FSTYPES = "ext2"
IMAGE_OVERHEAD_FACTOR = "1.1"
inherit image inherit image
CITADEL_IMAGE_CHANNEL ??= "dev" CITADEL_IMAGE_CHANNEL ??= "dev"
CITADEL_IMAGE_COMPRESS ??= "true"
kernel_id() {
sha256sum ${DEPLOY_DIR_IMAGE}/bzImage-intel-corei7-64.bin | cut -d' ' -f1
}
do_citadel_mkimage() { do_citadel_mkimage() {
cat > ${B}/mkimage.conf << EOF cat > ${B}/mkimage.conf << EOF
@ -20,12 +18,13 @@ 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}.ext2"
compress = ${CITADEL_IMAGE_COMPRESS}
EOF EOF
ver=$(printf "%03d" ${CITADEL_IMAGE_VERSION}) ver=$(printf "%03d" ${CITADEL_IMAGE_VERSION})
if [ "${CITADEL_IMAGE_TYPE}" = "kernel" ]; then if [ "${CITADEL_IMAGE_TYPE}" = "kernel" ]; then
KERNEL_ID=$(kernel_id) KERNEL_ID=$(cat ${DEPLOY_DIR_IMAGE}/kernel.id)
echo "kernel-version = \"${CITADEL_KERNEL_VERSION}\"" >> ${B}/mkimage.conf echo "kernel-version = \"${CITADEL_KERNEL_VERSION}\"" >> ${B}/mkimage.conf
echo "kernel-id = \"${KERNEL_ID}\"" >> ${B}/mkimage.conf echo "kernel-id = \"${KERNEL_ID}\"" >> ${B}/mkimage.conf
fname="citadel-kernel-${CITADEL_KERNEL_VERSION}-${CITADEL_IMAGE_CHANNEL}-${ver}.img" fname="citadel-kernel-${CITADEL_KERNEL_VERSION}-${CITADEL_IMAGE_CHANNEL}-${ver}.img"