<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="Generator" content="Microsoft Word 14 (filtered medium)">
<style><!--
/* Font Definitions */
@font-face
{font-family:宋体;
panose-1:2 1 6 0 3 1 1 1 1 1;}
@font-face
{font-family:宋体;
panose-1:2 1 6 0 3 1 1 1 1 1;}
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
@font-face
{font-family:Tahoma;
panose-1:2 11 6 4 3 5 4 4 2 4;}
@font-face
{font-family:"\@宋体";
panose-1:2 1 6 0 3 1 1 1 1 1;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0in;
margin-bottom:.0001pt;
font-size:12.0pt;
font-family:"Times New Roman","serif";}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:blue;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-priority:99;
color:purple;
text-decoration:underline;}
p.MsoAcetate, li.MsoAcetate, div.MsoAcetate
{mso-style-priority:99;
mso-style-link:"Balloon Text Char";
margin:0in;
margin-bottom:.0001pt;
font-size:8.0pt;
font-family:"Tahoma","sans-serif";}
span.hoenzb
{mso-style-name:hoenzb;}
span.BalloonTextChar
{mso-style-name:"Balloon Text Char";
mso-style-priority:99;
mso-style-link:"Balloon Text";
font-family:"Tahoma","sans-serif";}
span.EmailStyle20
{mso-style-type:personal-reply;
font-family:"Calibri","sans-serif";
color:#1F497D;}
.MsoChpDefault
{mso-style-type:export-only;
font-family:"Calibri","sans-serif";}
@page WordSection1
{size:8.5in 11.0in;
margin:1.0in 1.25in 1.0in 1.25in;}
div.WordSection1
{page:WordSection1;}
--></style><!--[if gte mso 9]><xml>
<o:shapedefaults v:ext="edit" spidmax="1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext="edit">
<o:idmap v:ext="edit" data="1" />
</o:shapelayout></xml><![endif]-->
</head>
<body lang="EN-US" link="blue" vlink="purple">
<div class="WordSection1">
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D">I will take a look and fix, thanks!<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D">Thanks,<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D">Jackie<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D"><o:p> </o:p></span></p>
<div style="border:none;border-left:solid blue 1.5pt;padding:0in 0in 0in 4.0pt">
<div>
<div style="border:none;border-top:solid #B5C4DF 1.0pt;padding:3.0pt 0in 0in 0in">
<p class="MsoNormal"><b><span style="font-size:10.0pt;font-family:"Tahoma","sans-serif"">From:</span></b><span style="font-size:10.0pt;font-family:"Tahoma","sans-serif""> Burton, Ross [mailto:ross.burton@intel.com]
<br>
<b>Sent:</b> Wednesday, March 21, 2018 18:44<br>
<b>To:</b> Huang, Jie (Jackie)<br>
<b>Cc:</b> OE-core<br>
<b>Subject:</b> Re: [OE-core] [PATCH] distcc: update to 3.3<o:p></o:p></span></p>
</div>
</div>
<p class="MsoNormal"><o:p> </o:p></p>
<div>
<p class="MsoNormal">This fails to start under systemd so caused the QA to fail:<o:p></o:p></p>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal"><a href="https://autobuilder.yocto.io/builders/nightly-qa-extras/builds/882/steps/Running%20Sanity%20Tests_7/logs/stdio">https://autobuilder.yocto.io/builders/nightly-qa-extras/builds/882/steps/Running%20Sanity%20Tests_7/logs/stdio</a><o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal">Ross<o:p></o:p></p>
</div>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
<div>
<p class="MsoNormal">On 15 March 2018 at 08:24, <<a href="mailto:jackie.huang@windriver.com" target="_blank">jackie.huang@windriver.com</a>> wrote:<o:p></o:p></p>
<p class="MsoNormal">From: Jackie Huang <<a href="mailto:jackie.huang@windriver.com">jackie.huang@windriver.com</a>><br>
<br>
* update to version 3.3<br>
* Remove 0001-zeroconf-Include-fcntl.h.patch since it's<br>
included in v3.3<br>
* Add update-distcc-symlinks into FILES.<br>
<br>
Signed-off-by: Jackie Huang <<a href="mailto:jackie.huang@windriver.com">jackie.huang@windriver.com</a>><br>
---<br>
.../distcc/{<a href="http://distcc_3.2.bb" target="_blank">distcc_3.2.bb</a> => <a href="http://distcc_3.3.bb" target="_blank">
distcc_3.3.bb</a>} | 10 +++++---<br>
.../files/0001-zeroconf-Include-fcntl.h.patch | 29 ----------------------<br>
2 files changed, 6 insertions(+), 33 deletions(-)<br>
rename meta/recipes-devtools/distcc/{<a href="http://distcc_3.2.bb" target="_blank">distcc_3.2.bb</a> =>
<a href="http://distcc_3.3.bb" target="_blank">distcc_3.3.bb</a>} (91%)<br>
delete mode 100644 meta/recipes-devtools/distcc/files/0001-zeroconf-Include-fcntl.h.patch<br>
<br>
diff --git a/meta/recipes-devtools/distcc/<a href="http://distcc_3.2.bb" target="_blank">distcc_3.2.bb</a> b/meta/recipes-devtools/distcc/<a href="http://distcc_3.3.bb" target="_blank">distcc_3.3.bb</a><br>
similarity index 91%<br>
rename from meta/recipes-devtools/distcc/<a href="http://distcc_3.2.bb" target="_blank">distcc_3.2.bb</a><br>
rename to meta/recipes-devtools/distcc/<a href="http://distcc_3.3.bb" target="_blank">distcc_3.3.bb</a><br>
index b6da65a582a..a266e7dde9b 100644<br>
--- a/meta/recipes-devtools/distcc/<a href="http://distcc_3.2.bb" target="_blank">distcc_3.2.bb</a><br>
+++ b/meta/recipes-devtools/distcc/<a href="http://distcc_3.3.bb" target="_blank">distcc_3.3.bb</a><br>
@@ -14,14 +14,15 @@ PACKAGECONFIG[popt] = "--without-included-popt,--with-included-popt,popt"<br>
<br>
RRECOMMENDS_${PN} = "avahi-daemon"<br>
<br>
-SRC_URI = "git://<a href="http://github.com/distcc/distcc.git;branch=$%7bPV%7d" target="_blank">github.com/distcc/distcc.git;branch=${PV}</a> \<br>
+SRC_URI = "git://<a href="http://github.com/distcc/distcc.git;branch=master" target="_blank">github.com/distcc/distcc.git;branch=master</a> \<br>
<a href="file:///\\separatebuilddir.patch">file://separatebuilddir.patch</a> \<br>
- <a href="file:///\\0001-zeroconf-Include-fcntl.h.patch">file://0001-zeroconf-Include-fcntl.h.patch</a> \<br>
<a href="file:///\\default">file://default</a> \<br>
<a href="file:///\\distccmon-gnome.desktop">file://distccmon-gnome.desktop</a> \<br>
<a href="file:///\\distcc">file://distcc</a> \<br>
<a href="file:///\\distcc.service">file://distcc.service</a>"<br>
-SRCREV = "d8b18df3e9dcbe4f092bed565835d3975e99432c"<br>
+<br>
+SRCREV = "002e68b766ccd7ad05551e67d162b71a7a773d0d"<br>
+<br>
S = "${WORKDIR}/git"<br>
UPSTREAM_VERSION_UNKNOWN = "1"<br>
<br>
@@ -60,9 +61,10 @@ PACKAGES += "distcc-distmon-gnome"<br>
<br>
FILES_${PN} = " ${sysconfdir} \<br>
${bindir}/distcc \<br>
- ${bindir}/lsdistcc \<br>
+ ${bindir}/lsdistcc \<br>
${bindir}/distccd \<br>
${bindir}/distccmon-text \<br>
+ ${sbindir}/update-distcc-symlinks \<br>
${systemd_unitdir}/system/distcc.service"<br>
FILES_distcc-distmon-gnome = " ${bindir}/distccmon-gnome \<br>
${datadir}/distcc"<br>
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<br>
deleted file mode 100644<br>
index b17ec9c9599..00000000000<br>
--- a/meta/recipes-devtools/distcc/files/0001-zeroconf-Include-fcntl.h.patch<br>
+++ /dev/null<br>
@@ -1,29 +0,0 @@<br>
-From 8331fc4759d809512f404e7a27f817ad6d616450 Mon Sep 17 00:00:00 2001<br>
-From: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
-Date: Mon, 13 Apr 2015 18:00:33 -0700<br>
-Subject: [PATCH] zeroconf: Include fcntl.h<br>
-<br>
-We need it for getting deinitions for O_* e.g. O_CREAT<br>
-<br>
-Upstream-Status: Pending<br>
-<br>
-Signed-off-by: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
----<br>
- src/zeroconf.c | 1 +<br>
- 1 file changed, 1 insertion(+)<br>
-<br>
-diff --git a/src/zeroconf.c b/src/zeroconf.c<br>
-index 414ddc4..31bd33f 100644<br>
---- a/src/zeroconf.c<br>
-+++ b/src/zeroconf.c<br>
-@@ -33,6 +33,7 @@<br>
- #include <unistd.h><br>
- #include <stdlib.h><br>
- #include <limits.h><br>
-+#include <fcntl.h><br>
-<br>
- #include <avahi-common/domain.h><br>
- #include <avahi-common/error.h><br>
---<br>
-2.1.4<br>
-<br>
<span class="hoenzb"><span style="color:#888888">--</span></span><span style="color:#888888"><br>
<span class="hoenzb">2.13.0</span><br>
<br>
<span class="hoenzb">--</span><br>
<span class="hoenzb">_______________________________________________</span><br>
<span class="hoenzb">Openembedded-core mailing list</span><br>
<span class="hoenzb"><a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.openembedded.org</a></span><br>
<span class="hoenzb"><a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a></span></span><o:p></o:p></p>
</div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
</div>
</div>
</body>
</html>