diff options
| author |   José Bollo <jose.bollo@iot.bzh> | 2018-01-24 11:52:04 +0100 |
|---|---|---|
| committer | José Bollo <jose.bollo@iot.bzh> | 2018-02-13 11:02:00 +0100 |
| commit | d9bac27cdb912b18b7fd8d5096c4612025493ef6 (patch) | |
| tree | 2b314a1deb424061d4173f3ac2fc56ef12248071 /meta-security/recipes-core | |
| parent | f70d712e4f505f5c5b50ae17f4f023d20a667568 (diff) | |
Remove smack recipe
smack user space library is provided by meta-security
Change-Id: Ifb5e88e5f5a1aab3e695ab91a56d8c55c33fd004
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
Diffstat (limited to 'meta-security/recipes-core')
3 files changed, 4 insertions, 4 deletions
diff --git a/meta-security/recipes-core/base-files/base-files_%.bbappend b/meta-security/recipes-core/base-files/base-files_%.bbappend index 7a37eb9dc..a6af1821b 100644 --- a/meta-security/recipes-core/base-files/base-files_%.bbappend +++ b/meta-security/recipes-core/base-files/base-files_%.bbappend @@ -40,8 +40,8 @@ EOF # via postinst. This is much easier to use with bitbake, too: # - no need to maintain a patched rpm # - works for directories which are not packaged by default when empty -RDEPENDS_${PN}_append_with-lsm-smack = " smack-userspace" -DEPENDS_append_with-lsm-smack = " smack-userspace-native" +RDEPENDS_${PN}_append_with-lsm-smack = " smack" +DEPENDS_append_with-lsm-smack = " smack-native" pkg_postinst_${PN}_with-lsm-smack() { #!/bin/sh -e diff --git a/meta-security/recipes-core/packagegroups/packagegroup-security-framework.bb b/meta-security/recipes-core/packagegroups/packagegroup-security-framework.bb index c728da3b9..b52e18d4e 100644 --- a/meta-security/recipes-core/packagegroups/packagegroup-security-framework.bb +++ b/meta-security/recipes-core/packagegroups/packagegroup-security-framework.bb @@ -8,7 +8,7 @@ inherit packagegroup # # Cynara does not have a hard dependency on Smack security, # but is meant to be used with it. security-manager however -# links against smack-userspace and expects Smack to be active, +# links against smack and expects Smack to be active, # so we do not have any choice. # # Without configuration, security-manager is not usable. We use diff --git a/meta-security/recipes-core/systemd/systemd_%.bbappend b/meta-security/recipes-core/systemd/systemd_%.bbappend index bea5a3731..65e28f9de 100644 --- a/meta-security/recipes-core/systemd/systemd_%.bbappend +++ b/meta-security/recipes-core/systemd/systemd_%.bbappend @@ -53,7 +53,7 @@ install_file() { # /var/tmp point into /var/volatile (tmpfs) and get created anew during # startup. We set these permissions directly after creating them via # /etc/tmpfiles.d/00-create-volatile.conf -RDEPENDS_${PN}_append_with-lsm-smack = " smack-userspace" +RDEPENDS_${PN}_append_with-lsm-smack = " smack" do_install_append_with-lsm-smack() { install_file ${D}${systemd_unitdir}/system/systemd-tmpfiles-setup.service.d/smack.conf <<EOF [Service] |