dm-verity-initramfs-image: Cosmetic improvements

- revise declaration ordering as suggested by oe-stylize.py
 - sort PACKAGE_INSTALL entries in alphabetic order
 - split long command line in deploy_verity_hash()

Signed-off-by: Niko Mauno <niko.mauno@vaisala.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
niko.mauno@vaisala.com
2020-09-10 16:17:56 +00:00
committed by Armin Kuster
parent 45e8b20cd0
commit 1d21cec5fd
@@ -1,19 +1,21 @@
DESCRIPTION = "Simple initramfs image for mounting the rootfs over the verity device mapper." DESCRIPTION = "Simple initramfs image for mounting the rootfs over the verity device mapper."
inherit core-image
PACKAGE_INSTALL = " \
base-files \
busybox \
cryptsetup \
initramfs-module-dmverity \
initramfs-module-udev \
lvm2-udevrules \
udev \
util-linux-mount \
"
# We want a clean, minimal image. # We want a clean, minimal image.
IMAGE_FEATURES = "" IMAGE_FEATURES = ""
PACKAGE_INSTALL = " \
initramfs-module-dmverity \
initramfs-module-udev \
base-files \
busybox \
util-linux-mount \
udev \
cryptsetup \
lvm2-udevrules \
"
# Can we somehow inspect reverse dependencies to avoid these variables? # Can we somehow inspect reverse dependencies to avoid these variables?
do_image[depends] += "${DM_VERITY_IMAGE}:do_image_${DM_VERITY_IMAGE_TYPE}" do_image[depends] += "${DM_VERITY_IMAGE}:do_image_${DM_VERITY_IMAGE_TYPE}"
@@ -22,9 +24,9 @@ do_image[nostamp] = "1"
IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}" IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}"
inherit core-image
deploy_verity_hash() { deploy_verity_hash() {
install -D -m 0644 ${STAGING_VERITY_DIR}/${DM_VERITY_IMAGE}.${DM_VERITY_IMAGE_TYPE}.verity.env ${IMAGE_ROOTFS}${datadir}/misc/dm-verity.env install -D -m 0644 \
${STAGING_VERITY_DIR}/${DM_VERITY_IMAGE}.${DM_VERITY_IMAGE_TYPE}.verity.env \
${IMAGE_ROOTFS}${datadir}/misc/dm-verity.env
} }
IMAGE_PREPROCESS_COMMAND += "deploy_verity_hash;" IMAGE_PREPROCESS_COMMAND += "deploy_verity_hash;"