summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2014-02-04 17:27:19 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-06 15:30:45 +0000
commitb075ddb1dc052ef007cb672e506f2532a4001b9a (patch)
treec4bbb74c7dd2aeeea51f776d6287ca2a16933f86
parentbc7a5b9442100112541a79a6d4f7ffed22c5b7bc (diff)
downloadpoky-b075ddb1dc052ef007cb672e506f2532a4001b9a.tar.gz
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. (From OE-Core rev: ee58b618ec68c02b3e8759086e1dcc45c1fe3970) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/distcc/distcc_3.1.bb10
-rw-r--r--meta/recipes-devtools/distcc/files/distcc.service (renamed from meta/recipes-devtools/distcc/files/distccd.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 e3b6cda4b9..c69643c973 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 \
22 file://default \ 22 file://default \
23 file://distccmon-gnome.desktop \ 23 file://distccmon-gnome.desktop \
24 file://distcc \ 24 file://distcc \
25 file://distccd.service" 25 file://distcc.service"
26 26
27SRC_URI[md5sum] = "a1a9d3853df7133669fffec2a9aab9f3" 27SRC_URI[md5sum] = "a1a9d3853df7133669fffec2a9aab9f3"
28SRC_URI[sha256sum] = "f55dbafd76bed3ce57e1bbcdab1329227808890d90f4c724fcd2d53f934ddd89" 28SRC_URI[sha256sum] = "f55dbafd76bed3ce57e1bbcdab1329227808890d90f4c724fcd2d53f934ddd89"
@@ -41,7 +41,7 @@ USERADD_PARAM_${PN} = "--system \
41INITSCRIPT_NAME = "distcc" 41INITSCRIPT_NAME = "distcc"
42 42
43SYSTEMD_PACKAGES = "${PN}" 43SYSTEMD_PACKAGES = "${PN}"
44SYSTEMD_SERVICE_${PN} = "distccd.service" 44SYSTEMD_SERVICE_${PN} = "distcc.service"
45 45
46do_install_append() { 46do_install_append() {
47 install -d ${D}${sysconfdir}/init.d/ 47 install -d ${D}${sysconfdir}/init.d/
@@ -49,8 +49,8 @@ do_install_append() {
49 install -m 0755 ${WORKDIR}/distcc ${D}${sysconfdir}/init.d/ 49 install -m 0755 ${WORKDIR}/distcc ${D}${sysconfdir}/init.d/
50 install -m 0755 ${WORKDIR}/default ${D}${sysconfdir}/default/distcc 50 install -m 0755 ${WORKDIR}/default ${D}${sysconfdir}/default/distcc
51 install -d ${D}${systemd_unitdir}/system/ 51 install -d ${D}${systemd_unitdir}/system/
52 install -m 0644 ${WORKDIR}/distccd.service ${D}${systemd_unitdir}/system 52 install -m 0644 ${WORKDIR}/distcc.service ${D}${systemd_unitdir}/system
53 sed -i -e 's,@BINDIR@,${bindir},g' ${D}${systemd_unitdir}/system/distccd.service 53 sed -i -e 's,@BINDIR@,${bindir},g' ${D}${systemd_unitdir}/system/distcc.service
54 ${DESKTOPINSTALL} 54 ${DESKTOPINSTALL}
55} 55}
56DESKTOPINSTALL = "" 56DESKTOPINSTALL = ""
@@ -65,7 +65,7 @@ FILES_${PN} = " ${sysconfdir} \
65 ${bindir}/lsdistcc \ 65 ${bindir}/lsdistcc \
66 ${bindir}/distccd \ 66 ${bindir}/distccd \
67 ${bindir}/distccmon-text \ 67 ${bindir}/distccmon-text \
68 ${systemd_unitdir}/system/distccd.service" 68 ${systemd_unitdir}/system/distcc.service"
69FILES_distcc-distmon-gnome = " ${bindir}/distccmon-gnome \ 69FILES_distcc-distmon-gnome = " ${bindir}/distccmon-gnome \
70 ${datadir}/distcc" 70 ${datadir}/distcc"
71 71
diff --git a/meta/recipes-devtools/distcc/files/distccd.service b/meta/recipes-devtools/distcc/files/distcc.service
index 0253ddf52a..0253ddf52a 100644
--- a/meta/recipes-devtools/distcc/files/distccd.service
+++ b/meta/recipes-devtools/distcc/files/distcc.service