phosphor-mapper: remove deprecated path whitelist
The c++ mapper implements dbus service whitelists in place of path
based whitelists. Drop support for path whitelists.
Change-Id: I02820bb136f7aa76fd9c782df648455bd9fb7536
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/classes/phosphor-mapper.bbclass b/classes/phosphor-mapper.bbclass
index 97da850..3374a76 100644
--- a/classes/phosphor-mapper.bbclass
+++ b/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 @@
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/classes/phosphor-mapperdir.bbclass b/classes/phosphor-mapperdir.bbclass
index ed68628..4b6bc62 100644
--- a/classes/phosphor-mapperdir.bbclass
+++ b/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"
diff --git a/recipes-phosphor/dbus/phosphor-dbus-interfaces-mapper-config-native.bb b/recipes-phosphor/dbus/phosphor-dbus-interfaces-mapper-config-native.bb
index e87f225..0869c3f 100644
--- a/recipes-phosphor/dbus/phosphor-dbus-interfaces-mapper-config-native.bb
+++ b/recipes-phosphor/dbus/phosphor-dbus-interfaces-mapper-config-native.bb
@@ -1,5 +1,5 @@
-SUMMARY="Add /xyz/openbmc_project namespace to phosphor-mapper"
-DESCRIPTION="Add the /xyz/openbmc_project path namespace and \
+SUMMARY="Add xyz.openbmc_project namespace to phosphor-mapper"
+DESCRIPTION="Add the xyz.openbmc_project service namespace and \
xyz.openbmc_project interface prefix to the mapper \
watch list."
@@ -7,6 +7,5 @@
inherit native
inherit obmc-phosphor-license
-PHOSPHOR_MAPPER_NAMESPACE_append = " /xyz/openbmc_project"
PHOSPHOR_MAPPER_SERVICE_append = " xyz.openbmc_project"
PHOSPHOR_MAPPER_INTERFACE_append = " xyz.openbmc_project"
diff --git a/recipes-phosphor/dbus/phosphor-legacy-namespace-mapper-config-native.bb b/recipes-phosphor/dbus/phosphor-legacy-namespace-mapper-config-native.bb
index 69c7779..2cb5b76 100644
--- a/recipes-phosphor/dbus/phosphor-legacy-namespace-mapper-config-native.bb
+++ b/recipes-phosphor/dbus/phosphor-legacy-namespace-mapper-config-native.bb
@@ -1,11 +1,10 @@
-SUMMARY="Add /org/openbmc namespace to phosphor-mapper"
-DESCRIPTION="Add the legacy /org/openbmc path namespace and \
-org.openbmc nterface prefix to the mapper watch list."
+SUMMARY="Add org.openbmc namespace to phosphor-mapper"
+DESCRIPTION="Add the legacy org.openbmc service namespace and \
+org.openbmc interface prefix to the mapper watch list."
inherit phosphor-mapper
inherit native
inherit obmc-phosphor-license
-PHOSPHOR_MAPPER_NAMESPACE_append = " /org/openbmc"
PHOSPHOR_MAPPER_SERVICE_append = " org.openbmc"
PHOSPHOR_MAPPER_INTERFACE_append = " org.openbmc"
diff --git a/recipes-phosphor/dbus/phosphor-mapper-config-native.bb b/recipes-phosphor/dbus/phosphor-mapper-config-native.bb
index 9e2f43f..befbdbc 100644
--- a/recipes-phosphor/dbus/phosphor-mapper-config-native.bb
+++ b/recipes-phosphor/dbus/phosphor-mapper-config-native.bb
@@ -21,9 +21,6 @@
# Recipes should set one of the variables below.
# Consult phosphor-mapper.bbclass for additional information.
-# Add path namespaces to be monitored.
-PHOSPHOR_MAPPER_NAMESPACE = ""
-
# Add services to be monitored.
PHOSPHOR_MAPPER_SERVICE = ""
diff --git a/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.service b/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.service
index 69fb1e2..8787c6e 100644
--- a/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.service
+++ b/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.service
@@ -7,7 +7,6 @@
Restart=always
Type=dbus
ExecStart=/usr/bin/env phosphor-mapper \
- --path_namespaces="${{MAPPER_NAMESPACES}}" \
--service_namespaces="${{MAPPER_SERVICES}}" \
--interface_namespaces="${{MAPPER_INTERFACES}}" \
--service_blacklists="${{MAPPER_SERVICEBLACKLISTS}}"
diff --git a/recipes-phosphor/dbus/phosphor-mapper_git.bb b/recipes-phosphor/dbus/phosphor-mapper_git.bb
index 7b793ec..ee5fa0e 100644
--- a/recipes-phosphor/dbus/phosphor-mapper_git.bb
+++ b/recipes-phosphor/dbus/phosphor-mapper_git.bb
@@ -53,12 +53,6 @@
# from the native sysroot /usr/share/phosphor-mapper filesystem.
python do_emit_env() {
path = d.getVar('STAGING_DIR_NATIVE', True) + \
- d.getVar('namespace_dir', True)
- paths = []
- for p in os.listdir(path):
- paths.append(os.sep.join(p.split('-')))
-
- path = d.getVar('STAGING_DIR_NATIVE', True) + \
d.getVar('service_dir', True)
services = []
for s in os.listdir(path):
@@ -85,8 +79,6 @@
if not os.path.exists(parent):
os.makedirs(parent)
with open(path, 'w+') as fd:
- fd.write('MAPPER_NAMESPACES="{}"'.format(' '.join(paths)))
- fd.write('\n')
fd.write('MAPPER_SERVICES="{}"'.format(' '.join(services)))
fd.write('\n')
fd.write('MAPPER_INTERFACES="{}"'.format(' '.join(interfaces)))
@@ -96,4 +88,3 @@
}
do_install[postfuncs] += "do_emit_env"
-do_install[vardeps] += "PHOSPHOR_MAPPER_NAMESPACES"