From 9b3beee10191fbec68345ec48829f7bc3728c576 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Thu, 3 Aug 2017 15:56:09 -0400 Subject: 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 --- meta-phosphor/classes/phosphor-mapper.bbclass | 2 +- meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-phosphor/classes/phosphor-mapper.bbclass b/meta-phosphor/classes/phosphor-mapper.bbclass index 26f369b14..71d26ec37 100644 --- a/meta-phosphor/classes/phosphor-mapper.bbclass +++ b/meta-phosphor/classes/phosphor-mapper.bbclass @@ -34,7 +34,7 @@ python phosphor_mapper_do_postinst() { 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 a891b483b..6797af632 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 @@ python do_emit_env() { 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) -- cgit v1.2.3