summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2019-09-20 12:28:05 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-09-27 13:02:16 +0100
commit47c3142515e505a147fb8b73123b4c9700a0bf68 (patch)
tree747de18d2d2c8cac88fdb891b9bb78708ca4069c /meta
parent9acdbe9b60d126e8199154f7d3efbd026f624559 (diff)
downloadpoky-47c3142515e505a147fb8b73123b4c9700a0bf68.tar.gz
distcc: split into client and server packages
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. (From OE-Core rev: ca07f88c21094a04f6af1f87bc7d9afa477e30f1) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/distcc/distcc_3.3.3.bb33
1 files changed, 14 insertions, 19 deletions
diff --git a/meta/recipes-devtools/distcc/distcc_3.3.3.bb b/meta/recipes-devtools/distcc/distcc_3.3.3.bb
index d8ad498f2b..c52f136be8 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+"
12# use system popt by default 12# use system popt by default
13PACKAGECONFIG[popt] = "--without-included-popt,--with-included-popt,popt" 13PACKAGECONFIG[popt] = "--without-included-popt,--with-included-popt,popt"
14 14
15RRECOMMENDS_${PN} = "avahi-daemon" 15RRECOMMENDS_${PN}-server = "avahi-daemon"
16 16
17SRC_URI = "git://github.com/distcc/distcc.git \ 17SRC_URI = "git://github.com/distcc/distcc.git \
18 file://fix-gnome.patch \ 18 file://fix-gnome.patch \
@@ -29,17 +29,20 @@ ASNEEDED = ""
29 29
30EXTRA_OECONF += "--disable-Werror PYTHON='' --disable-pump-mode" 30EXTRA_OECONF += "--disable-Werror PYTHON='' --disable-pump-mode"
31 31
32USERADD_PACKAGES = "${PN}" 32PACKAGE_BEFORE_PN = "${PN}-distmon-gnome ${PN}-server"
33USERADD_PARAM_${PN} = "--system \ 33
34USERADD_PACKAGES = "${PN}-server"
35USERADD_PARAM_${PN}-server = "--system \
34 --home /dev/null \ 36 --home /dev/null \
35 --no-create-home \ 37 --no-create-home \
36 --gid nogroup \ 38 --gid nogroup \
37 distcc" 39 distcc"
38 40
41UPDATERCPN = "${PN}-server"
39INITSCRIPT_NAME = "distcc" 42INITSCRIPT_NAME = "distcc"
40 43
41SYSTEMD_PACKAGES = "${PN}" 44SYSTEMD_PACKAGES = "${PN}-server"
42SYSTEMD_SERVICE_${PN} = "distcc.service" 45SYSTEMD_SERVICE_${PN}-server = "distcc.service"
43 46
44do_install() { 47do_install() {
45 # Improve reproducibility: compress w/o timestamps 48 # Improve reproducibility: compress w/o timestamps
@@ -53,20 +56,12 @@ do_install() {
53 sed -i -e 's,@BINDIR@,${bindir},g' ${D}${systemd_unitdir}/system/distcc.service 56 sed -i -e 's,@BINDIR@,${bindir},g' ${D}${systemd_unitdir}/system/distcc.service
54} 57}
55 58
56PACKAGES += "distcc-distmon-gnome" 59FILES_${PN}-server = "${sysconfdir} \
57 60 ${bindir}/distccd \
58FILES_${PN} = " ${sysconfdir} \ 61 ${sbindir}"
59 ${bindir}/distcc \ 62FILES_${PN}-distmon-gnome = "${bindir}/distccmon-gnome \
60 ${bindir}/lsdistcc \ 63 ${datadir}/applications \
61 ${bindir}/distccd \ 64 ${datadir}/pixmaps"
62 ${bindir}/distccmon-text \
63 ${sbindir}/update-distcc-symlinks \
64 ${systemd_unitdir}/system/distcc.service"
65
66FILES_distcc-distmon-gnome = " ${bindir}/distccmon-gnome \
67 ${datadir}/applications \
68 ${datadir}/pixmaps"
69
70 65
71# 66#
72# distcc upstream dropped the 3.2 branch which we reference in older project releases 67# distcc upstream dropped the 3.2 branch which we reference in older project releases