diff options
author | Kai <kai.7.kang@gmail.com> | 2017-10-27 20:57:45 +0800 |
---|---|---|
committer | Jia Zhang <qianyue.zj@alibaba-inc.com> | 2017-10-27 20:57:45 +0800 |
commit | 6aa83f98bc1f989f72d4a6e60b433dfc7b2045ba (patch) | |
tree | af79f91e485aa06b43b46e0a6d84393c7b41685c | |
parent | a852a682270455fff886da8c2f3397a1516af2cb (diff) | |
download | meta-secure-core-6aa83f98bc1f989f72d4a6e60b433dfc7b2045ba.tar.gz |
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>
-rw-r--r-- | meta-integrity/recipes-devtools/rpm/rpm-integrity.inc | 22 | ||||
-rw-r--r-- | meta-integrity/recipes-devtools/rpm/rpm_%.bbappend | 23 |
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 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/rpm:" | ||
2 | |||
3 | SRC_URI += "\ | ||
4 | file://0001-Pass-sign-arguments-to-signature-deletion-too.patch \ | ||
5 | file://0002-Beat-some-sense-into-rpmsign-cli-parsing.patch \ | ||
6 | file://0003-Fix-thinko-typo-in-file-signing-error-message.patch \ | ||
7 | file://0004-Bury-get_fskpass-inside-rpmsign-utility.patch \ | ||
8 | file://0005-Dont-advertise-file-signing-features-if-support-not-.patch \ | ||
9 | file://0006-Remove-bunch-of-redundant-environ-declarations.patch \ | ||
10 | file://0007-Dont-push-NULL-bodied-macros-in-case-of-get_fskpass-.patch \ | ||
11 | file://0008-Move-key-password-helper-variables-to-local-scope.patch \ | ||
12 | file://0009-Use-rpm-memory-allocator-so-we-dont-need-to-check-fo.patch \ | ||
13 | file://0010-Fix-a-number-of-problems-in-get_fskpass.patch \ | ||
14 | file://0011-Bump-file-digests-to-SHA256-by-default-finally.patch \ | ||
15 | " | ||
16 | |||
17 | PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES', 'ima', 'imaevm', '', d)}" | ||
18 | |||
19 | IMA signing support is provided by RPM plugin. | ||
20 | EXTRA_OECONF_remove += "\ | ||
21 | --disable-plugins \ | ||
22 | " | ||
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 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/rpm:" | require ${@bb.utils.contains('DISTRO_FEATURES', 'ima', 'rpm-integrity.inc', '', d)} | |
2 | |||
3 | SRC_URI += "\ | ||
4 | file://0001-Pass-sign-arguments-to-signature-deletion-too.patch \ | ||
5 | file://0002-Beat-some-sense-into-rpmsign-cli-parsing.patch \ | ||
6 | file://0003-Fix-thinko-typo-in-file-signing-error-message.patch \ | ||
7 | file://0004-Bury-get_fskpass-inside-rpmsign-utility.patch \ | ||
8 | file://0005-Dont-advertise-file-signing-features-if-support-not-.patch \ | ||
9 | file://0006-Remove-bunch-of-redundant-environ-declarations.patch \ | ||
10 | file://0007-Dont-push-NULL-bodied-macros-in-case-of-get_fskpass-.patch \ | ||
11 | file://0008-Move-key-password-helper-variables-to-local-scope.patch \ | ||
12 | file://0009-Use-rpm-memory-allocator-so-we-dont-need-to-check-fo.patch \ | ||
13 | file://0010-Fix-a-number-of-problems-in-get_fskpass.patch \ | ||
14 | file://0011-Bump-file-digests-to-SHA256-by-default-finally.patch \ | ||
15 | " | ||
16 | |||
17 | PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES', 'ima', 'imaevm', '', d)}" | ||
18 | |||
19 | # IMA signing support is provided by RPM plugin. | ||
20 | EXTRA_OECONF_remove += "\ | ||
21 | --disable-plugins \ | ||
22 | " | ||