From dea59aab5d785d4f892cc26a8ea06eb4a6c554b3 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Sat, 12 May 2018 00:15:20 +0800 Subject: distcc: update to 3.3 * update to version 3.3 * Remove 0001-zeroconf-Include-fcntl.h.patch since it's included in v3.3 * Add update-distcc-symlinks into FILES. Signed-off-by: Jackie Huang * Correct upstream SRC_URI and SRCREV to v3.3 * Correct default to fix starting distccd service failed It caused by upstream commit: https://github.com/distcc/distcc/commit/920e8b922addea8c54e68cc29c1416753f532f78 ... commit 920e8b922addea8c54e68cc29c1416753f532f78 Author: Shawn Landden Date: Mon Feb 26 11:29:14 2018 -0800 daemon: warn when masquerade is not setup ... Add option --make-me-a-botnet to disable the warning. * Use localhost to replace 192.168.7.0/24 which is inappropriate for runqemu slirp. [YOCTO #12741] Signed-off-by: Hongxu Jia Signed-off-by: Ross Burton --- meta/recipes-devtools/distcc/distcc_3.2.bb | 69 ---------------------- meta/recipes-devtools/distcc/distcc_3.3.bb | 69 ++++++++++++++++++++++ .../files/0001-zeroconf-Include-fcntl.h.patch | 29 --------- meta/recipes-devtools/distcc/files/default | 4 +- 4 files changed, 71 insertions(+), 100 deletions(-) delete mode 100644 meta/recipes-devtools/distcc/distcc_3.2.bb create mode 100644 meta/recipes-devtools/distcc/distcc_3.3.bb delete mode 100644 meta/recipes-devtools/distcc/files/0001-zeroconf-Include-fcntl.h.patch (limited to 'meta/recipes-devtools/distcc') diff --git a/meta/recipes-devtools/distcc/distcc_3.2.bb b/meta/recipes-devtools/distcc/distcc_3.2.bb deleted file mode 100644 index 66046480b9..0000000000 --- a/meta/recipes-devtools/distcc/distcc_3.2.bb +++ /dev/null @@ -1,69 +0,0 @@ -SUMMARY = "A parallel build system" -DESCRIPTION = "distcc is a parallel build system that distributes \ -compilation of C/C++/ObjC code across machines on a network." -SECTION = "devel" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -DEPENDS = "avahi binutils" - -PACKAGECONFIG ??= "popt" -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" - -SRC_URI = "git://github.com/akuster/distcc.git;branch=${PV} \ - file://separatebuilddir.patch \ - file://0001-zeroconf-Include-fcntl.h.patch \ - file://default \ - file://distccmon-gnome.desktop \ - file://distcc \ - file://distcc.service" -SRCREV = "d8b18df3e9dcbe4f092bed565835d3975e99432c" -S = "${WORKDIR}/git" - -inherit autotools pkgconfig update-rc.d useradd systemd - -EXTRA_OECONF += "--disable-Werror PYTHON='' --disable-pump-mode" - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system \ - --home /dev/null \ - --no-create-home \ - --gid nogroup \ - distcc" - -INITSCRIPT_NAME = "distcc" - -SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "distcc.service" - -do_install() { - # Improve reproducibility: compress w/o timestamps - oe_runmake 'DESTDIR=${D}' "GZIP_BIN=gzip -n" install - install -d ${D}${sysconfdir}/init.d/ - install -d ${D}${sysconfdir}/default - 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}/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 \ - ${systemd_unitdir}/system/distcc.service" -FILES_distcc-distmon-gnome = " ${bindir}/distccmon-gnome \ - ${datadir}/distcc" diff --git a/meta/recipes-devtools/distcc/distcc_3.3.bb b/meta/recipes-devtools/distcc/distcc_3.3.bb new file mode 100644 index 0000000000..40648e2142 --- /dev/null +++ b/meta/recipes-devtools/distcc/distcc_3.3.bb @@ -0,0 +1,69 @@ +SUMMARY = "A parallel build system" +DESCRIPTION = "distcc is a parallel build system that distributes \ +compilation of C/C++/ObjC code across machines on a network." +SECTION = "devel" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +DEPENDS = "avahi binutils" + +PACKAGECONFIG ??= "popt" +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" + +SRC_URI = "git://github.com/distcc/distcc.git \ + file://separatebuilddir.patch \ + file://default \ + file://distccmon-gnome.desktop \ + file://distcc \ + file://distcc.service" +SRCREV = "002e68b766ccd7ad05551e67d162b71a7a773d0d" +S = "${WORKDIR}/git" + +inherit autotools pkgconfig update-rc.d useradd systemd + +EXTRA_OECONF += "--disable-Werror PYTHON='' --disable-pump-mode" + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM_${PN} = "--system \ + --home /dev/null \ + --no-create-home \ + --gid nogroup \ + distcc" + +INITSCRIPT_NAME = "distcc" + +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE_${PN} = "distcc.service" + +do_install() { + # Improve reproducibility: compress w/o timestamps + oe_runmake 'DESTDIR=${D}' "GZIP_BIN=gzip -n" install + install -d ${D}${sysconfdir}/init.d/ + install -d ${D}${sysconfdir}/default + 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}/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" diff --git a/meta/recipes-devtools/distcc/files/0001-zeroconf-Include-fcntl.h.patch b/meta/recipes-devtools/distcc/files/0001-zeroconf-Include-fcntl.h.patch deleted file mode 100644 index b17ec9c959..0000000000 --- a/meta/recipes-devtools/distcc/files/0001-zeroconf-Include-fcntl.h.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 8331fc4759d809512f404e7a27f817ad6d616450 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 13 Apr 2015 18:00:33 -0700 -Subject: [PATCH] zeroconf: Include fcntl.h - -We need it for getting deinitions for O_* e.g. O_CREAT - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - src/zeroconf.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/zeroconf.c b/src/zeroconf.c -index 414ddc4..31bd33f 100644 ---- a/src/zeroconf.c -+++ b/src/zeroconf.c -@@ -33,6 +33,7 @@ - #include - #include - #include -+#include - - #include - #include --- -2.1.4 - diff --git a/meta/recipes-devtools/distcc/files/default b/meta/recipes-devtools/distcc/files/default index 63c4159b9d..e5ca68b856 100644 --- a/meta/recipes-devtools/distcc/files/default +++ b/meta/recipes-devtools/distcc/files/default @@ -16,9 +16,9 @@ STARTDISTCC="true" # # ALLOWEDNETS="127.0.0.1" -ALLOWEDNETS="192.168.7.0/24" +ALLOWEDNETS="127.0.0.1" # # OPTIONS is used for the systemd service file # -OPTIONS="--allow 192.168.7.0/24" +OPTIONS="--allow 127.0.0.1 --make-me-a-botnet" -- cgit 1.2.3-korg