diff options
| author | Ovidiu Panait <ovidiu.panait@windriver.com> | 2019-12-12 14:25:45 +0200 |
|---|---|---|
| committer | Jia Zhang <zhang.jia@linux.alibaba.com> | 2019-12-13 09:01:39 +0800 |
| commit | e4e766aa4029d2e56ce6ba8d0b18d94a7ffaa99d (patch) | |
| tree | a3a12c907c8f1abbca1abc44dd59eb85e3597bb8 | |
| parent | 4602842eed5169487242dae2303264d5da16a77b (diff) | |
| download | meta-secure-core-e4e766aa4029d2e56ce6ba8d0b18d94a7ffaa99d.tar.gz | |
rpm-integrity: Use _append for PACKAGECONFIG
Currently, the PACKAGECONFIG assignment in rpm-integrity might overwrite
the previous contents of the variable.
Similar to systemd_%.bbappend and ovmf_%.bbappend, use _append to add
"imaevm" to PACKAGECONFIG when distro feature ima is enabled.
Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
| -rw-r--r-- | meta-integrity/recipes-devtools/rpm/rpm-integrity.inc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/meta-integrity/recipes-devtools/rpm/rpm-integrity.inc b/meta-integrity/recipes-devtools/rpm/rpm-integrity.inc index 3295a58..268af38 100644 --- a/meta-integrity/recipes-devtools/rpm/rpm-integrity.inc +++ b/meta-integrity/recipes-devtools/rpm/rpm-integrity.inc | |||
| @@ -1,6 +1,8 @@ | |||
| 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/rpm:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/rpm:" |
| 2 | 2 | ||
| 3 | PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES', 'ima', 'imaevm', '', d)}" | 3 | PACKAGECONFIG_append = " \ |
| 4 | ${@bb.utils.contains('DISTRO_FEATURES', 'ima', 'imaevm', '', d)} \ | ||
| 5 | " | ||
| 4 | 6 | ||
| 5 | # IMA signing support is provided by RPM plugin. | 7 | # IMA signing support is provided by RPM plugin. |
| 6 | EXTRA_OECONF_remove += "\ | 8 | EXTRA_OECONF_remove += "\ |