mirror of
https://git.yoctoproject.org/poky
synced 2026-04-05 08:02:25 +02:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
9acdbe9b60
commit
47c3142515
@@ -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,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
|
||||
@@ -53,20 +56,12 @@ 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 \
|
||||
${datadir}/applications \
|
||||
${datadir}/pixmaps"
|
||||
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user