rpm: only apply bbappend file when ima in DISTRO_FEATURES (#27)

Rename bbappend file of rpm and only include it when image in
DISTRO_FEATURES. Plugin 'systemd' of rpm-native causes warning during
do rootfs:

| WARNING: wrlinux-image-glibc-std-1.0-r5 do_rootfs: [log_check] wrlinux-image-glibc-std: found 1 warning message in the logfile:
| [log_check] warning: Unable to get systemd shutdown inhibition lock: Socket name too long

Signed-off-by: Kai Kang <kai.kang@windriver.com>

2 files changed, 23 insertions, 22 deletions

diff --git a/meta-integrity/recipes-devtools/rpm/rpm-integrity.inc b/meta-integrity/recipes-devtools/rpm/rpm-integrity.inc
new file mode 100644
index 0000000..53fcbdb
--- /dev/null
+++ b/meta-integrity/recipes-devtools/rpm/rpm-integrity.inc
@@ -0,0 +1,22 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/rpm:"
+
+SRC_URI += "\
+    file://0001-Pass-sign-arguments-to-signature-deletion-too.patch \
+    file://0002-Beat-some-sense-into-rpmsign-cli-parsing.patch \
+    file://0003-Fix-thinko-typo-in-file-signing-error-message.patch \
+    file://0004-Bury-get_fskpass-inside-rpmsign-utility.patch \
+    file://0005-Dont-advertise-file-signing-features-if-support-not-.patch \
+    file://0006-Remove-bunch-of-redundant-environ-declarations.patch \
+    file://0007-Dont-push-NULL-bodied-macros-in-case-of-get_fskpass-.patch \
+    file://0008-Move-key-password-helper-variables-to-local-scope.patch \
+    file://0009-Use-rpm-memory-allocator-so-we-dont-need-to-check-fo.patch \
+    file://0010-Fix-a-number-of-problems-in-get_fskpass.patch \
+    file://0011-Bump-file-digests-to-SHA256-by-default-finally.patch \
+"
+
+PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES', 'ima', 'imaevm', '', d)}"
+
+IMA signing support is provided by RPM plugin.
+EXTRA_OECONF_remove += "\
+    --disable-plugins \
+"
diff --git a/meta-integrity/recipes-devtools/rpm/rpm_%.bbappend b/meta-integrity/recipes-devtools/rpm/rpm_%.bbappend
index aeb7c07..d71ca78 100644
--- a/meta-integrity/recipes-devtools/rpm/rpm_%.bbappend
+++ b/meta-integrity/recipes-devtools/rpm/rpm_%.bbappend
@@ -1,22 +1 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/rpm:"
-
-SRC_URI += "\
-    file://0001-Pass-sign-arguments-to-signature-deletion-too.patch \
-    file://0002-Beat-some-sense-into-rpmsign-cli-parsing.patch \
-    file://0003-Fix-thinko-typo-in-file-signing-error-message.patch \
-    file://0004-Bury-get_fskpass-inside-rpmsign-utility.patch \
-    file://0005-Dont-advertise-file-signing-features-if-support-not-.patch \
-    file://0006-Remove-bunch-of-redundant-environ-declarations.patch \
-    file://0007-Dont-push-NULL-bodied-macros-in-case-of-get_fskpass-.patch \
-    file://0008-Move-key-password-helper-variables-to-local-scope.patch \
-    file://0009-Use-rpm-memory-allocator-so-we-dont-need-to-check-fo.patch \
-    file://0010-Fix-a-number-of-problems-in-get_fskpass.patch \
-    file://0011-Bump-file-digests-to-SHA256-by-default-finally.patch \
-"
-
-PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES', 'ima', 'imaevm', '', d)}"
-
-# IMA signing support is provided by RPM plugin.
-EXTRA_OECONF_remove += "\
-    --disable-plugins \
-"
+require ${@bb.utils.contains('DISTRO_FEATURES', 'ima', 'rpm-integrity.inc', '', d)}