diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2020-01-06 17:48:41 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2020-01-06 17:48:43 +0300 |
| commit | a48c014e7bf11391734c05fac6552bbef2dc2086 (patch) | |
| tree | e24b69c6931f59a59f20290059eb15d9d655b295 /meta-security/recipes-mac | |
| parent | 870eb53cd2dd418fcd6e26356392b6366e51cae5 (diff) | |
| download | openbmc-a48c014e7bf11391734c05fac6552bbef2dc2086.tar.xz | |
meta-security: subtree update:3001c3ebfc..b72cc7f87c
Armin Kuster (10):
apparmor: add distro check
smack: add distro check
python-fail2ban: Drop python2 package
python3-fail2ban: include python-fail2ban.inc
google-authenticator-libpam: update to 1.07
smack-test: add feature check for smack
lib/oeqa/runtime: fix clamav test order
clamav: update to 0.101.5
meta-integrity: fix issues with yocto-check-layer
fail2ban: fix runtime error
Change-Id: I4f7e656b0f9e2e9dc32989a1756c94e4e0143c42
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-security/recipes-mac')
| -rw-r--r-- | meta-security/recipes-mac/AppArmor/apparmor_2.13.3.bb | 3 | ||||
| -rw-r--r-- | meta-security/recipes-mac/smack/smack-test_1.0.bb | 4 | ||||
| -rw-r--r-- | meta-security/recipes-mac/smack/smack_1.3.1.bb | 7 |
3 files changed, 12 insertions, 2 deletions
diff --git a/meta-security/recipes-mac/AppArmor/apparmor_2.13.3.bb b/meta-security/recipes-mac/AppArmor/apparmor_2.13.3.bb index 60d5e6880..32230a57d 100644 --- a/meta-security/recipes-mac/AppArmor/apparmor_2.13.3.bb +++ b/meta-security/recipes-mac/AppArmor/apparmor_2.13.3.bb @@ -30,7 +30,8 @@ S = "${WORKDIR}/git" PARALLEL_MAKE = "" -inherit pkgconfig autotools-brokensep update-rc.d python3native perlnative ptest cpan manpages systemd +inherit pkgconfig autotools-brokensep update-rc.d python3native perlnative ptest cpan manpages systemd features_check +REQUIRED_DISTRO_FEATURES = "apparmor" PACKAGECONFIG ??= "python perl aa-decode" PACKAGECONFIG[manpages] = "--enable-man-pages, --disable-man-pages" diff --git a/meta-security/recipes-mac/smack/smack-test_1.0.bb b/meta-security/recipes-mac/smack/smack-test_1.0.bb index 7cf8f2e04..d5de6076a 100644 --- a/meta-security/recipes-mac/smack/smack-test_1.0.bb +++ b/meta-security/recipes-mac/smack/smack-test_1.0.bb @@ -12,6 +12,10 @@ SRC_URI = " \ S = "${WORKDIR}" +inherit features_check + +REQUIRED_DISTRO_FEATURES = "smack" + do_install() { install -d ${D}${sbindir} install -m 0755 notroot.py ${D}${sbindir} diff --git a/meta-security/recipes-mac/smack/smack_1.3.1.bb b/meta-security/recipes-mac/smack/smack_1.3.1.bb index f32d91ba3..b1ea4e9ff 100644 --- a/meta-security/recipes-mac/smack/smack_1.3.1.bb +++ b/meta-security/recipes-mac/smack/smack_1.3.1.bb @@ -13,7 +13,12 @@ SRC_URI = " \ PV = "1.3.1" -inherit autotools update-rc.d pkgconfig ptest ${@bb.utils.contains('VIRTUAL-RUNTIME_init_manager','systemd','systemd','', d)} +inherit autotools update-rc.d pkgconfig ptest +inherit ${@bb.utils.contains('VIRTUAL-RUNTIME_init_manager','systemd','systemd','', d)} +inherit features_check + +REQUIRED_DISTRO_FEATURES = "smack" + S = "${WORKDIR}/git" |