diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-10-22 22:52:33 -0400 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-10-31 22:55:16 -0400 |
| commit | 711ae0ebce1f127412be3cfd232ee1762bbd0cc0 (patch) | |
| tree | 07898768da2257b874df9a16a62448d5ab7349bd /meta-phosphor/classes | |
| parent | ac3fc9491a00edc39f06c09c719223c6cceb8911 (diff) | |
| download | talos-openbmc-711ae0ebce1f127412be3cfd232ee1762bbd0cc0.tar.gz talos-openbmc-711ae0ebce1f127412be3cfd232ee1762bbd0cc0.zip | |
phosphor-mapper: remove deprecated path whitelist
The c++ mapper implements dbus service whitelists in place of path
based whitelists. Drop support for path whitelists.
(From meta-phosphor rev: d4816d2868a251a0a4048219de0e9411eed8c853)
Change-Id: I7ca6c4b01e644b8008169cc63c9259801c42f27f
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-phosphor/classes')
| -rw-r--r-- | meta-phosphor/classes/phosphor-mapper.bbclass | 11 | ||||
| -rw-r--r-- | meta-phosphor/classes/phosphor-mapperdir.bbclass | 1 |
2 files changed, 3 insertions, 9 deletions
diff --git a/meta-phosphor/classes/phosphor-mapper.bbclass b/meta-phosphor/classes/phosphor-mapper.bbclass index 97da8503d..3374a76df 100644 --- a/meta-phosphor/classes/phosphor-mapper.bbclass +++ b/meta-phosphor/classes/phosphor-mapper.bbclass @@ -7,14 +7,11 @@ # interfaces it will keep track of. # # The Phosphor layer by default configures the mapper to -# watch xyz.openbmc_project services, interfaces and paths -# only. This configuration file is intended to be inherited -# by native recipes in other layers that wish to add namespaces +# watch xyz.openbmc_project services and interfaces only. +# This configuration file is intended to be inherited by +# native recipes in other layers that wish to add namespaces # or interfaces to the mapper watchlist. -# Add path namespaces to be monitored: -# PHOSPHOR_MAPPER_NAMESPACE_append = " /foo/bar" - # Add service namespaces to be monitored: # PHOSPHOR_MAPPER_SERVICE_append = " foo.bar" @@ -39,13 +36,11 @@ python phosphor_mapper_do_postinst() { with open(path, 'w+') as fd: pass - process_var(d, 'PHOSPHOR_MAPPER_NAMESPACE', 'namespace_dir') process_var(d, 'PHOSPHOR_MAPPER_SERVICE', 'service_dir') process_var(d, 'PHOSPHOR_MAPPER_INTERFACE', 'interface_dir') process_var(d, 'PHOSPHOR_MAPPER_SERVICE_BLACKLIST', 'serviceblacklist_dir') } -do_install[vardeps] += "PHOSPHOR_MAPPER_NAMESPACE" do_install[vardeps] += "PHOSPHOR_MAPPER_SERVICE" do_install[vardeps] += "PHOSPHOR_MAPPER_INTERFACE" do_install[vardeps] += "PHOSPHOR_MAPPER_SERVICE_BLACKLIST" diff --git a/meta-phosphor/classes/phosphor-mapperdir.bbclass b/meta-phosphor/classes/phosphor-mapperdir.bbclass index ed686287a..4b6bc62b4 100644 --- a/meta-phosphor/classes/phosphor-mapperdir.bbclass +++ b/meta-phosphor/classes/phosphor-mapperdir.bbclass @@ -1,4 +1,3 @@ -namespace_dir="${datadir}/phosphor-mapper/namespace" service_dir="${datadir}/phosphor-mapper/service" interface_dir="${datadir}/phosphor-mapper/interface" serviceblacklist_dir="${datadir}/phosphor-mapper/serviceblacklist" |
