diff mbox series

[4/4] distcc: split into client and server packages

Message ID 20190917123655.30315-4-ross.burton@intel.com
State New
Headers show
Series [1/4] libical: upgrade to 3.0.6 | expand

Commit Message

Ross Burton Sept. 17, 2019, 12:36 p.m. UTC 
Users of distcc are rarely both clients and servers, so split the package.
distcc is the client, the new distcc-server package is the server.

Signed-off-by: Ross Burton <ross.burton@intel.com>

---
 meta/recipes-devtools/distcc/distcc_3.3.3.bb | 21 +++++++-------------
 1 file changed, 7 insertions(+), 14 deletions(-)

-- 
2.20.1

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
diff mbox series

Patch

diff --git a/meta/recipes-devtools/distcc/distcc_3.3.3.bb b/meta/recipes-devtools/distcc/distcc_3.3.3.bb
index d8ad498f2b4..509b74baab2 100644
--- a/meta/recipes-devtools/distcc/distcc_3.3.3.bb
+++ b/meta/recipes-devtools/distcc/distcc_3.3.3.bb
@@ -12,7 +12,7 @@  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 \
@@ -29,6 +29,8 @@  ASNEEDED = ""
 
 EXTRA_OECONF += "--disable-Werror PYTHON='' --disable-pump-mode"
 
+PACKAGE_BEFORE_PN = "${PN}-distmon-gnome ${PN}-server"
+
 USERADD_PACKAGES = "${PN}"
 USERADD_PARAM_${PN} = "--system \
                        --home /dev/null \
@@ -38,8 +40,8 @@  USERADD_PARAM_${PN} = "--system \
 
 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
@@ -53,17 +55,8 @@  do_install() {
     sed -i -e 's,@BINDIR@,${bindir},g' ${D}${systemd_unitdir}/system/distcc.service
 }
 
-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 \
+FILES_${PN}-server = "${bindir}/distccd ${sysconfdir} ${sbindir}"
+FILES_${PN}-distmon-gnome = "  ${bindir}/distccmon-gnome \
 				${datadir}/applications \
 				${datadir}/pixmaps"