diff options
| author | Andrew Geissler <geissonator@yahoo.com> | 2021-07-23 19:56:22 +0300 |
|---|---|---|
| committer | Andrew Geissler <geissonator@yahoo.com> | 2021-07-28 20:22:04 +0300 |
| commit | 59125e0dc92e9e1d6f103f91c865ad6f6c1f51f6 (patch) | |
| tree | 4910bed43893ebe31491cb8cea41fa82733ecddd /meta-security/recipes-core | |
| parent | ad7fa35594a3fae494741eb1eedb30b3cef38b1f (diff) | |
| download | openbmc-59125e0dc92e9e1d6f103f91c865ad6f6c1f51f6.tar.xz | |
meta-security: subtree update:46f7e7acbe..152cdb506b
Anton Antonov (1):
Do not use clang toolchain in Parsec recipes
Armin Kuster (9):
initramfs-framework: fix typo in conditional
ssshgaurd: add packaage
packagegroup-core-security: add sshguard
initramfs-framework: rename files dir
sssd: update to 2.5.1
suricata: update to 6.0.3
kas/kas-security-alt.yml: add meta-rust
.gitlab-ci.yml: fix qemux86 musl order
tpm-tools: fix build issue
Yi Zhao (2):
apparmor: upgrade 3.0 -> 3.0.1
apparmor: use its own initscript and service files
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: Idf435d7f6b767d87ae2cc720b520e57c22645935
Diffstat (limited to 'meta-security/recipes-core')
| -rw-r--r-- | meta-security/recipes-core/initrdscripts/initramfs-framework-dm/dmverity (renamed from meta-security/recipes-core/initrdscripts/initramfs-framework/dmverity) | 0 | ||||
| -rw-r--r-- | meta-security/recipes-core/initrdscripts/initramfs-framework.inc | 2 | ||||
| -rw-r--r-- | meta-security/recipes-core/initrdscripts/initramfs-framework_1.0.bbappend | 2 | ||||
| -rw-r--r-- | meta-security/recipes-core/packagegroup/packagegroup-core-security.bb | 1 |
4 files changed, 3 insertions, 2 deletions
diff --git a/meta-security/recipes-core/initrdscripts/initramfs-framework/dmverity b/meta-security/recipes-core/initrdscripts/initramfs-framework-dm/dmverity index 888052ccd..888052ccd 100644 --- a/meta-security/recipes-core/initrdscripts/initramfs-framework/dmverity +++ b/meta-security/recipes-core/initrdscripts/initramfs-framework-dm/dmverity diff --git a/meta-security/recipes-core/initrdscripts/initramfs-framework.inc b/meta-security/recipes-core/initrdscripts/initramfs-framework.inc index dad9c967c..12010bf34 100644 --- a/meta-security/recipes-core/initrdscripts/initramfs-framework.inc +++ b/meta-security/recipes-core/initrdscripts/initramfs-framework.inc @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS_prepend := "${THISDIR}/initramfs-framework-dm:" SRC_URI_append = "\ file://dmverity \ diff --git a/meta-security/recipes-core/initrdscripts/initramfs-framework_1.0.bbappend b/meta-security/recipes-core/initrdscripts/initramfs-framework_1.0.bbappend index dc74e017f..f5d476edb 100644 --- a/meta-security/recipes-core/initrdscripts/initramfs-framework_1.0.bbappend +++ b/meta-security/recipes-core/initrdscripts/initramfs-framework_1.0.bbappend @@ -1 +1 @@ -require ${@bb.utils.contains('IMAGE_CLASSES', 'dm-verity', 'initramfs-framework.inc', '', d)} +require ${@bb.utils.contains('IMAGE_CLASSES', 'dm-verity-img', 'initramfs-framework.inc', '', d)} diff --git a/meta-security/recipes-core/packagegroup/packagegroup-core-security.bb b/meta-security/recipes-core/packagegroup/packagegroup-core-security.bb index e7b6d9bf3..8e06f30bc 100644 --- a/meta-security/recipes-core/packagegroup/packagegroup-core-security.bb +++ b/meta-security/recipes-core/packagegroup/packagegroup-core-security.bb @@ -40,6 +40,7 @@ RDEPENDS_packagegroup-security-utils = "\ softhsm \ libest \ opendnssec \ + sshguard \ ${@bb.utils.contains_any("TUNE_FEATURES", "riscv32 ", "", " libseccomp",d)} \ ${@bb.utils.contains("DISTRO_FEATURES", "pam", "sssd google-authenticator-libpam", "",d)} \ ${@bb.utils.contains("DISTRO_FEATURES", "pax", "pax-utils packctl", "",d)} \ |