From 06f4d3eece142e41a45538ca9ea9c9d60cf4551a Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Wed, 26 Jun 2019 11:20:37 +0800 Subject: [PATCH] Revert "rpm: always include rpm-integrity.inc for RPM signing" This reverts commit 0477a93cf98bd2946320d90cadb54a0fc2c2c0df. Run yocto-check-layer-wrapper to check layer compliance of Yocto will report the signatures error: rpm-native:do_configure: c2221ee127ea61f99a6062ffadb1fe05ca44b9200e38a91521a5a28d4f13140b -> d955da8ce20c8dbc0c5bc9b7569dd459484b0e24ba1e4c66828a84e919025eca bitbake-diffsigs --task rpm-native do_configure --signature c2221ee127ea61f99a6062ffadb1fe05ca44b9200e38a91521a5a28d4f13140b d955da8ce20c8dbc0c5bc9b7569dd459484b0e24ba1e4c66828a84e919025eca Revert the patch to fix it. Signed-off-by: Yi Zhao --- meta-integrity/recipes-devtools/rpm/rpm_%.bbappend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-integrity/recipes-devtools/rpm/rpm_%.bbappend b/meta-integrity/recipes-devtools/rpm/rpm_%.bbappend index af1c793..d71ca78 100644 --- a/meta-integrity/recipes-devtools/rpm/rpm_%.bbappend +++ b/meta-integrity/recipes-devtools/rpm/rpm_%.bbappend @@ -1 +1 @@ -require rpm-integrity.inc +require ${@bb.utils.contains('DISTRO_FEATURES', 'ima', 'rpm-integrity.inc', '', d)}