packagegroup-core-security-ptest: only included if ptest is enabled
PATCH 1/4 packagegroup-core-security-ptest: only included if ptest is enabled
update python package names
Signed-off-by Armin Kuster <[email protected]>
--- .../packagegroup/packagegroup-core-security-ptest.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
recipes-security/packagegroup/packagegroup-core-security-ptest.bb +5 -1
@@ -3,6 +3,10 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +inherit distro_features_check + +REQUIRED_DISTRO_FEATURES = "ptest" + PACKAGES = "\ ${PN} \ "
@@ -15,7 +19,7 @@ RDEPENDS_${PN} = " \ samhain-standalone-ptest \ keyutils-ptest \ libseccomp-ptest \ - python-scapy-ptest \ + python3-scapy-ptest \ suricata-ptest \ tripwire-ptest \ python-fail2ban-ptest \
Signature · 1 line
2.17.1
PATCH 2/4 packagegroup-core-security: update package name
Also remove tpm packagegroup reference
Signed-off-by Armin Kuster <[email protected]>
--- recipes-security/packagegroup/packagegroup-core-security.bb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
recipes-security/packagegroup/packagegroup-core-security.bb +1 -3
@@ -11,7 +11,6 @@ PACKAGES = "\ packagegroup-security-scanners \ packagegroup-security-ids \ packagegroup-security-mac \ - ${@bb.utils.contains("MACHINE_FEATURES", "tpm", "packagegroup-security-tpm", "",d)} \ " RDEPENDS_packagegroup-core-security = "\
@@ -19,7 +18,6 @@ RDEPENDS_packagegroup-core-security = "\ packagegroup-security-scanners \ packagegroup-security-ids \ packagegroup-security-mac \ - ${@bb.utils.contains("MACHINE_FEATURES", "tpm", "packagegroup-security-tpm", "",d)} \ " SUMMARY_packagegroup-security-utils = "Security utilities"
@@ -27,7 +25,7 @@ RDEPENDS_packagegroup-security-utils = "\ checksec \ nmap \ pinentry \ - python-scapy \ + python3-scapy \ ding-libs \ keyutils \ libseccomp \
Signature · 1 line
2.17.1
PATCH 3/4 busybox: fix sig changes when layer added
In reply to Armin KusterSigned-off-by Armin Kuster <[email protected]>
--- recipes-core/busybox/busybox_%.bbappend | 4 +--- recipes-core/busybox/busybox_libsecomp.inc | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 recipes-core/busybox/busybox_libsecomp.inc
recipes-core/busybox/busybox_%.bbappend +1 -3
@@ -1,3 +1 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI += "file://head.cfg" +require ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'busybox_libsecomp.inc', '', d)}
recipes-core/busybox/busybox_libsecomp.inc new file +3 -0
@@ -0,0 +1,3 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/busybox:" + +SRC_URI_append = " file://head.cfg"
Signature · 1 line
2.17.1
PATCH 4/4 initramfs-framework-ima: correct IMA_POLICY name
In reply to Armin Kusterit had ima_policy_hashed and did not match the recipe ima-policy-hashed
found by yocto-check-layer
Signed-off-by Armin Kuster <[email protected]>
--- .../recipes-core/initrdscripts/initramfs-framework-ima.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-integrity/recipes-core/initrdscripts/initramfs-framework-ima.bb +1 -1
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384 # This policy file will get installed as /etc/ima/ima-policy. # It is located via the normal file search path, so a .bbappend # to this recipe can just point towards one of its own files. -IMA_POLICY ?= "ima_policy_hashed" +IMA_POLICY ?= "ima-policy-hashed" SRC_URI = " file://ima"
Signature · 1 line
2.17.1