diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-10-22 18:34:58 -0400 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-10-26 09:28:58 -0400 |
| commit | e58d3371418445d8a04cb35bcf0c3fb64f747bc1 (patch) | |
| tree | ff1b529e975b65415539e20114c1aceb478b7a52 /meta-phosphor/classes | |
| parent | aa5d94588b0eac59bd7903297d255a67286ae3e2 (diff) | |
| download | talos-openbmc-e58d3371418445d8a04cb35bcf0c3fb64f747bc1.tar.gz talos-openbmc-e58d3371418445d8a04cb35bcf0c3fb64f747bc1.zip | |
phosphor-mapper: Drop blacklist feature
An interface and path blacklisting feature was implemented in the
python mapper but it isn't used, and it wasn't implemented in the
c++ mapper. Drop support to make a small improvement to
comprehensional complexity and ease the transition to the c++ mapper.
(From meta-phosphor rev: 6b10fd583d7c1baed14f6076322548f4f097d9db)
Change-Id: I3346f1929689b75553b8331a6ac1b5df0d5c87cb
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 | 2 |
2 files changed, 0 insertions, 13 deletions
diff --git a/meta-phosphor/classes/phosphor-mapper.bbclass b/meta-phosphor/classes/phosphor-mapper.bbclass index 291076386..7bafecb79 100644 --- a/meta-phosphor/classes/phosphor-mapper.bbclass +++ b/meta-phosphor/classes/phosphor-mapper.bbclass @@ -18,12 +18,6 @@ # Add interfaces to be monitored: # PHOSPHOR_MAPPER_INTERFACE_append = " foo.bar" -# Blacklist paths from being monitored: -# PHOSPHOR_MAPPER_NAMESPACE_BLACKLIST_append = " /foo/bar/baz" - -# Blacklist interfaces from being monitored: -# PHOSPHOR_MAPPER_INTERFACE_BLACKLIST_append = " foo.bar.baz" - inherit phosphor-mapperdir inherit obmc-phosphor-utils @@ -41,13 +35,8 @@ python phosphor_mapper_do_postinst() { process_var(d, 'PHOSPHOR_MAPPER_NAMESPACE', 'namespace_dir') process_var(d, 'PHOSPHOR_MAPPER_INTERFACE', 'interface_dir') - process_var(d, 'PHOSPHOR_MAPPER_NAMESPACE_BLACKLIST', 'blacklist_dir') - process_var( - d, 'PHOSPHOR_MAPPER_INTERFACE_BLACKLIST', 'interfaceblacklist_dir') } do_install[vardeps] += "PHOSPHOR_MAPPER_NAMESPACE" do_install[vardeps] += "PHOSPHOR_MAPPER_INTERFACE" -do_install[vardeps] += "PHOSPHOR_MAPPER_NAMESPACE_BLACKLIST" -do_install[vardeps] += "PHOSPHOR_MAPPER_INTERFACE_BLACKLIST" do_install[postfuncs] += "phosphor_mapper_do_postinst" diff --git a/meta-phosphor/classes/phosphor-mapperdir.bbclass b/meta-phosphor/classes/phosphor-mapperdir.bbclass index 591b63d4d..33962f257 100644 --- a/meta-phosphor/classes/phosphor-mapperdir.bbclass +++ b/meta-phosphor/classes/phosphor-mapperdir.bbclass @@ -1,4 +1,2 @@ namespace_dir="${datadir}/phosphor-mapper/namespace" interface_dir="${datadir}/phosphor-mapper/interface" -blacklist_dir="${datadir}/phosphor-mapper/blacklist" -interfaceblacklist_dir="${datadir}/phosphor-mapper/interfaceblacklist" |
