encrypted-storage: use luks as the feature name for current implementation

encrypted-storage layer will include more security features about encrypted
storage so the term "encrypted-storage" won't be used to specify a dedicated
technology term such as "LUKS".

Signed-off-by: Jia Zhang <lans.zhang2008@gmail.com>
This commit is contained in:
Jia Zhang
2017-08-20 15:31:11 +08:00
parent cbdefad44c
commit b1e14f4e88
14 changed files with 29 additions and 30 deletions
@@ -1,8 +0,0 @@
DESCRIPTION = "The packages used for encrypted storage in initramfs."
require packagegroup-encrypted-storage.inc
RDEPENDS_${PN} += "\
cryptfs-tpm2-initramfs \
packagegroup-tpm2-initramfs \
"
@@ -0,0 +1,8 @@
DESCRIPTION = "The packages used for luks in initramfs."
require packagegroup-luks.inc
RDEPENDS_${PN} += "\
cryptfs-tpm2-initramfs \
packagegroup-tpm2-initramfs \
"
@@ -1,6 +1,6 @@
DESCRIPTION = "The packages used for encrypted storage."
DESCRIPTION = "The packages used for LUKS."
require packagegroup-encrypted-storage.inc
require packagegroup-luks.inc
# Install the minimal stuffs only for the linux rootfs.
# The common packages shared between initramfs and rootfs
@@ -1,4 +1,4 @@
#PACKAGECONFIG_append += "\
# ${@bb.utils.contains('DISTRO_FEATURES', 'encrypted-storage', \
# ${@bb.utils.contains('DISTRO_FEATURES', 'luks', \
# 'cryptsetup', '', d)} \
#"
@@ -1,6 +1,6 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/linux-yocto:"
SRC_URI += "\
${@bb.utils.contains('DISTRO_FEATURES', 'encrypted-storage', \
${@bb.utils.contains('DISTRO_FEATURES', 'luks', \
'file://dmcrypt.scc file://dmcrypt.cfg', '', d)} \
"
@@ -1 +1 @@
include linux-yocto-encrypted-storage.inc
include linux-yocto-luks.inc
@@ -1 +1 @@
include linux-yocto-encrypted-storage.inc
include linux-yocto-luks.inc
@@ -44,7 +44,7 @@ PARALLEL_MAKE = ""
do_install() {
oe_runmake install DESTDIR="${D}"
if [ "${@bb.utils.contains('DISTRO_FEATURES', 'encrypted-storage', '1', '0', d)}" = "1" ]; then
if [ "${@bb.utils.contains('DISTRO_FEATURES', 'luks', '1', '0', d)}" = "1" ]; then
install -m 0500 "${S}/scripts/init.cryptfs" "${D}"
fi
}