From 0198c6f4822aa8cdd04ca912c51527c0e6d65d51 Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Tue, 29 Nov 2022 14:18:20 +0800 Subject: [PATCH] meta-encrypted-storage: check luks DISTRO_FEATURES Fix the yocto compliance issue: INFO: test_signatures (common.CommonCheckLayer) INFO: ... FAIL Stdout: Loaded 2790 entries from dependency cache. INFO: Traceback (most recent call last): File "/build/layers/oe-core/scripts/lib/checklayer/cases/common.py", line 81, in test_signatures self.fail('Adding layer %s changed signatures.\n%s' % (self.tc.layer['name'], msg)) AssertionError: Adding layer meta-encrypted-storage changed signatures. 208 signatures changed, initial differences (first hash before, second after): cryptsetup:do_package: f0fa7d14534fb27c9caf639036338bbfa270ac29524b30d699f8f8ea0ec8cb02 -> 35d3ffd44373fc052d5bf7c0b1e649b585e49638ddc21109651e9602786aa87b bitbake-diffsigs --task cryptsetup do_package --signature f0fa7d14534fb27c9caf639036338bbfa270ac29524b30d699f8f8ea0ec8cb02 35d3ffd44373fc052d5bf7c0b1e649b585e49638ddc21109651e9602786aa87b NOTE: Starting bitbake server... basehash changed from 69f1e7096d59cdc20c48b2c7591a3d5c5abbdcf4452c2a2dbdd84ed352054477 to e8cb4b995a71a2b37597a4cdd37b91fe2904895db51922664d2ac2ae1702aecc Variable RDEPENDS:cryptsetup value changed: " libdevmapper {+lvm2+} udev lvm2-udevrules" Variable RRECOMMENDS:cryptsetup value changed: " kernel-module-aes-generic kernel-module-dm-crypt kernel-module-md5 kernel-module-cbc kernel-module-sha256-generic kernel-module-xts {+lvm2-udevrules+}" Signed-off-by: Mingli Yu --- .../recipes-kernel/linux/linux-yocto-dev.bbappend | 2 +- .../recipes-kernel/linux/linux-yocto-rt_%.bbappend | 2 +- .../recipes-kernel/linux/linux-yocto_%.bbappend | 2 +- .../recipes-support/cryptsetup/cryptsetup-luks.inc | 2 ++ .../recipes-support/cryptsetup/cryptsetup_%.bbappend | 3 +-- meta-encrypted-storage/recipes-support/lvm2/lvm2-luks.inc | 7 +++++++ .../recipes-support/lvm2/lvm2_%.bbappend | 8 +------- 7 files changed, 14 insertions(+), 12 deletions(-) create mode 100644 meta-encrypted-storage/recipes-support/cryptsetup/cryptsetup-luks.inc create mode 100644 meta-encrypted-storage/recipes-support/lvm2/lvm2-luks.inc diff --git a/meta-encrypted-storage/recipes-kernel/linux/linux-yocto-dev.bbappend b/meta-encrypted-storage/recipes-kernel/linux/linux-yocto-dev.bbappend index 49d5d48..0d9f088 100644 --- a/meta-encrypted-storage/recipes-kernel/linux/linux-yocto-dev.bbappend +++ b/meta-encrypted-storage/recipes-kernel/linux/linux-yocto-dev.bbappend @@ -1 +1 @@ -include linux-yocto-luks.inc +include ${@bb.utils.contains('DISTRO_FEATURES', 'luks', '${BPN}-luks.inc', '', d)} diff --git a/meta-encrypted-storage/recipes-kernel/linux/linux-yocto-rt_%.bbappend b/meta-encrypted-storage/recipes-kernel/linux/linux-yocto-rt_%.bbappend index 49d5d48..0d9f088 100644 --- a/meta-encrypted-storage/recipes-kernel/linux/linux-yocto-rt_%.bbappend +++ b/meta-encrypted-storage/recipes-kernel/linux/linux-yocto-rt_%.bbappend @@ -1 +1 @@ -include linux-yocto-luks.inc +include ${@bb.utils.contains('DISTRO_FEATURES', 'luks', '${BPN}-luks.inc', '', d)} diff --git a/meta-encrypted-storage/recipes-kernel/linux/linux-yocto_%.bbappend b/meta-encrypted-storage/recipes-kernel/linux/linux-yocto_%.bbappend index 49d5d48..0d9f088 100644 --- a/meta-encrypted-storage/recipes-kernel/linux/linux-yocto_%.bbappend +++ b/meta-encrypted-storage/recipes-kernel/linux/linux-yocto_%.bbappend @@ -1 +1 @@ -include linux-yocto-luks.inc +include ${@bb.utils.contains('DISTRO_FEATURES', 'luks', '${BPN}-luks.inc', '', d)} diff --git a/meta-encrypted-storage/recipes-support/cryptsetup/cryptsetup-luks.inc b/meta-encrypted-storage/recipes-support/cryptsetup/cryptsetup-luks.inc new file mode 100644 index 0000000..693a68b --- /dev/null +++ b/meta-encrypted-storage/recipes-support/cryptsetup/cryptsetup-luks.inc @@ -0,0 +1,2 @@ +RDEPENDS:${PN} += "lvm2" +RRECOMMENDS:${PN}:append:class-target = " lvm2-udevrules" diff --git a/meta-encrypted-storage/recipes-support/cryptsetup/cryptsetup_%.bbappend b/meta-encrypted-storage/recipes-support/cryptsetup/cryptsetup_%.bbappend index 693a68b..c57ec50 100644 --- a/meta-encrypted-storage/recipes-support/cryptsetup/cryptsetup_%.bbappend +++ b/meta-encrypted-storage/recipes-support/cryptsetup/cryptsetup_%.bbappend @@ -1,2 +1 @@ -RDEPENDS:${PN} += "lvm2" -RRECOMMENDS:${PN}:append:class-target = " lvm2-udevrules" +require ${@bb.utils.contains('DISTRO_FEATURES', 'luks', '${BPN}-luks.inc', '', d)} diff --git a/meta-encrypted-storage/recipes-support/lvm2/lvm2-luks.inc b/meta-encrypted-storage/recipes-support/lvm2/lvm2-luks.inc new file mode 100644 index 0000000..b7db196 --- /dev/null +++ b/meta-encrypted-storage/recipes-support/lvm2/lvm2-luks.inc @@ -0,0 +1,7 @@ +# +# Copyright (C) 2019 Wind River Systems, Inc. +# + +FILESEXTRAPATHS:prepend := "${THISDIR}/lvm2:" + +SRC_URI += "file://0001-10-dm.rules.in-Fix-dmcrypt-hanging-on-hand-over-from.patch" diff --git a/meta-encrypted-storage/recipes-support/lvm2/lvm2_%.bbappend b/meta-encrypted-storage/recipes-support/lvm2/lvm2_%.bbappend index b7db196..c57ec50 100644 --- a/meta-encrypted-storage/recipes-support/lvm2/lvm2_%.bbappend +++ b/meta-encrypted-storage/recipes-support/lvm2/lvm2_%.bbappend @@ -1,7 +1 @@ -# -# Copyright (C) 2019 Wind River Systems, Inc. -# - -FILESEXTRAPATHS:prepend := "${THISDIR}/lvm2:" - -SRC_URI += "file://0001-10-dm.rules.in-Fix-dmcrypt-hanging-on-hand-over-from.patch" +require ${@bb.utils.contains('DISTRO_FEATURES', 'luks', '${BPN}-luks.inc', '', d)}