commit | 9b3beee10191fbec68345ec48829f7bc3728c576 | [log] [tgz] |
---|---|---|
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | Thu Aug 03 15:56:09 2017 -0400 |
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | Thu Aug 03 15:59:00 2017 -0400 |
tree | b6402968d19c9af6e74d171eab02334e04513bdf | |
parent | a6755e638ccb06ac242b5d5954bb78e8e7c54909 [diff] |
mapper: Fix mapper environment generation bug Fix a logic issue that results in an emitted mapper environment file with interfaces like: rg.openbmc and yz.openbmc_project Change-Id: I5ad30e45da08123b7611390855c04237ff5b60de Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/meta-phosphor/classes/phosphor-mapper.bbclass b/meta-phosphor/classes/phosphor-mapper.bbclass index 26f369b..71d26ec 100644 --- a/meta-phosphor/classes/phosphor-mapper.bbclass +++ b/meta-phosphor/classes/phosphor-mapper.bbclass
@@ -34,7 +34,7 @@ os.makedirs(parent) path = os.path.join( parent, - '-'.join(p[1:].split(os.sep))) + '-'.join(p.split(os.sep))) with open(path, 'w+') as fd: pass
diff --git a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper.bb b/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper.bb index a891b48..6797af6 100644 --- a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper.bb +++ b/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper.bb
@@ -52,7 +52,7 @@ d.getVar('namespace_dir', True) paths = [] for p in os.listdir(path): - paths.append(os.sep + os.sep.join(p.split('-'))) + paths.append(os.sep.join(p.split('-'))) path = d.getVar('STAGING_DIR_NATIVE', True) + \ d.getVar('interface_dir', True)