[oe-commits] Ross Burton : distcc: rename systemd service to distcc
git at git.openembedded.org
git at git.openembedded.org
Thu Feb 6 15:25:55 UTC 2014
Module: openembedded-core.git
Branch: master
Commit: ee58b618ec68c02b3e8759086e1dcc45c1fe3970
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=ee58b618ec68c02b3e8759086e1dcc45c1fe3970
Author: Ross Burton <ross.burton at intel.com>
Date: Tue Feb 4 17:27:19 2014 +0000
distcc: rename systemd service to distcc
The sysv init script is called distcc, so rename the service to match so that in
hybrid systemd/sysvinit images the service correctly masks the init script.
This prevents such images from failing to start the distccd unit with error code
102, as the ports it wants to bind to are already taken.
Signed-off-by: Ross Burton <ross.burton at intel.com>
---
meta/recipes-devtools/distcc/distcc_3.1.bb | 10 +++++-----
.../distcc/files/{distccd.service => distcc.service} | 0
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-devtools/distcc/distcc_3.1.bb b/meta/recipes-devtools/distcc/distcc_3.1.bb
index e3b6cda..c69643c 100644
--- a/meta/recipes-devtools/distcc/distcc_3.1.bb
+++ b/meta/recipes-devtools/distcc/distcc_3.1.bb
@@ -22,7 +22,7 @@ SRC_URI = "http://distcc.googlecode.com/files/${BPN}-${PV}.tar.bz2 \
file://default \
file://distccmon-gnome.desktop \
file://distcc \
- file://distccd.service"
+ file://distcc.service"
SRC_URI[md5sum] = "a1a9d3853df7133669fffec2a9aab9f3"
SRC_URI[sha256sum] = "f55dbafd76bed3ce57e1bbcdab1329227808890d90f4c724fcd2d53f934ddd89"
@@ -41,7 +41,7 @@ USERADD_PARAM_${PN} = "--system \
INITSCRIPT_NAME = "distcc"
SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = "distccd.service"
+SYSTEMD_SERVICE_${PN} = "distcc.service"
do_install_append() {
install -d ${D}${sysconfdir}/init.d/
@@ -49,8 +49,8 @@ do_install_append() {
install -m 0755 ${WORKDIR}/distcc ${D}${sysconfdir}/init.d/
install -m 0755 ${WORKDIR}/default ${D}${sysconfdir}/default/distcc
install -d ${D}${systemd_unitdir}/system/
- install -m 0644 ${WORKDIR}/distccd.service ${D}${systemd_unitdir}/system
- sed -i -e 's, at BINDIR@,${bindir},g' ${D}${systemd_unitdir}/system/distccd.service
+ install -m 0644 ${WORKDIR}/distcc.service ${D}${systemd_unitdir}/system
+ sed -i -e 's, at BINDIR@,${bindir},g' ${D}${systemd_unitdir}/system/distcc.service
${DESKTOPINSTALL}
}
DESKTOPINSTALL = ""
@@ -65,7 +65,7 @@ FILES_${PN} = " ${sysconfdir} \
${bindir}/lsdistcc \
${bindir}/distccd \
${bindir}/distccmon-text \
- ${systemd_unitdir}/system/distccd.service"
+ ${systemd_unitdir}/system/distcc.service"
FILES_distcc-distmon-gnome = " ${bindir}/distccmon-gnome \
${datadir}/distcc"
diff --git a/meta/recipes-devtools/distcc/files/distccd.service b/meta/recipes-devtools/distcc/files/distcc.service
similarity index 100%
rename from meta/recipes-devtools/distcc/files/distccd.service
rename to meta/recipes-devtools/distcc/files/distcc.service
More information about the Openembedded-commits
mailing list