diff options
Diffstat (limited to 'poky/meta/recipes-devtools/distcc/distcc_3.3.3.bb')
-rw-r--r-- | poky/meta/recipes-devtools/distcc/distcc_3.3.3.bb | 38 |
1 files changed, 15 insertions, 23 deletions
diff --git a/poky/meta/recipes-devtools/distcc/distcc_3.3.3.bb b/poky/meta/recipes-devtools/distcc/distcc_3.3.3.bb index 7942debec..c52f136be 100644 --- a/poky/meta/recipes-devtools/distcc/distcc_3.3.3.bb +++ b/poky/meta/recipes-devtools/distcc/distcc_3.3.3.bb @@ -12,12 +12,12 @@ PACKAGECONFIG[gtk] = "--with-gtk,--without-gtk --without-gnome,gtk+" # use system popt by default PACKAGECONFIG[popt] = "--without-included-popt,--with-included-popt,popt" -RRECOMMENDS_${PN} = "avahi-daemon" +RRECOMMENDS_${PN}-server = "avahi-daemon" SRC_URI = "git://github.com/distcc/distcc.git \ + file://fix-gnome.patch \ file://separatebuilddir.patch \ file://default \ - file://distccmon-gnome.desktop \ file://distcc \ file://distcc.service" SRCREV = "4cde9bcfbda589abd842e3bbc652ce369085eaae" @@ -29,17 +29,20 @@ ASNEEDED = "" EXTRA_OECONF += "--disable-Werror PYTHON='' --disable-pump-mode" -USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system \ +PACKAGE_BEFORE_PN = "${PN}-distmon-gnome ${PN}-server" + +USERADD_PACKAGES = "${PN}-server" +USERADD_PARAM_${PN}-server = "--system \ --home /dev/null \ --no-create-home \ --gid nogroup \ distcc" +UPDATERCPN = "${PN}-server" INITSCRIPT_NAME = "distcc" -SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "distcc.service" +SYSTEMD_PACKAGES = "${PN}-server" +SYSTEMD_SERVICE_${PN}-server = "distcc.service" do_install() { # Improve reproducibility: compress w/o timestamps @@ -51,25 +54,14 @@ do_install() { install -d ${D}${systemd_unitdir}/system/ 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 = "" -DESKTOPINSTALL_libc-glibc () { - install -d ${D}${datadir}/distcc/ - install -m 0644 ${WORKDIR}/distccmon-gnome.desktop ${D}${datadir}/distcc/ } -PACKAGES += "distcc-distmon-gnome" - -FILES_${PN} = " ${sysconfdir} \ - ${bindir}/distcc \ - ${bindir}/lsdistcc \ - ${bindir}/distccd \ - ${bindir}/distccmon-text \ - ${sbindir}/update-distcc-symlinks \ - ${systemd_unitdir}/system/distcc.service" -FILES_distcc-distmon-gnome = " ${bindir}/distccmon-gnome \ - ${datadir}/distcc" +FILES_${PN}-server = "${sysconfdir} \ + ${bindir}/distccd \ + ${sbindir}" +FILES_${PN}-distmon-gnome = "${bindir}/distccmon-gnome \ + ${datadir}/applications \ + ${datadir}/pixmaps" # # distcc upstream dropped the 3.2 branch which we reference in older project releases |