From b075ddb1dc052ef007cb672e506f2532a4001b9a Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 4 Feb 2014 17:27:19 +0000 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-devtools/distcc/distcc_3.1.bb | 10 +++++----- meta/recipes-devtools/distcc/files/distcc.service | 11 +++++++++++ meta/recipes-devtools/distcc/files/distccd.service | 11 ----------- 3 files changed, 16 insertions(+), 16 deletions(-) create mode 100644 meta/recipes-devtools/distcc/files/distcc.service delete mode 100644 meta/recipes-devtools/distcc/files/distccd.service (limited to 'meta/recipes-devtools') 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 \ 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,@BINDIR@,${bindir},g' ${D}${systemd_unitdir}/system/distccd.service + install -m 0644 ${WORKDIR}/distcc.service ${D}${systemd_unitdir}/system + sed -i -e 's,@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/distcc.service b/meta/recipes-devtools/distcc/files/distcc.service new file mode 100644 index 0000000000..0253ddf52a --- /dev/null +++ b/meta/recipes-devtools/distcc/files/distcc.service @@ -0,0 +1,11 @@ +[Unit] +Description=Distccd A Distributed Compilation Server +After=network.target + +[Service] +User=distcc +EnvironmentFile=-/etc/default/distcc +ExecStart=@BINDIR@/distccd --verbose --no-detach --daemon $OPTIONS + +[Install] +WantedBy=multi-user.target diff --git a/meta/recipes-devtools/distcc/files/distccd.service b/meta/recipes-devtools/distcc/files/distccd.service deleted file mode 100644 index 0253ddf52a..0000000000 --- a/meta/recipes-devtools/distcc/files/distccd.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Distccd A Distributed Compilation Server -After=network.target - -[Service] -User=distcc -EnvironmentFile=-/etc/default/distcc -ExecStart=@BINDIR@/distccd --verbose --no-detach --daemon $OPTIONS - -[Install] -WantedBy=multi-user.target -- cgit v1.2.3-54-g00ecf