summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2018-05-12 00:15:20 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-29 21:07:12 +0100
commit074b2e8c2f8cef4e75e0c36811655d71aad50c53 (patch)
tree945ce93797bf3898774354204f800b549c02c173 /meta
parent1bd65698fc52f9596851ef9f9b8381ed3680ec35 (diff)
downloadpoky-074b2e8c2f8cef4e75e0c36811655d71aad50c53.tar.gz
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. (From OE-Core rev: dea59aab5d785d4f892cc26a8ea06eb4a6c554b3) Signed-off-by: Jackie Huang <jackie.huang@windriver.com> * 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 <slandden@gmail.com> 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 <hongxu.jia@windriver.com> 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.bb (renamed from meta/recipes-devtools/distcc/distcc_3.2.bb)8
-rw-r--r--meta/recipes-devtools/distcc/files/0001-zeroconf-Include-fcntl.h.patch29
-rw-r--r--meta/recipes-devtools/distcc/files/default4
3 files changed, 6 insertions, 35 deletions
diff --git a/meta/recipes-devtools/distcc/distcc_3.2.bb b/meta/recipes-devtools/distcc/distcc_3.3.bb
index 66046480b9..40648e2142 100644
--- a/meta/recipes-devtools/distcc/distcc_3.2.bb
+++ b/meta/recipes-devtools/distcc/distcc_3.3.bb
@@ -14,14 +14,13 @@ PACKAGECONFIG[popt] = "--without-included-popt,--with-included-popt,popt"
14 14
15RRECOMMENDS_${PN} = "avahi-daemon" 15RRECOMMENDS_${PN} = "avahi-daemon"
16 16
17SRC_URI = "git://github.com/akuster/distcc.git;branch=${PV} \ 17SRC_URI = "git://github.com/distcc/distcc.git \
18 file://separatebuilddir.patch \ 18 file://separatebuilddir.patch \
19 file://0001-zeroconf-Include-fcntl.h.patch \
20 file://default \ 19 file://default \
21 file://distccmon-gnome.desktop \ 20 file://distccmon-gnome.desktop \
22 file://distcc \ 21 file://distcc \
23 file://distcc.service" 22 file://distcc.service"
24SRCREV = "d8b18df3e9dcbe4f092bed565835d3975e99432c" 23SRCREV = "002e68b766ccd7ad05551e67d162b71a7a773d0d"
25S = "${WORKDIR}/git" 24S = "${WORKDIR}/git"
26 25
27inherit autotools pkgconfig update-rc.d useradd systemd 26inherit autotools pkgconfig update-rc.d useradd systemd
@@ -61,9 +60,10 @@ PACKAGES += "distcc-distmon-gnome"
61 60
62FILES_${PN} = " ${sysconfdir} \ 61FILES_${PN} = " ${sysconfdir} \
63 ${bindir}/distcc \ 62 ${bindir}/distcc \
64 ${bindir}/lsdistcc \ 63 ${bindir}/lsdistcc \
65 ${bindir}/distccd \ 64 ${bindir}/distccd \
66 ${bindir}/distccmon-text \ 65 ${bindir}/distccmon-text \
66 ${sbindir}/update-distcc-symlinks \
67 ${systemd_unitdir}/system/distcc.service" 67 ${systemd_unitdir}/system/distcc.service"
68FILES_distcc-distmon-gnome = " ${bindir}/distccmon-gnome \ 68FILES_distcc-distmon-gnome = " ${bindir}/distccmon-gnome \
69 ${datadir}/distcc" 69 ${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 @@
1From 8331fc4759d809512f404e7a27f817ad6d616450 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 13 Apr 2015 18:00:33 -0700
4Subject: [PATCH] zeroconf: Include fcntl.h
5
6We need it for getting deinitions for O_* e.g. O_CREAT
7
8Upstream-Status: Pending
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 src/zeroconf.c | 1 +
13 1 file changed, 1 insertion(+)
14
15diff --git a/src/zeroconf.c b/src/zeroconf.c
16index 414ddc4..31bd33f 100644
17--- a/src/zeroconf.c
18+++ b/src/zeroconf.c
19@@ -33,6 +33,7 @@
20 #include <unistd.h>
21 #include <stdlib.h>
22 #include <limits.h>
23+#include <fcntl.h>
24
25 #include <avahi-common/domain.h>
26 #include <avahi-common/error.h>
27--
282.1.4
29
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"
16# 16#
17# ALLOWEDNETS="127.0.0.1" 17# ALLOWEDNETS="127.0.0.1"
18 18
19ALLOWEDNETS="192.168.7.0/24" 19ALLOWEDNETS="127.0.0.1"
20 20
21# 21#
22# OPTIONS is used for the systemd service file 22# OPTIONS is used for the systemd service file
23# 23#
24OPTIONS="--allow 192.168.7.0/24" 24OPTIONS="--allow 127.0.0.1 --make-me-a-botnet"