* [PATCH] distcc: update to 3.3
@ 2018-03-15 8:24 jackie.huang
2018-03-21 10:43 ` Burton, Ross
0 siblings, 1 reply; 6+ messages in thread
From: jackie.huang @ 2018-03-15 8:24 UTC (permalink / raw)
To: openembedded-core
From: Jackie Huang <jackie.huang@windriver.com>
* 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 <jackie.huang@windriver.com>
---
.../distcc/{distcc_3.2.bb => distcc_3.3.bb} | 10 +++++---
.../files/0001-zeroconf-Include-fcntl.h.patch | 29 ----------------------
2 files changed, 6 insertions(+), 33 deletions(-)
rename meta/recipes-devtools/distcc/{distcc_3.2.bb => distcc_3.3.bb} (91%)
delete mode 100644 meta/recipes-devtools/distcc/files/0001-zeroconf-Include-fcntl.h.patch
diff --git a/meta/recipes-devtools/distcc/distcc_3.2.bb b/meta/recipes-devtools/distcc/distcc_3.3.bb
similarity index 91%
rename from meta/recipes-devtools/distcc/distcc_3.2.bb
rename to meta/recipes-devtools/distcc/distcc_3.3.bb
index b6da65a582a..a266e7dde9b 100644
--- a/meta/recipes-devtools/distcc/distcc_3.2.bb
+++ b/meta/recipes-devtools/distcc/distcc_3.3.bb
@@ -14,14 +14,15 @@ PACKAGECONFIG[popt] = "--without-included-popt,--with-included-popt,popt"
RRECOMMENDS_${PN} = "avahi-daemon"
-SRC_URI = "git://github.com/distcc/distcc.git;branch=${PV} \
+SRC_URI = "git://github.com/distcc/distcc.git;branch=master \
file://separatebuilddir.patch \
- file://0001-zeroconf-Include-fcntl.h.patch \
file://default \
file://distccmon-gnome.desktop \
file://distcc \
file://distcc.service"
-SRCREV = "d8b18df3e9dcbe4f092bed565835d3975e99432c"
+
+SRCREV = "002e68b766ccd7ad05551e67d162b71a7a773d0d"
+
S = "${WORKDIR}/git"
UPSTREAM_VERSION_UNKNOWN = "1"
@@ -60,9 +61,10 @@ PACKAGES += "distcc-distmon-gnome"
FILES_${PN} = " ${sysconfdir} \
${bindir}/distcc \
- ${bindir}/lsdistcc \
+ ${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 b17ec9c9599..00000000000
--- 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 <raj.khem@gmail.com>
-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 <raj.khem@gmail.com>
----
- 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 <unistd.h>
- #include <stdlib.h>
- #include <limits.h>
-+#include <fcntl.h>
-
- #include <avahi-common/domain.h>
- #include <avahi-common/error.h>
---
-2.1.4
-
--
2.13.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] distcc: update to 3.3 2018-03-15 8:24 [PATCH] distcc: update to 3.3 jackie.huang @ 2018-03-21 10:43 ` Burton, Ross 2018-03-22 1:09 ` Huang, Jie (Jackie) 0 siblings, 1 reply; 6+ messages in thread From: Burton, Ross @ 2018-03-21 10:43 UTC (permalink / raw) To: Huang, Jie (Jackie); +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 3907 bytes --] This fails to start under systemd so caused the QA to fail: https://autobuilder.yocto.io/builders/nightly-qa-extras/builds/882/steps/Running%20Sanity%20Tests_7/logs/stdio Ross On 15 March 2018 at 08:24, <jackie.huang@windriver.com> wrote: > From: Jackie Huang <jackie.huang@windriver.com> > > * 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 <jackie.huang@windriver.com> > --- > .../distcc/{distcc_3.2.bb => distcc_3.3.bb} | 10 +++++--- > .../files/0001-zeroconf-Include-fcntl.h.patch | 29 > ---------------------- > 2 files changed, 6 insertions(+), 33 deletions(-) > rename meta/recipes-devtools/distcc/{distcc_3.2.bb => distcc_3.3.bb} > (91%) > delete mode 100644 meta/recipes-devtools/distcc/ > files/0001-zeroconf-Include-fcntl.h.patch > > diff --git a/meta/recipes-devtools/distcc/distcc_3.2.bb > b/meta/recipes-devtools/distcc/distcc_3.3.bb > similarity index 91% > rename from meta/recipes-devtools/distcc/distcc_3.2.bb > rename to meta/recipes-devtools/distcc/distcc_3.3.bb > index b6da65a582a..a266e7dde9b 100644 > --- a/meta/recipes-devtools/distcc/distcc_3.2.bb > +++ b/meta/recipes-devtools/distcc/distcc_3.3.bb > @@ -14,14 +14,15 @@ PACKAGECONFIG[popt] = "--without-included-popt,-- > with-included-popt,popt" > > RRECOMMENDS_${PN} = "avahi-daemon" > > -SRC_URI = "git://github.com/distcc/distcc.git;branch=${PV} \ > +SRC_URI = "git://github.com/distcc/distcc.git;branch=master \ > file://separatebuilddir.patch \ > - file://0001-zeroconf-Include-fcntl.h.patch \ > file://default \ > file://distccmon-gnome.desktop \ > file://distcc \ > file://distcc.service" > -SRCREV = "d8b18df3e9dcbe4f092bed565835d3975e99432c" > + > +SRCREV = "002e68b766ccd7ad05551e67d162b71a7a773d0d" > + > S = "${WORKDIR}/git" > UPSTREAM_VERSION_UNKNOWN = "1" > > @@ -60,9 +61,10 @@ PACKAGES += "distcc-distmon-gnome" > > FILES_${PN} = " ${sysconfdir} \ > ${bindir}/distcc \ > - ${bindir}/lsdistcc \ > + ${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 b17ec9c9599..00000000000 > --- 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 <raj.khem@gmail.com> > -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 <raj.khem@gmail.com> > ---- > - 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 <unistd.h> > - #include <stdlib.h> > - #include <limits.h> > -+#include <fcntl.h> > - > - #include <avahi-common/domain.h> > - #include <avahi-common/error.h> > --- > -2.1.4 > - > -- > 2.13.0 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > [-- Attachment #2: Type: text/html, Size: 6287 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] distcc: update to 3.3 2018-03-21 10:43 ` Burton, Ross @ 2018-03-22 1:09 ` Huang, Jie (Jackie) 2018-05-10 12:02 ` Burton, Ross 0 siblings, 1 reply; 6+ messages in thread From: Huang, Jie (Jackie) @ 2018-03-22 1:09 UTC (permalink / raw) To: BURTON, ROSS; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 4650 bytes --] I will take a look and fix, thanks! Thanks, Jackie From: Burton, Ross [mailto:ross.burton@intel.com] Sent: Wednesday, March 21, 2018 18:44 To: Huang, Jie (Jackie) Cc: OE-core Subject: Re: [OE-core] [PATCH] distcc: update to 3.3 This fails to start under systemd so caused the QA to fail: https://autobuilder.yocto.io/builders/nightly-qa-extras/builds/882/steps/Running%20Sanity%20Tests_7/logs/stdio Ross On 15 March 2018 at 08:24, <jackie.huang@windriver.com<mailto:jackie.huang@windriver.com>> wrote: From: Jackie Huang <jackie.huang@windriver.com<mailto:jackie.huang@windriver.com>> * 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 <jackie.huang@windriver.com<mailto:jackie.huang@windriver.com>> --- .../distcc/{distcc_3.2.bb<http://distcc_3.2.bb> => distcc_3.3.bb<http://distcc_3.3.bb>} | 10 +++++--- .../files/0001-zeroconf-Include-fcntl.h.patch | 29 ---------------------- 2 files changed, 6 insertions(+), 33 deletions(-) rename meta/recipes-devtools/distcc/{distcc_3.2.bb<http://distcc_3.2.bb> => distcc_3.3.bb<http://distcc_3.3.bb>} (91%) delete mode 100644 meta/recipes-devtools/distcc/files/0001-zeroconf-Include-fcntl.h.patch diff --git a/meta/recipes-devtools/distcc/distcc_3.2.bb<http://distcc_3.2.bb> b/meta/recipes-devtools/distcc/distcc_3.3.bb<http://distcc_3.3.bb> similarity index 91% rename from meta/recipes-devtools/distcc/distcc_3.2.bb<http://distcc_3.2.bb> rename to meta/recipes-devtools/distcc/distcc_3.3.bb<http://distcc_3.3.bb> index b6da65a582a..a266e7dde9b 100644 --- a/meta/recipes-devtools/distcc/distcc_3.2.bb<http://distcc_3.2.bb> +++ b/meta/recipes-devtools/distcc/distcc_3.3.bb<http://distcc_3.3.bb> @@ -14,14 +14,15 @@ PACKAGECONFIG[popt] = "--without-included-popt,--with-included-popt,popt" RRECOMMENDS_${PN} = "avahi-daemon" -SRC_URI = "git://github.com/distcc/distcc.git;branch=${PV}<http://github.com/distcc/distcc.git;branch=$%7bPV%7d> \ +SRC_URI = "git://github.com/distcc/distcc.git;branch=master<http://github.com/distcc/distcc.git;branch=master> \ file://separatebuilddir.patch<file:///\\separatebuilddir.patch> \ - file://0001-zeroconf-Include-fcntl.h.patch<file:///\\0001-zeroconf-Include-fcntl.h.patch> \ file://default<file:///\\default> \ file://distccmon-gnome.desktop<file:///\\distccmon-gnome.desktop> \ file://distcc<file:///\\distcc> \ file://distcc.service<file:///\\distcc.service>" -SRCREV = "d8b18df3e9dcbe4f092bed565835d3975e99432c" + +SRCREV = "002e68b766ccd7ad05551e67d162b71a7a773d0d" + S = "${WORKDIR}/git" UPSTREAM_VERSION_UNKNOWN = "1" @@ -60,9 +61,10 @@ PACKAGES += "distcc-distmon-gnome" FILES_${PN} = " ${sysconfdir} \ ${bindir}/distcc \ - ${bindir}/lsdistcc \ + ${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 b17ec9c9599..00000000000 --- 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 <raj.khem@gmail.com<mailto:raj.khem@gmail.com>> -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 <raj.khem@gmail.com<mailto:raj.khem@gmail.com>> ---- - 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 <unistd.h> - #include <stdlib.h> - #include <limits.h> -+#include <fcntl.h> - - #include <avahi-common/domain.h> - #include <avahi-common/error.h> --- -2.1.4 - -- 2.13.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org<mailto:Openembedded-core@lists.openembedded.org> http://lists.openembedded.org/mailman/listinfo/openembedded-core [-- Attachment #2: Type: text/html, Size: 10841 bytes --] ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] distcc: update to 3.3 2018-03-22 1:09 ` Huang, Jie (Jackie) @ 2018-05-10 12:02 ` Burton, Ross 2018-05-10 12:54 ` Huang, Jie (Jackie) 2018-05-11 19:32 ` akuster808 0 siblings, 2 replies; 6+ messages in thread From: Burton, Ross @ 2018-05-10 12:02 UTC (permalink / raw) To: Huang, Jackie (Wind River); +Cc: OE-core Hi Jackie, Did you get to look at the distcc 3.3 upgrade failures? We're open again for updates and moving to 3.3 instead of a forked repository on Armin's personal github would be nice! Ross On 22 March 2018 at 01:09, Huang, Jackie (Wind River) <jackie.huang@windriver.com> wrote: > I will take a look and fix, thanks! > > > > Thanks, > > Jackie > > > > From: Burton, Ross [mailto:ross.burton@intel.com] > Sent: Wednesday, March 21, 2018 18:44 > To: Huang, Jie (Jackie) > Cc: OE-core > Subject: Re: [OE-core] [PATCH] distcc: update to 3.3 > > > > This fails to start under systemd so caused the QA to fail: > > > > https://autobuilder.yocto.io/builders/nightly-qa-extras/builds/882/steps/Running%20Sanity%20Tests_7/logs/stdio > > > > Ross > > > > On 15 March 2018 at 08:24, <jackie.huang@windriver.com> wrote: > > From: Jackie Huang <jackie.huang@windriver.com> > > * 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 <jackie.huang@windriver.com> > --- > .../distcc/{distcc_3.2.bb => distcc_3.3.bb} | 10 +++++--- > .../files/0001-zeroconf-Include-fcntl.h.patch | 29 > ---------------------- > 2 files changed, 6 insertions(+), 33 deletions(-) > rename meta/recipes-devtools/distcc/{distcc_3.2.bb => distcc_3.3.bb} (91%) > delete mode 100644 > meta/recipes-devtools/distcc/files/0001-zeroconf-Include-fcntl.h.patch > > diff --git a/meta/recipes-devtools/distcc/distcc_3.2.bb > b/meta/recipes-devtools/distcc/distcc_3.3.bb > similarity index 91% > rename from meta/recipes-devtools/distcc/distcc_3.2.bb > rename to meta/recipes-devtools/distcc/distcc_3.3.bb > index b6da65a582a..a266e7dde9b 100644 > --- a/meta/recipes-devtools/distcc/distcc_3.2.bb > +++ b/meta/recipes-devtools/distcc/distcc_3.3.bb > @@ -14,14 +14,15 @@ PACKAGECONFIG[popt] = > "--without-included-popt,--with-included-popt,popt" > > RRECOMMENDS_${PN} = "avahi-daemon" > > -SRC_URI = "git://github.com/distcc/distcc.git;branch=${PV} \ > +SRC_URI = "git://github.com/distcc/distcc.git;branch=master \ > file://separatebuilddir.patch \ > - file://0001-zeroconf-Include-fcntl.h.patch \ > file://default \ > file://distccmon-gnome.desktop \ > file://distcc \ > file://distcc.service" > -SRCREV = "d8b18df3e9dcbe4f092bed565835d3975e99432c" > + > +SRCREV = "002e68b766ccd7ad05551e67d162b71a7a773d0d" > + > S = "${WORKDIR}/git" > UPSTREAM_VERSION_UNKNOWN = "1" > > @@ -60,9 +61,10 @@ PACKAGES += "distcc-distmon-gnome" > > FILES_${PN} = " ${sysconfdir} \ > ${bindir}/distcc \ > - ${bindir}/lsdistcc \ > + ${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 b17ec9c9599..00000000000 > --- 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 <raj.khem@gmail.com> > -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 <raj.khem@gmail.com> > ---- > - 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 <unistd.h> > - #include <stdlib.h> > - #include <limits.h> > -+#include <fcntl.h> > - > - #include <avahi-common/domain.h> > - #include <avahi-common/error.h> > --- > -2.1.4 > - > -- > 2.13.0 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] distcc: update to 3.3 2018-05-10 12:02 ` Burton, Ross @ 2018-05-10 12:54 ` Huang, Jie (Jackie) 2018-05-11 19:32 ` akuster808 1 sibling, 0 replies; 6+ messages in thread From: Huang, Jie (Jackie) @ 2018-05-10 12:54 UTC (permalink / raw) To: BURTON, ROSS; +Cc: OE-core > -----Original Message----- > From: Burton, Ross [mailto:ross.burton@intel.com] > Sent: Thursday, May 10, 2018 20:03 > To: Huang, Jie (Jackie) > Cc: OE-core > Subject: Re: [OE-core] [PATCH] distcc: update to 3.3 > > Hi Jackie, > > Did you get to look at the distcc 3.3 upgrade failures? We're open Sorry I don't have time to fix the failure, I will have one of my colleagues to take it over soon. Thanks, Jackie > again for updates and moving to 3.3 instead of a forked repository on > Armin's personal github would be nice! > > Ross > > On 22 March 2018 at 01:09, Huang, Jackie (Wind River) > <jackie.huang@windriver.com> wrote: > > I will take a look and fix, thanks! > > > > > > > > Thanks, > > > > Jackie > > > > > > > > From: Burton, Ross [mailto:ross.burton@intel.com] > > Sent: Wednesday, March 21, 2018 18:44 > > To: Huang, Jie (Jackie) > > Cc: OE-core > > Subject: Re: [OE-core] [PATCH] distcc: update to 3.3 > > > > > > > > This fails to start under systemd so caused the QA to fail: > > > > > > > > https://autobuilder.yocto.io/builders/nightly-qa-extras/builds/882/steps/Running%20Sanity%20Tests_7/logs/stdio > > > > > > > > Ross > > > > > > > > On 15 March 2018 at 08:24, <jackie.huang@windriver.com> wrote: > > > > From: Jackie Huang <jackie.huang@windriver.com> > > > > * 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 <jackie.huang@windriver.com> > > --- > > .../distcc/{distcc_3.2.bb => distcc_3.3.bb} | 10 +++++--- > > .../files/0001-zeroconf-Include-fcntl.h.patch | 29 > > ---------------------- > > 2 files changed, 6 insertions(+), 33 deletions(-) > > rename meta/recipes-devtools/distcc/{distcc_3.2.bb => distcc_3.3.bb} (91%) > > delete mode 100644 > > meta/recipes-devtools/distcc/files/0001-zeroconf-Include-fcntl.h.patch > > > > diff --git a/meta/recipes-devtools/distcc/distcc_3.2.bb > > b/meta/recipes-devtools/distcc/distcc_3.3.bb > > similarity index 91% > > rename from meta/recipes-devtools/distcc/distcc_3.2.bb > > rename to meta/recipes-devtools/distcc/distcc_3.3.bb > > index b6da65a582a..a266e7dde9b 100644 > > --- a/meta/recipes-devtools/distcc/distcc_3.2.bb > > +++ b/meta/recipes-devtools/distcc/distcc_3.3.bb > > @@ -14,14 +14,15 @@ PACKAGECONFIG[popt] = > > "--without-included-popt,--with-included-popt,popt" > > > > RRECOMMENDS_${PN} = "avahi-daemon" > > > > -SRC_URI = "git://github.com/distcc/distcc.git;branch=${PV} \ > > +SRC_URI = "git://github.com/distcc/distcc.git;branch=master \ > > file://separatebuilddir.patch \ > > - file://0001-zeroconf-Include-fcntl.h.patch \ > > file://default \ > > file://distccmon-gnome.desktop \ > > file://distcc \ > > file://distcc.service" > > -SRCREV = "d8b18df3e9dcbe4f092bed565835d3975e99432c" > > + > > +SRCREV = "002e68b766ccd7ad05551e67d162b71a7a773d0d" > > + > > S = "${WORKDIR}/git" > > UPSTREAM_VERSION_UNKNOWN = "1" > > > > @@ -60,9 +61,10 @@ PACKAGES += "distcc-distmon-gnome" > > > > FILES_${PN} = " ${sysconfdir} \ > > ${bindir}/distcc \ > > - ${bindir}/lsdistcc \ > > + ${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 b17ec9c9599..00000000000 > > --- 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 <raj.khem@gmail.com> > > -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 <raj.khem@gmail.com> > > ---- > > - 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 <unistd.h> > > - #include <stdlib.h> > > - #include <limits.h> > > -+#include <fcntl.h> > > - > > - #include <avahi-common/domain.h> > > - #include <avahi-common/error.h> > > --- > > -2.1.4 > > - > > -- > > 2.13.0 > > > > -- > > _______________________________________________ > > Openembedded-core mailing list > > Openembedded-core@lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-core > > > > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] distcc: update to 3.3 2018-05-10 12:02 ` Burton, Ross 2018-05-10 12:54 ` Huang, Jie (Jackie) @ 2018-05-11 19:32 ` akuster808 1 sibling, 0 replies; 6+ messages in thread From: akuster808 @ 2018-05-11 19:32 UTC (permalink / raw) To: Burton, Ross, Huang, Jackie (Wind River); +Cc: OE-core On 05/10/2018 05:02 AM, Burton, Ross wrote: > Hi Jackie, > > Did you get to look at the distcc 3.3 upgrade failures? We're open > again for updates and moving to 3.3 instead of a forked repository on > Armin's personal github would be nice! yes it would. - armin > > Ross > > On 22 March 2018 at 01:09, Huang, Jackie (Wind River) > <jackie.huang@windriver.com> wrote: >> I will take a look and fix, thanks! >> >> >> >> Thanks, >> >> Jackie >> >> >> >> From: Burton, Ross [mailto:ross.burton@intel.com] >> Sent: Wednesday, March 21, 2018 18:44 >> To: Huang, Jie (Jackie) >> Cc: OE-core >> Subject: Re: [OE-core] [PATCH] distcc: update to 3.3 >> >> >> >> This fails to start under systemd so caused the QA to fail: >> >> >> >> https://autobuilder.yocto.io/builders/nightly-qa-extras/builds/882/steps/Running%20Sanity%20Tests_7/logs/stdio >> >> >> >> Ross >> >> >> >> On 15 March 2018 at 08:24, <jackie.huang@windriver.com> wrote: >> >> From: Jackie Huang <jackie.huang@windriver.com> >> >> * 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 <jackie.huang@windriver.com> >> --- >> .../distcc/{distcc_3.2.bb => distcc_3.3.bb} | 10 +++++--- >> .../files/0001-zeroconf-Include-fcntl.h.patch | 29 >> ---------------------- >> 2 files changed, 6 insertions(+), 33 deletions(-) >> rename meta/recipes-devtools/distcc/{distcc_3.2.bb => distcc_3.3.bb} (91%) >> delete mode 100644 >> meta/recipes-devtools/distcc/files/0001-zeroconf-Include-fcntl.h.patch >> >> diff --git a/meta/recipes-devtools/distcc/distcc_3.2.bb >> b/meta/recipes-devtools/distcc/distcc_3.3.bb >> similarity index 91% >> rename from meta/recipes-devtools/distcc/distcc_3.2.bb >> rename to meta/recipes-devtools/distcc/distcc_3.3.bb >> index b6da65a582a..a266e7dde9b 100644 >> --- a/meta/recipes-devtools/distcc/distcc_3.2.bb >> +++ b/meta/recipes-devtools/distcc/distcc_3.3.bb >> @@ -14,14 +14,15 @@ PACKAGECONFIG[popt] = >> "--without-included-popt,--with-included-popt,popt" >> >> RRECOMMENDS_${PN} = "avahi-daemon" >> >> -SRC_URI = "git://github.com/distcc/distcc.git;branch=${PV} \ >> +SRC_URI = "git://github.com/distcc/distcc.git;branch=master \ >> file://separatebuilddir.patch \ >> - file://0001-zeroconf-Include-fcntl.h.patch \ >> file://default \ >> file://distccmon-gnome.desktop \ >> file://distcc \ >> file://distcc.service" >> -SRCREV = "d8b18df3e9dcbe4f092bed565835d3975e99432c" >> + >> +SRCREV = "002e68b766ccd7ad05551e67d162b71a7a773d0d" >> + >> S = "${WORKDIR}/git" >> UPSTREAM_VERSION_UNKNOWN = "1" >> >> @@ -60,9 +61,10 @@ PACKAGES += "distcc-distmon-gnome" >> >> FILES_${PN} = " ${sysconfdir} \ >> ${bindir}/distcc \ >> - ${bindir}/lsdistcc \ >> + ${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 b17ec9c9599..00000000000 >> --- 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 <raj.khem@gmail.com> >> -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 <raj.khem@gmail.com> >> ---- >> - 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 <unistd.h> >> - #include <stdlib.h> >> - #include <limits.h> >> -+#include <fcntl.h> >> - >> - #include <avahi-common/domain.h> >> - #include <avahi-common/error.h> >> --- >> -2.1.4 >> - >> -- >> 2.13.0 >> >> -- >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core@lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core >> >> ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-05-11 19:32 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2018-03-15 8:24 [PATCH] distcc: update to 3.3 jackie.huang 2018-03-21 10:43 ` Burton, Ross 2018-03-22 1:09 ` Huang, Jie (Jackie) 2018-05-10 12:02 ` Burton, Ross 2018-05-10 12:54 ` Huang, Jie (Jackie) 2018-05-11 19:32 ` akuster808
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.