security-test-image: simplify

Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Armin Kuster
2020-09-29 19:09:46 -07:00
parent 60a17b82d2
commit b03d65ffe4
2 changed files with 16 additions and 24 deletions

View File

@@ -1,33 +1,11 @@
DESCRIPTION = "A small image for testing meta-security packages" DESCRIPTION = "A small image for testing meta-security packages"
require security-build-image.bb
IMAGE_FEATURES += "ssh-server-openssh" IMAGE_FEATURES += "ssh-server-openssh"
TEST_SUITES = "ssh ping ptest apparmor clamav samhain sssd tripwire checksec smack suricata" TEST_SUITES = "ssh ping ptest apparmor clamav samhain sssd tripwire checksec smack suricata"
INSTALL_CLAMAV_CVD = "1" INSTALL_CLAMAV_CVD = "1"
IMAGE_INSTALL = "\
packagegroup-base \
packagegroup-core-boot \
packagegroup-core-security-ptest \
clamav \
tripwire \
checksec \
suricata \
samhain-standalone \
${@bb.utils.contains("DISTRO_FEATURES", "pam", "sssd", "",d)} \
${@bb.utils.contains("DISTRO_FEATURES", "apparmor", "apparmor", "",d)} \
${@bb.utils.contains("DISTRO_FEATURES", "smack", "smack-test", "",d)} \
os-release \
"
IMAGE_LINGUAS ?= " "
LICENSE = "MIT"
inherit core-image
export IMAGE_BASENAME = "security-test-image"
IMAGE_ROOTFS_EXTRA_SPACE = "5242880" IMAGE_ROOTFS_EXTRA_SPACE = "5242880"

View File

@@ -13,6 +13,7 @@ PACKAGES = "\
packagegroup-security-hardening \ packagegroup-security-hardening \
packagegroup-security-ids \ packagegroup-security-ids \
packagegroup-security-mac \ packagegroup-security-mac \
${@bb.utils.contains("DISTRO_FEATURES", "ptest", "packagegroup-meta-security-ptest-packages", "", d)} \
" "
RDEPENDS_packagegroup-core-security = "\ RDEPENDS_packagegroup-core-security = "\
@@ -22,6 +23,7 @@ RDEPENDS_packagegroup-core-security = "\
packagegroup-security-hardening \ packagegroup-security-hardening \
packagegroup-security-ids \ packagegroup-security-ids \
packagegroup-security-mac \ packagegroup-security-mac \
${@bb.utils.contains("DISTRO_FEATURES", "ptest", "packagegroup-meta-security-ptest-packages", "", d)} \
" "
SUMMARY_packagegroup-security-utils = "Security utilities" SUMMARY_packagegroup-security-utils = "Security utilities"
@@ -76,3 +78,15 @@ RDEPENDS_packagegroup-security-mac = " \
${@bb.utils.contains("DISTRO_FEATURES", "apparmor", "apparmor", "",d)} \ ${@bb.utils.contains("DISTRO_FEATURES", "apparmor", "apparmor", "",d)} \
${@bb.utils.contains("DISTRO_FEATURES", "smack", "smack", "",d)} \ ${@bb.utils.contains("DISTRO_FEATURES", "smack", "smack", "",d)} \
" "
RDEPENDS_packagegroup-meta-security-ptest-packages = "\
ptest-runner \
samhain-standalone-ptest \
libseccomp-ptest \
python3-scapy-ptest \
suricata-ptest \
tripwire-ptest \
python3-fail2ban-ptest \
${@bb.utils.contains("DISTRO_FEATURES", "apparmor", "apparmor-ptest", "",d)} \
${@bb.utils.contains("DISTRO_FEATURES", "smack", "smack-ptest", "",d)} \
"