[oe-commits] Martin Jansa : atftpd: fix warning about overwritting keys

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master
Commit: 6bb74e9147d2c829d2e4720df1bfc81a95538b76
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=6bb74e9147d2c829d2e4720df1bfc81a95538b76

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Fri Apr 12 22:00:34 2013 +0200

atftpd: fix warning about overwritting keys

* WARNING: Variable key FILES_${PN}d (${sbindir}/* ${sysconfdir}/init.d/* /srv/tftp) replaces original key FILES_atftpd ( ${systemd_unitdir}/system/atftpd.service).

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 .../recipes-extended/atftp/atftp_git.bbappend      |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/meta-systemd/meta-oe/recipes-extended/atftp/atftp_git.bbappend b/meta-systemd/meta-oe/recipes-extended/atftp/atftp_git.bbappend
index e58306f..ed9cf9d 100644
--- a/meta-systemd/meta-oe/recipes-extended/atftp/atftp_git.bbappend
+++ b/meta-systemd/meta-oe/recipes-extended/atftp/atftp_git.bbappend
@@ -6,12 +6,12 @@ inherit systemd
 
 SRC_URI += "file://atftpd.service"
 
-SYSTEMD_PACKAGES = "atftpd"
-SYSTEMD_SERVICE_atftpd = "atftpd.service"
-FILES_atftpd += "${systemd_unitdir}/system/atftpd.service"
-RPROVIDES_atftpd += "atftpd-systemd"
-RREPLACES_atftpd += "atftpd-systemd"
-RCONFLICTS_atftpd += "atftpd-systemd"
+SYSTEMD_PACKAGES = "${PN}d"
+SYSTEMD_SERVICE_${PN}d = "atftpd.service"
+FILES_${PN}d += "${systemd_unitdir}/system/atftpd.service"
+RPROVIDES_${PN}d += "${PN}d-systemd"
+RREPLACES_${PN}d += "${PN}d-systemd"
+RCONFLICTS_${PN}d += "${PN}d-systemd"
 do_install_append() {
 	install -d ${D}${systemd_unitdir}/system
 	install -m 0644 ${WORKDIR}/atftpd.service ${D}${systemd_unitdir}/system