diff options
author | niko.mauno@vaisala.com <niko.mauno@vaisala.com> | 2020-09-10 16:17:55 +0000 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2020-09-12 08:55:28 -0700 |
commit | 45e8b20cd022eb7b20d72c23db9fcc6824f08c7a (patch) | |
tree | d0584f071751145a6f6be87be7617cc2d7b08a7a /recipes-core/images | |
parent | 489f7c900c365e4b3198cff2f2fd7c38623b77e8 (diff) | |
download | meta-security-45e8b20cd022eb7b20d72c23db9fcc6824f08c7a.tar.gz |
dm-verity-image-initramfs: Use initramfs-framework
Switch from this layer's initramfs-dm-verity recipe to poky-provided
initramfs-framework suite to manage veritysetup et al.
This commit also removes initramfs-dm-verity recipe which is not
referred from elsewhere in this meta layer.
Also update the install path of dm-verity.env from /usr/share to
/usr/share/misc in order to better comply with FHS3.0, see
https://refspecs.linuxfoundation.org/FHS_3.0/fhs/ch04s11.html#usrsharemiscMiscellaneousArchitecture
Signed-off-by: Niko Mauno <niko.mauno@vaisala.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'recipes-core/images')
-rw-r--r-- | recipes-core/images/dm-verity-image-initramfs.bb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/recipes-core/images/dm-verity-image-initramfs.bb b/recipes-core/images/dm-verity-image-initramfs.bb index e791c19..6a1058d 100644 --- a/recipes-core/images/dm-verity-image-initramfs.bb +++ b/recipes-core/images/dm-verity-image-initramfs.bb | |||
@@ -4,7 +4,8 @@ DESCRIPTION = "Simple initramfs image for mounting the rootfs over the verity de | |||
4 | IMAGE_FEATURES = "" | 4 | IMAGE_FEATURES = "" |
5 | 5 | ||
6 | PACKAGE_INSTALL = " \ | 6 | PACKAGE_INSTALL = " \ |
7 | initramfs-dm-verity \ | 7 | initramfs-module-dmverity \ |
8 | initramfs-module-udev \ | ||
8 | base-files \ | 9 | base-files \ |
9 | busybox \ | 10 | busybox \ |
10 | util-linux-mount \ | 11 | util-linux-mount \ |
@@ -24,6 +25,6 @@ IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}" | |||
24 | inherit core-image | 25 | inherit core-image |
25 | 26 | ||
26 | deploy_verity_hash() { | 27 | deploy_verity_hash() { |
27 | install -D -m 0644 ${STAGING_VERITY_DIR}/${DM_VERITY_IMAGE}.${DM_VERITY_IMAGE_TYPE}.verity.env ${IMAGE_ROOTFS}${datadir}/dm-verity.env | 28 | install -D -m 0644 ${STAGING_VERITY_DIR}/${DM_VERITY_IMAGE}.${DM_VERITY_IMAGE_TYPE}.verity.env ${IMAGE_ROOTFS}${datadir}/misc/dm-verity.env |
28 | } | 29 | } |
29 | IMAGE_PREPROCESS_COMMAND += "deploy_verity_hash;" | 30 | IMAGE_PREPROCESS_COMMAND += "deploy_verity_hash;" |