From d9b7e8dd475bb6a47084761941f7dd98302e48e6 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Wed, 6 Jul 2016 20:11:57 -0400 Subject: classes-systemd: Fix FILES_${PN} path bug Missing space and path sep in the generated path. Signed-off-by: Brad Bishop --- meta-phosphor/classes/obmc-phosphor-systemd.bbclass | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'meta-phosphor') diff --git a/meta-phosphor/classes/obmc-phosphor-systemd.bbclass b/meta-phosphor/classes/obmc-phosphor-systemd.bbclass index b07174f9f..c94a74b67 100644 --- a/meta-phosphor/classes/obmc-phosphor-systemd.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-systemd.bbclass @@ -27,9 +27,8 @@ python() { path = bb.utils.which(searchpaths, file) if os.path.isfile(path): d.appendVar('SRC_URI', ' file://' + file) - d.appendVar( - 'FILES_' + bpn, ' ' + - d.getVar('systemd_system_unitdir', True) + file) + d.appendVar("FILES_%s" %(bpn), " %s/%s" \ + % (d.getVar('systemd_system_unitdir', True), file)) d.appendVar('OBMC_SYSTEMD_SERVICES', ' ' + file) if file not in (d.getVar('SYSTEMD_SERVICE_' + bpn, True) or "").split(): d.appendVar('SYSTEMD_SERVICE_' + bpn, ' ' + file) -- cgit v1.2.1 From 62d676a6853ec27959d54d5060c67f60c297f68e Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Mon, 11 Jul 2016 00:42:58 -0400 Subject: classes-systemd: Use PN rather than BPN This is what all the classes that come with Yocto do. Signed-off-by: Brad Bishop --- meta-phosphor/classes/obmc-phosphor-systemd.bbclass | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'meta-phosphor') diff --git a/meta-phosphor/classes/obmc-phosphor-systemd.bbclass b/meta-phosphor/classes/obmc-phosphor-systemd.bbclass index c94a74b67..f882bfcfe 100644 --- a/meta-phosphor/classes/obmc-phosphor-systemd.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-systemd.bbclass @@ -7,31 +7,31 @@ # and these files will be added to the main package if they exist. # # Alternatively this class can just be inherited and -# ${BPN}.service will be added to the main package. +# ${PN}.service will be added to the main package. inherit systemd python() { - bpn = d.getVar('BPN', True) + pn = d.getVar('PN', True) searchpaths = d.getVar('FILESPATH', True) - services = d.getVar('SYSTEMD_SERVICE_' + bpn, True) + services = d.getVar('SYSTEMD_SERVICE_' + pn, True) if services: services = services.split() else: - services = [bpn + '.service'] + services = [pn + '.service'] for s in services: file = s path = bb.utils.which(searchpaths, file) if os.path.isfile(path): d.appendVar('SRC_URI', ' file://' + file) - d.appendVar("FILES_%s" %(bpn), " %s/%s" \ + d.appendVar("FILES_%s" %(pn), " %s/%s" \ % (d.getVar('systemd_system_unitdir', True), file)) d.appendVar('OBMC_SYSTEMD_SERVICES', ' ' + file) - if file not in (d.getVar('SYSTEMD_SERVICE_' + bpn, True) or "").split(): - d.appendVar('SYSTEMD_SERVICE_' + bpn, ' ' + file) + if file not in (d.getVar('SYSTEMD_SERVICE_' + pn, True) or "").split(): + d.appendVar('SYSTEMD_SERVICE_' + pn, ' ' + file) else: bb.error("Could not find service file: %s" % file) } -- cgit v1.2.1