* [Buildroot] [PATCH 1/3] package/urg: fix build
@ 2016-09-12 19:23 Samuel Martin
2016-09-12 19:23 ` [Buildroot] [PATCH 2/3] package/urg: fix build with gcc-6 Samuel Martin
` (2 more replies)
0 siblings, 3 replies; 16+ messages in thread
From: Samuel Martin @ 2016-09-12 19:23 UTC (permalink / raw)
To: buildroot
Update select-h patch to also fix the C++ serial driver.
Fixes:
http://autobuild.buildroot.net/results/cd7/cd76699188d2ee99b5f2d32b6a797de0d832a192/
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
package/urg/0001-select-h.patch | 27 ++++++++++++++++++++++-----
1 file changed, 22 insertions(+), 5 deletions(-)
diff --git a/package/urg/0001-select-h.patch b/package/urg/0001-select-h.patch
index 09d1530..46bb102 100644
--- a/package/urg/0001-select-h.patch
+++ b/package/urg/0001-select-h.patch
@@ -1,11 +1,28 @@
---- urg-0.8.18/src/c/connection/serial_ctrl_lin.c 2010-11-22 01:48:01.000000000 +0000
-+++ urg-0.8.18.mod/src/c/connection/serial_ctrl_lin.c 2013-05-21 20:56:35.822025969 +0100
-@@ -17,7 +17,7 @@
- #include <fcntl.h>
+Serial driver: add missing header to C and C++ serial driver
+
+Fixes:
+ http://autobuild.buildroot.net/results/cd7/cd76699188d2ee99b5f2d32b6a797de0d832a192/
+
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+
+--- a/src/c/connection/serial_ctrl_lin.c 2016-09-11 15:49:42.599807053 +0200
++++ b/src/c/connection/serial_ctrl_lin.c 2016-09-11 15:50:07.850700420 +0200
+@@ -18,6 +18,7 @@
#include <errno.h>
#include <string.h>
--
+
+#include <sys/select.h>
//#include <ctype.h>
enum {
+--- a/src/cpp/connection/SerialDevice_lin.cpp 2016-09-11 15:38:23.335547059 +0200
++++ b/src/cpp/connection/SerialDevice_lin.cpp 2016-09-11 15:38:38.472741418 +0200
+@@ -13,7 +13,7 @@
+ #include <cerrno>
+ #include <cstring>
+ #include <cstdio>
+-
++#include <sys/select.h>
+
+ class RawSerialDevice
+ {
--
2.9.3
^ permalink raw reply related [flat|nested] 16+ messages in thread* [Buildroot] [PATCH 2/3] package/urg: fix build with gcc-6 2016-09-12 19:23 [Buildroot] [PATCH 1/3] package/urg: fix build Samuel Martin @ 2016-09-12 19:23 ` Samuel Martin 2016-09-12 20:41 ` Thomas Petazzoni 2016-10-15 10:24 ` Thomas Petazzoni 2016-09-12 19:23 ` [Buildroot] [PATCH 3/3] package/nginx-naxsi: add missing pcre dependency Samuel Martin 2016-09-12 20:41 ` [Buildroot] [PATCH 1/3] package/urg: fix build Thomas Petazzoni 2 siblings, 2 replies; 16+ messages in thread From: Samuel Martin @ 2016-09-12 19:23 UTC (permalink / raw) To: buildroot Add patch fixing/adding explicit cast on negative value in char[], which is required with gcc-6 (see "Narrowing conversions" paragraph in [1]) Fixes: http://autobuild.buildroot.net/results/d0c/d0cd11163753db69a14c02e941dbda40e5f98bba/ [1] https://gcc.gnu.org/gcc-6/porting_to.html Signed-off-by: Samuel Martin <s.martin49@gmail.com> --- .../0002-urg-gcc6-fix-narrowing-conversion.patch | 99 ++++++++++++++++++++++ 1 file changed, 99 insertions(+) create mode 100644 package/urg/0002-urg-gcc6-fix-narrowing-conversion.patch diff --git a/package/urg/0002-urg-gcc6-fix-narrowing-conversion.patch b/package/urg/0002-urg-gcc6-fix-narrowing-conversion.patch new file mode 100644 index 0000000..e3db898 --- /dev/null +++ b/package/urg/0002-urg-gcc6-fix-narrowing-conversion.patch @@ -0,0 +1,99 @@ +urg: fix 'narrowing conversion' with gcc6 + +Fixes: + http://autobuild.buildroot.net/results/d0c/d0cd11163753db69a14c02e941dbda40e5f98bba/ + +Signed-off-by: Samuel Martin <s.martin49@gmail.com> + +--- a/src/cpp/urg/ScipHandler.cpp 2016-09-11 16:11:16.083995214 +0200 ++++ b/src/cpp/urg/ScipHandler.cpp 2016-09-11 16:11:24.380832543 +0200 +@@ -120,7 +120,7 @@ struct ScipHandler::pImpl + + // QT ?????s + int return_code = -1; +- char qt_expected_response[] = { 0, -1 }; ++ char qt_expected_response[] = { 0, (char)-1 }; + // return_code ???g???????????AsetLaserOutput() ???p?????? QT ?????M???? + if (response(return_code, "QT\n", qt_expected_response)) { + laser_state_ = LaserOff; +@@ -139,7 +139,7 @@ struct ScipHandler::pImpl + + } else if (return_code == Scip11Response) { + // SCIP1.1 ?v???g?R?????????????ASCIP2.0 ?????M???? +- char scip20_expected_response[] = { 0, -1 }; ++ char scip20_expected_response[] = { 0, (char)-1 }; + if (! response(return_code, "SCIP2.0\n", scip20_expected_response)) { + error_message_ = + "SCIP1.1 protocol is not supported. Please update URG firmware, or reconnect after a few seconds because sensor is booting."; +@@ -150,7 +150,7 @@ struct ScipHandler::pImpl + + } else if (return_code == 0xE) { + // TM ???[?h?????????ATM2 ?????s???? +- char tm2_expected_response[] = { 0, -1 }; ++ char tm2_expected_response[] = { 0, (char)-1 }; + if (response(return_code, "TM2\n", tm2_expected_response)) { + laser_state_ = LaserOff; + return changeBothBaudrate(baudrate); +@@ -202,7 +202,7 @@ struct ScipHandler::pImpl + snprintf(send_buffer, 10, "SS%06ld\n", baudrate); + int return_code = -1; + // !!! ???????????????{?[???[?g?A?????????????l?? ss_expected... ?????????? +- char ss_expected_response[] = { 0, 0x3, 0x4, 0xf, -1 }; ++ char ss_expected_response[] = { 0, 0x3, 0x4, 0xf, (char)-1 }; + if (! response(return_code, send_buffer, ss_expected_response)) { + error_message_ = "Baudrate change fail."; + return false; +@@ -216,7 +216,7 @@ struct ScipHandler::pImpl + { + // PP ?????M???f?[?^?????M + int return_code = -1; +- char pp_expected_response[] = { 0, -1 }; ++ char pp_expected_response[] = { 0, (char)-1 }; + vector<string> lines; + if (! response(return_code, "PP\n", pp_expected_response, &lines)) { + error_message_ = "PP fail."; +@@ -356,7 +356,7 @@ struct ScipHandler::pImpl + + if (on) { + int return_code = -1; +- char expected_response[] = { 0, -1 }; ++ char expected_response[] = { 0, (char)-1 }; + if (! response(return_code, "BM\n", expected_response)) { + error_message_ = "BM fail."; + return false; +@@ -369,7 +369,7 @@ struct ScipHandler::pImpl + if (! mx_capturing_) { + // ?????????????? QT ?????A?????????????? + int return_code = -1; +- char qt_expected_response[] = { 0, -1 }; ++ char qt_expected_response[] = { 0, (char)-1 }; + if (! response(return_code, "QT\n", qt_expected_response)) { + return false; + } +@@ -777,7 +777,7 @@ bool ScipHandler::loadParameter(RangeSen + bool ScipHandler::versionLines(vector<string>& lines) + { + int return_code = -1; +- char expected_response[] = { 0, -1 }; ++ char expected_response[] = { 0, (char)-1 }; + if (! pimpl->response(return_code, "VV\n", expected_response, &lines)) { + return false; + } +@@ -792,7 +792,7 @@ bool ScipHandler::setRawTimestampMode(bo + + // TM0 or TM2 ?????M + int return_code = -1; +- char expected_response[] = { 0, -1 }; ++ char expected_response[] = { 0, (char)-1 }; + if (! pimpl->response(return_code, send_command, expected_response)) { + pimpl->error_message_ = (on) ? "TM0 fail." : "TM2 fail."; + return false; +@@ -809,7 +809,7 @@ bool ScipHandler::rawTimestamp(int* time + { + // TM1 ???l?????? + int return_code = -1; +- char expected_response[] = { 0, -1 }; ++ char expected_response[] = { 0, (char)-1 }; + vector<string> lines; + if (! pimpl->response(return_code, "TM1\n", expected_response, &lines)) { + pimpl->error_message_ = "TM1 fail."; -- 2.9.3 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH 2/3] package/urg: fix build with gcc-6 2016-09-12 19:23 ` [Buildroot] [PATCH 2/3] package/urg: fix build with gcc-6 Samuel Martin @ 2016-09-12 20:41 ` Thomas Petazzoni 2016-09-13 4:19 ` Samuel Martin 2016-10-15 10:24 ` Thomas Petazzoni 1 sibling, 1 reply; 16+ messages in thread From: Thomas Petazzoni @ 2016-09-12 20:41 UTC (permalink / raw) To: buildroot Hello, On Mon, 12 Sep 2016 21:23:23 +0200, Samuel Martin wrote: > Add patch fixing/adding explicit cast on negative value in char[], which > is required with gcc-6 (see "Narrowing conversions" paragraph in [1]) > > Fixes: > http://autobuild.buildroot.net/results/d0c/d0cd11163753db69a14c02e941dbda40e5f98bba/ > > [1] https://gcc.gnu.org/gcc-6/porting_to.html > > Signed-off-by: Samuel Martin <s.martin49@gmail.com> I don't see this patch in patchwork. Did you remove it from patchwork somehow ? Or was patchwork confused by something in your patch ? Thanks, Thomas -- Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com ^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH 2/3] package/urg: fix build with gcc-6 2016-09-12 20:41 ` Thomas Petazzoni @ 2016-09-13 4:19 ` Samuel Martin 2016-09-13 6:38 ` Arnout Vandecappelle 0 siblings, 1 reply; 16+ messages in thread From: Samuel Martin @ 2016-09-13 4:19 UTC (permalink / raw) To: buildroot Hi all, On Mon, Sep 12, 2016 at 10:41 PM, Thomas Petazzoni <thomas.petazzoni@free-electrons.com> wrote: > Hello, > > On Mon, 12 Sep 2016 21:23:23 +0200, Samuel Martin wrote: >> Add patch fixing/adding explicit cast on negative value in char[], which >> is required with gcc-6 (see "Narrowing conversions" paragraph in [1]) >> >> Fixes: >> http://autobuild.buildroot.net/results/d0c/d0cd11163753db69a14c02e941dbda40e5f98bba/ >> >> [1] https://gcc.gnu.org/gcc-6/porting_to.html >> >> Signed-off-by: Samuel Martin <s.martin49@gmail.com> > > I don't see this patch in patchwork. Did you remove it from patchwork > somehow ? Or was patchwork confused by something in your patch ? Nope, I did not do anything in patchwork, it should appear... Regards, -- Samuel ^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH 2/3] package/urg: fix build with gcc-6 2016-09-13 4:19 ` Samuel Martin @ 2016-09-13 6:38 ` Arnout Vandecappelle 0 siblings, 0 replies; 16+ messages in thread From: Arnout Vandecappelle @ 2016-09-13 6:38 UTC (permalink / raw) To: buildroot On 13-09-16 06:19, Samuel Martin wrote: > Hi all, > > On Mon, Sep 12, 2016 at 10:41 PM, Thomas Petazzoni > <thomas.petazzoni@free-electrons.com> wrote: >> Hello, >> >> On Mon, 12 Sep 2016 21:23:23 +0200, Samuel Martin wrote: >>> Add patch fixing/adding explicit cast on negative value in char[], which >>> is required with gcc-6 (see "Narrowing conversions" paragraph in [1]) >>> >>> Fixes: >>> http://autobuild.buildroot.net/results/d0c/d0cd11163753db69a14c02e941dbda40e5f98bba/ >>> >>> [1] https://gcc.gnu.org/gcc-6/porting_to.html >>> >>> Signed-off-by: Samuel Martin <s.martin49@gmail.com> >> >> I don't see this patch in patchwork. Did you remove it from patchwork >> somehow ? Or was patchwork confused by something in your patch ? > > Nope, I did not do anything in patchwork, it should appear... I expect that patchwork gets confused by the weird non-Unicode characters in the patch and barfs. I remember seeing some patches on the patchwork mailing list that should improve that, but they're probably not applied to the ozlabs instance. Regards, Arnout -- Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF ^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH 2/3] package/urg: fix build with gcc-6 2016-09-12 19:23 ` [Buildroot] [PATCH 2/3] package/urg: fix build with gcc-6 Samuel Martin 2016-09-12 20:41 ` Thomas Petazzoni @ 2016-10-15 10:24 ` Thomas Petazzoni 1 sibling, 0 replies; 16+ messages in thread From: Thomas Petazzoni @ 2016-10-15 10:24 UTC (permalink / raw) To: buildroot Hello, On Mon, 12 Sep 2016 21:23:23 +0200, Samuel Martin wrote: > Add patch fixing/adding explicit cast on negative value in char[], which > is required with gcc-6 (see "Narrowing conversions" paragraph in [1]) > > Fixes: > http://autobuild.buildroot.net/results/d0c/d0cd11163753db69a14c02e941dbda40e5f98bba/ > > [1] https://gcc.gnu.org/gcc-6/porting_to.html > > Signed-off-by: Samuel Martin <s.martin49@gmail.com> > --- > .../0002-urg-gcc6-fix-narrowing-conversion.patch | 99 ++++++++++++++++++++++ > 1 file changed, 99 insertions(+) > create mode 100644 package/urg/0002-urg-gcc6-fix-narrowing-conversion.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com ^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH 3/3] package/nginx-naxsi: add missing pcre dependency 2016-09-12 19:23 [Buildroot] [PATCH 1/3] package/urg: fix build Samuel Martin 2016-09-12 19:23 ` [Buildroot] [PATCH 2/3] package/urg: fix build with gcc-6 Samuel Martin @ 2016-09-12 19:23 ` Samuel Martin 2016-09-12 20:39 ` Thomas Petazzoni 2016-09-13 6:40 ` Arnout Vandecappelle 2016-09-12 20:41 ` [Buildroot] [PATCH 1/3] package/urg: fix build Thomas Petazzoni 2 siblings, 2 replies; 16+ messages in thread From: Samuel Martin @ 2016-09-12 19:23 UTC (permalink / raw) To: buildroot Fixes: http://autobuild.buildroot.net/results/9c7/9c7bad6831b09251af81e2bbfc595a241df87c70/ Signed-off-by: Samuel Martin <s.martin49@gmail.com> --- package/nginx-naxsi/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/nginx-naxsi/Config.in b/package/nginx-naxsi/Config.in index 2f7c2da..6c175eb 100644 --- a/package/nginx-naxsi/Config.in +++ b/package/nginx-naxsi/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_NGINX_NAXSI bool "nginx-naxsi" + select BR2_PACKAGE_PCRE help NAXSI means Nginx Anti XSS & SQL Injection. -- 2.9.3 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH 3/3] package/nginx-naxsi: add missing pcre dependency 2016-09-12 19:23 ` [Buildroot] [PATCH 3/3] package/nginx-naxsi: add missing pcre dependency Samuel Martin @ 2016-09-12 20:39 ` Thomas Petazzoni 2016-09-13 6:40 ` Arnout Vandecappelle 1 sibling, 0 replies; 16+ messages in thread From: Thomas Petazzoni @ 2016-09-12 20:39 UTC (permalink / raw) To: buildroot Hello, On Mon, 12 Sep 2016 21:23:24 +0200, Samuel Martin wrote: > Fixes: > http://autobuild.buildroot.net/results/9c7/9c7bad6831b09251af81e2bbfc595a241df87c70/ > > Signed-off-by: Samuel Martin <s.martin49@gmail.com> > --- > package/nginx-naxsi/Config.in | 1 + > 1 file changed, 1 insertion(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com ^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH 3/3] package/nginx-naxsi: add missing pcre dependency 2016-09-12 19:23 ` [Buildroot] [PATCH 3/3] package/nginx-naxsi: add missing pcre dependency Samuel Martin 2016-09-12 20:39 ` Thomas Petazzoni @ 2016-09-13 6:40 ` Arnout Vandecappelle 2016-09-13 7:57 ` Samuel Martin 1 sibling, 1 reply; 16+ messages in thread From: Arnout Vandecappelle @ 2016-09-13 6:40 UTC (permalink / raw) To: buildroot On 12-09-16 21:23, Samuel Martin wrote: > Fixes: > http://autobuild.buildroot.net/results/9c7/9c7bad6831b09251af81e2bbfc595a241df87c70/ > > Signed-off-by: Samuel Martin <s.martin49@gmail.com> > --- > package/nginx-naxsi/Config.in | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/nginx-naxsi/Config.in b/package/nginx-naxsi/Config.in > index 2f7c2da..6c175eb 100644 > --- a/package/nginx-naxsi/Config.in > +++ b/package/nginx-naxsi/Config.in > @@ -1,5 +1,6 @@ > config BR2_PACKAGE_NGINX_NAXSI > bool "nginx-naxsi" > + select BR2_PACKAGE_PCRE > help > NAXSI means Nginx Anti XSS & SQL Injection. I may be missing something, but shouldn't there be a _DEPENDENCIES += in .mk? Regards, Arnout -- Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF ^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH 3/3] package/nginx-naxsi: add missing pcre dependency 2016-09-13 6:40 ` Arnout Vandecappelle @ 2016-09-13 7:57 ` Samuel Martin 2016-09-13 17:30 ` Arnout Vandecappelle 0 siblings, 1 reply; 16+ messages in thread From: Samuel Martin @ 2016-09-13 7:57 UTC (permalink / raw) To: buildroot On Tue, Sep 13, 2016 at 8:40 AM, Arnout Vandecappelle <arnout@mind.be> wrote: > > > On 12-09-16 21:23, Samuel Martin wrote: >> Fixes: >> http://autobuild.buildroot.net/results/9c7/9c7bad6831b09251af81e2bbfc595a241df87c70/ >> >> Signed-off-by: Samuel Martin <s.martin49@gmail.com> >> --- >> package/nginx-naxsi/Config.in | 1 + >> 1 file changed, 1 insertion(+) >> >> diff --git a/package/nginx-naxsi/Config.in b/package/nginx-naxsi/Config.in >> index 2f7c2da..6c175eb 100644 >> --- a/package/nginx-naxsi/Config.in >> +++ b/package/nginx-naxsi/Config.in >> @@ -1,5 +1,6 @@ >> config BR2_PACKAGE_NGINX_NAXSI >> bool "nginx-naxsi" >> + select BR2_PACKAGE_PCRE >> help >> NAXSI means Nginx Anti XSS & SQL Injection. > > I may be missing something, but shouldn't there be a _DEPENDENCIES += in .mk? Nope, this is not needed. naxsi is a nginx' module, built by nginx.mk, which already has an automatic dependency on pcre when selected. Regards, -- Samuel ^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH 3/3] package/nginx-naxsi: add missing pcre dependency 2016-09-13 7:57 ` Samuel Martin @ 2016-09-13 17:30 ` Arnout Vandecappelle 2016-09-13 17:52 ` Samuel Martin 2016-09-14 11:45 ` Thomas Petazzoni 0 siblings, 2 replies; 16+ messages in thread From: Arnout Vandecappelle @ 2016-09-13 17:30 UTC (permalink / raw) To: buildroot On 13-09-16 09:57, Samuel Martin wrote: > On Tue, Sep 13, 2016 at 8:40 AM, Arnout Vandecappelle <arnout@mind.be> wrote: >> >> >> On 12-09-16 21:23, Samuel Martin wrote: >>> Fixes: >>> http://autobuild.buildroot.net/results/9c7/9c7bad6831b09251af81e2bbfc595a241df87c70/ >>> >>> Signed-off-by: Samuel Martin <s.martin49@gmail.com> >>> --- >>> package/nginx-naxsi/Config.in | 1 + >>> 1 file changed, 1 insertion(+) >>> >>> diff --git a/package/nginx-naxsi/Config.in b/package/nginx-naxsi/Config.in >>> index 2f7c2da..6c175eb 100644 >>> --- a/package/nginx-naxsi/Config.in >>> +++ b/package/nginx-naxsi/Config.in >>> @@ -1,5 +1,6 @@ >>> config BR2_PACKAGE_NGINX_NAXSI >>> bool "nginx-naxsi" >>> + select BR2_PACKAGE_PCRE >>> help >>> NAXSI means Nginx Anti XSS & SQL Injection. >> >> I may be missing something, but shouldn't there be a _DEPENDENCIES += in .mk? > > Nope, this is not needed. > naxsi is a nginx' module, built by nginx.mk, which already has an > automatic dependency on pcre when selected. I don't think we should rely on transitive dependencies. naxsi.h #include's pcre.h, so there should be an explicit dependency in the .mk file. Whenever you don't have that, the 'select' in Config.in should carry a comment explaining why not (usually 'runtime dependency'). Regards, Arnout -- Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF ^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH 3/3] package/nginx-naxsi: add missing pcre dependency 2016-09-13 17:30 ` Arnout Vandecappelle @ 2016-09-13 17:52 ` Samuel Martin 2016-09-14 11:45 ` Thomas Petazzoni 1 sibling, 0 replies; 16+ messages in thread From: Samuel Martin @ 2016-09-13 17:52 UTC (permalink / raw) To: buildroot On Tue, Sep 13, 2016 at 7:30 PM, Arnout Vandecappelle <arnout@mind.be> wrote: > > > On 13-09-16 09:57, Samuel Martin wrote: >> On Tue, Sep 13, 2016 at 8:40 AM, Arnout Vandecappelle <arnout@mind.be> wrote: >>> >>> >>> On 12-09-16 21:23, Samuel Martin wrote: >>>> Fixes: >>>> http://autobuild.buildroot.net/results/9c7/9c7bad6831b09251af81e2bbfc595a241df87c70/ >>>> >>>> Signed-off-by: Samuel Martin <s.martin49@gmail.com> >>>> --- >>>> package/nginx-naxsi/Config.in | 1 + >>>> 1 file changed, 1 insertion(+) >>>> >>>> diff --git a/package/nginx-naxsi/Config.in b/package/nginx-naxsi/Config.in >>>> index 2f7c2da..6c175eb 100644 >>>> --- a/package/nginx-naxsi/Config.in >>>> +++ b/package/nginx-naxsi/Config.in >>>> @@ -1,5 +1,6 @@ >>>> config BR2_PACKAGE_NGINX_NAXSI >>>> bool "nginx-naxsi" >>>> + select BR2_PACKAGE_PCRE >>>> help >>>> NAXSI means Nginx Anti XSS & SQL Injection. >>> >>> I may be missing something, but shouldn't there be a _DEPENDENCIES += in .mk? >> >> Nope, this is not needed. >> naxsi is a nginx' module, built by nginx.mk, which already has an >> automatic dependency on pcre when selected. > > I don't think we should rely on transitive dependencies. naxsi.h #include's > pcre.h, so there should be an explicit dependency in the .mk file. Fair enough, I'll post the follow-up shortly. -- Samuel ^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH 3/3] package/nginx-naxsi: add missing pcre dependency 2016-09-13 17:30 ` Arnout Vandecappelle 2016-09-13 17:52 ` Samuel Martin @ 2016-09-14 11:45 ` Thomas Petazzoni 1 sibling, 0 replies; 16+ messages in thread From: Thomas Petazzoni @ 2016-09-14 11:45 UTC (permalink / raw) To: buildroot Hello, On Tue, 13 Sep 2016 19:30:19 +0200, Arnout Vandecappelle wrote: > > Nope, this is not needed. > > naxsi is a nginx' module, built by nginx.mk, which already has an > > automatic dependency on pcre when selected. > > I don't think we should rely on transitive dependencies. naxsi.h #include's > pcre.h, so there should be an explicit dependency in the .mk file. > > Whenever you don't have that, the 'select' in Config.in should carry a comment > explaining why not (usually 'runtime dependency'). It's not a transitive dependency here. The interaction between nginx-naxsi and nginx is very special: nginx-naxsi is only in charge of downloading source code, and provide it to nginx during its build process. nginx is the one that *depends* on nginx-naxsi, so that nginx-naxsi has downloaded and extracted its source code before nginx gets configured. So, nginx-naxsi is the one that really needs pcre (so it makes sense for it to select pcre). But it terms of build ordering, pcre is only really needed before nginx starts its configuration step. So I believe the current situation is OK, with the exception that nginx-naxsi/Config.in should have a comment that explains that. Thanks, Thomas -- Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com ^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH 1/3] package/urg: fix build 2016-09-12 19:23 [Buildroot] [PATCH 1/3] package/urg: fix build Samuel Martin 2016-09-12 19:23 ` [Buildroot] [PATCH 2/3] package/urg: fix build with gcc-6 Samuel Martin 2016-09-12 19:23 ` [Buildroot] [PATCH 3/3] package/nginx-naxsi: add missing pcre dependency Samuel Martin @ 2016-09-12 20:41 ` Thomas Petazzoni 2016-09-14 9:47 ` Thomas Petazzoni 2 siblings, 1 reply; 16+ messages in thread From: Thomas Petazzoni @ 2016-09-12 20:41 UTC (permalink / raw) To: buildroot Hello, On Mon, 12 Sep 2016 21:23:22 +0200, Samuel Martin wrote: > Update select-h patch to also fix the C++ serial driver. > > Fixes: > http://autobuild.buildroot.net/results/cd7/cd76699188d2ee99b5f2d32b6a797de0d832a192/ > > Signed-off-by: Samuel Martin <s.martin49@gmail.com> > --- > package/urg/0001-select-h.patch | 27 ++++++++++++++++++++++----- > 1 file changed, 22 insertions(+), 5 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com ^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH 1/3] package/urg: fix build 2016-09-12 20:41 ` [Buildroot] [PATCH 1/3] package/urg: fix build Thomas Petazzoni @ 2016-09-14 9:47 ` Thomas Petazzoni 2016-09-15 4:37 ` Samuel Martin 0 siblings, 1 reply; 16+ messages in thread From: Thomas Petazzoni @ 2016-09-14 9:47 UTC (permalink / raw) To: buildroot Hello, On Mon, 12 Sep 2016 22:41:13 +0200, Thomas Petazzoni wrote: > Hello, > > On Mon, 12 Sep 2016 21:23:22 +0200, Samuel Martin wrote: > > Update select-h patch to also fix the C++ serial driver. > > > > Fixes: > > http://autobuild.buildroot.net/results/cd7/cd76699188d2ee99b5f2d32b6a797de0d832a192/ > > > > Signed-off-by: Samuel Martin <s.martin49@gmail.com> > > --- > > package/urg/0001-select-h.patch | 27 ++++++++++++++++++++++----- > > 1 file changed, 22 insertions(+), 5 deletions(-) > > Applied to master, thanks. I've reverted, as the patch didn't apply, and caused all urg builds to fail: http://autobuild.buildroot.net/results/a84/a84b63347716b62782e3b562049326f9285c785b/build-end.log Best regards, Thomas -- Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com ^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH 1/3] package/urg: fix build 2016-09-14 9:47 ` Thomas Petazzoni @ 2016-09-15 4:37 ` Samuel Martin 0 siblings, 0 replies; 16+ messages in thread From: Samuel Martin @ 2016-09-15 4:37 UTC (permalink / raw) To: buildroot Hi Thomas, On Wed, Sep 14, 2016 at 11:47 AM, Thomas Petazzoni <thomas.petazzoni@free-electrons.com> wrote: > Hello, > > On Mon, 12 Sep 2016 22:41:13 +0200, Thomas Petazzoni wrote: >> Hello, >> >> On Mon, 12 Sep 2016 21:23:22 +0200, Samuel Martin wrote: >> > Update select-h patch to also fix the C++ serial driver. >> > >> > Fixes: >> > http://autobuild.buildroot.net/results/cd7/cd76699188d2ee99b5f2d32b6a797de0d832a192/ >> > >> > Signed-off-by: Samuel Martin <s.martin49@gmail.com> >> > --- >> > package/urg/0001-select-h.patch | 27 ++++++++++++++++++++++----- >> > 1 file changed, 22 insertions(+), 5 deletions(-) >> >> Applied to master, thanks. > > I've reverted, as the patch didn't apply, and caused all urg builds to > fail: > > http://autobuild.buildroot.net/results/a84/a84b63347716b62782e3b562049326f9285c785b/build-end.log > Indeed :( You did right. I was not available yesterday to watch over the a.b.o. failures. I'll redo the the fix properly and post it shortly. Regards, -- Samuel ^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2016-10-15 10:24 UTC | newest] Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2016-09-12 19:23 [Buildroot] [PATCH 1/3] package/urg: fix build Samuel Martin 2016-09-12 19:23 ` [Buildroot] [PATCH 2/3] package/urg: fix build with gcc-6 Samuel Martin 2016-09-12 20:41 ` Thomas Petazzoni 2016-09-13 4:19 ` Samuel Martin 2016-09-13 6:38 ` Arnout Vandecappelle 2016-10-15 10:24 ` Thomas Petazzoni 2016-09-12 19:23 ` [Buildroot] [PATCH 3/3] package/nginx-naxsi: add missing pcre dependency Samuel Martin 2016-09-12 20:39 ` Thomas Petazzoni 2016-09-13 6:40 ` Arnout Vandecappelle 2016-09-13 7:57 ` Samuel Martin 2016-09-13 17:30 ` Arnout Vandecappelle 2016-09-13 17:52 ` Samuel Martin 2016-09-14 11:45 ` Thomas Petazzoni 2016-09-12 20:41 ` [Buildroot] [PATCH 1/3] package/urg: fix build Thomas Petazzoni 2016-09-14 9:47 ` Thomas Petazzoni 2016-09-15 4:37 ` Samuel Martin
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.