mirrors/meta-secure-core
1
0
Fork 0
mirror of https://github.com/jiazhang0/meta-secure-core.git synced 2026-07-16 20:56:58 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Kai
2017-10-27 20:57:45 +08:00
committed by Jia Zhang
parent a852a68227
commit 6aa83f98bc
2 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-integrity/recipes-devtools/rpm/rpm-integrity.inc
+22
View File
@@ -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 \
"
meta-integrity/recipes-devtools/rpm/rpm_%.bbappend
+1 -22
View File
@@ -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)}