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 <[email protected]> --- meta/recipes-devtools/distcc/distcc_3.1.bb | 10 +++++----- .../distcc/files/{distccd.service => distcc.service} | 0 2 files changed, 5 insertions(+), 5 deletions(-) rename meta/recipes-devtools/distcc/files/{distccd.service => distcc.service} (100%) 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,@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/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 -- 1.7.10.4 _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
