| Message ID | 1514150285-19871-1-git-send-email-sergio.prado@e-labworks.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | daq: new package | expand |
Hello, On Sun, 24 Dec 2017 19:18:05 -0200, Sergio Prado wrote: > Signed-off-by: Sergio Prado <sergio.prado@e-labworks.com> Thanks, I've applied, after doing a few changes. See below. > diff --git a/package/daq/Config.in b/package/daq/Config.in > new file mode 100644 > index 000000000000..0627274b52ad > --- /dev/null > +++ b/package/daq/Config.in > @@ -0,0 +1,13 @@ > +config BR2_PACKAGE_DAQ > + bool "daq" > + select BR2_PACKAGE_LIBPCAP > + select BR2_PACKAGE_LIBDNET > + depends on !BR2_STATIC_LIBS # dlfcn.h By convention, "depends on" lines go before "select" lines. This is verified by check-package. > diff --git a/package/daq/daq.mk b/package/daq/daq.mk > new file mode 100644 > index 000000000000..f10c31d4a157 > --- /dev/null > +++ b/package/daq/daq.mk > @@ -0,0 +1,26 @@ > +################################################################################ > +# > +# daq > +# > +################################################################################ > + > +DAQ_VERSION = 2.0.6 > +DAQ_SITE = https://www.snort.org/downloads/snort > +DAQ_SOURCE = daq-$(DAQ_VERSION).tar.gz > + > +DAQ_LICENSE = GPL-2.0 > +DAQ_LICENSE_FILES = COPYING Since it's a library, it felt weird to not have DAQ_INSTALL_STAGING = YES, so I've added that. > +# assume these flags are available to prevent configure from > +# running test programs while cross compiling > +DAQ_CONF_ENV = \ > + ac_cv_lib_pcap_pcap_lib_version="yes" \ > + daq_cv_libpcap_version_1x="yes" The double quotes around the "yes" were not needed, and we don't do that elsewhere in Buildroot, so I've dropped them. Applied with those changes. Thanks! Thomas
Hello Thomas, Thanks. I'll make sure to run check-package next time. Best regards, Sergio Prado Embedded Labworks https://e-labworks.com/en 2017-12-30 18:18 GMT-02:00 Thomas Petazzoni < thomas.petazzoni@free-electrons.com>: > Hello, > > On Sun, 24 Dec 2017 19:18:05 -0200, Sergio Prado wrote: > > Signed-off-by: Sergio Prado <sergio.prado@e-labworks.com> > > Thanks, I've applied, after doing a few changes. See below. > > > diff --git a/package/daq/Config.in b/package/daq/Config.in > > new file mode 100644 > > index 000000000000..0627274b52ad > > --- /dev/null > > +++ b/package/daq/Config.in > > @@ -0,0 +1,13 @@ > > +config BR2_PACKAGE_DAQ > > + bool "daq" > > + select BR2_PACKAGE_LIBPCAP > > + select BR2_PACKAGE_LIBDNET > > + depends on !BR2_STATIC_LIBS # dlfcn.h > > By convention, "depends on" lines go before "select" lines. This is > verified by check-package. > > > diff --git a/package/daq/daq.mk b/package/daq/daq.mk > > new file mode 100644 > > index 000000000000..f10c31d4a157 > > --- /dev/null > > +++ b/package/daq/daq.mk > > @@ -0,0 +1,26 @@ > > +########################################################### > ##################### > > +# > > +# daq > > +# > > +########################################################### > ##################### > > + > > +DAQ_VERSION = 2.0.6 > > +DAQ_SITE = https://www.snort.org/downloads/snort > > +DAQ_SOURCE = daq-$(DAQ_VERSION).tar.gz > > + > > +DAQ_LICENSE = GPL-2.0 > > +DAQ_LICENSE_FILES = COPYING > > Since it's a library, it felt weird to not have DAQ_INSTALL_STAGING = > YES, so I've added that. > > > +# assume these flags are available to prevent configure from > > +# running test programs while cross compiling > > +DAQ_CONF_ENV = \ > > + ac_cv_lib_pcap_pcap_lib_version="yes" \ > > + daq_cv_libpcap_version_1x="yes" > > The double quotes around the "yes" were not needed, and we don't do > that elsewhere in Buildroot, so I've dropped them. > > Applied with those changes. Thanks! > > Thomas > -- > Thomas Petazzoni, CTO, Free Electrons > Embedded Linux and Kernel engineering > http://free-electrons.com > <div dir="ltr">Hello Thomas,<div><br></div><div>Thanks. I'll make sure to run check-package next time.</div><div><br></div><div>Best regards,</div><div class="gmail_extra"><br clear="all"><div><div class="gmail_signature" data-smartmail="gmail_signature"><div dir="ltr"><span style="font-family:arial,sans-serif;font-size:13px;background-color:rgb(255,255,255)">Sergio Prado</span><br style="font-family:arial,sans-serif;font-size:13px;background-color:rgb(255,255,255)">Embedded Labworks</div><div><a href="https://e-labworks.com/en">https://e-labworks.com/en</a></div></div></div> <br><div class="gmail_quote">2017-12-30 18:18 GMT-02:00 Thomas Petazzoni <span dir="ltr"><<a href="mailto:thomas.petazzoni@free-electrons.com" target="_blank">thomas.petazzoni@free-electrons.com</a>></span>:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Hello,<br> <br> On Sun, 24 Dec 2017 19:18:05 -0200, Sergio Prado wrote:<br> > Signed-off-by: Sergio Prado <<a href="mailto:sergio.prado@e-labworks.com">sergio.prado@e-labworks.com</a>><br> <br> Thanks, I've applied, after doing a few changes. See below.<br> <span class=""><br> > diff --git a/package/daq/Config.in b/package/daq/Config.in<br> > new file mode 100644<br> > index 000000000000..0627274b52ad<br> > --- /dev/null<br> > +++ b/package/daq/Config.in<br> > @@ -0,0 +1,13 @@<br> > +config BR2_PACKAGE_DAQ<br> > + bool "daq"<br> > + select BR2_PACKAGE_LIBPCAP<br> > + select BR2_PACKAGE_LIBDNET<br> > + depends on !BR2_STATIC_LIBS # dlfcn.h<br> <br> </span>By convention, "depends on" lines go before "select" lines. This is<br> verified by check-package.<br> <span class=""><br> > diff --git a/package/daq/<a href="http://daq.mk" rel="noreferrer" target="_blank">daq.mk</a> b/package/daq/<a href="http://daq.mk" rel="noreferrer" target="_blank">daq.mk</a><br> > new file mode 100644<br> > index 000000000000..f10c31d4a157<br> > --- /dev/null<br> > +++ b/package/daq/<a href="http://daq.mk" rel="noreferrer" target="_blank">daq.mk</a><br> > @@ -0,0 +1,26 @@<br> > +#############################<wbr>##############################<wbr>#####################<br> > +#<br> > +# daq<br> > +#<br> > +#############################<wbr>##############################<wbr>#####################<br> > +<br> > +DAQ_VERSION = 2.0.6<br> > +DAQ_SITE = <a href="https://www.snort.org/downloads/snort" rel="noreferrer" target="_blank">https://www.snort.org/<wbr>downloads/snort</a><br> > +DAQ_SOURCE = daq-$(DAQ_VERSION).tar.gz<br> > +<br> > +DAQ_LICENSE = GPL-2.0<br> > +DAQ_LICENSE_FILES = COPYING<br> <br> </span>Since it's a library, it felt weird to not have DAQ_INSTALL_STAGING =<br> YES, so I've added that.<br> <span class=""><br> > +# assume these flags are available to prevent configure from<br> > +# running test programs while cross compiling<br> > +DAQ_CONF_ENV = \<br> > + ac_cv_lib_pcap_pcap_lib_<wbr>version="yes" \<br> > + daq_cv_libpcap_version_1x="<wbr>yes"<br> <br> </span>The double quotes around the "yes" were not needed, and we don't do<br> that elsewhere in Buildroot, so I've dropped them.<br> <br> Applied with those changes. Thanks!<br> <span class="HOEnZb"><font color="#888888"><br> Thomas<br> --<br> Thomas Petazzoni, CTO, Free Electrons<br> Embedded Linux and Kernel engineering<br> <a href="http://free-electrons.com" rel="noreferrer" target="_blank">http://free-electrons.com</a><br> </font></span></blockquote></div><br></div></div>
Sergio, On Sun, Dec 31, 2017 at 6:22 AM, Sergio Prado <sergio.prado@e-labworks.com> wrote: >> > diff --git a/package/daq/daq.mk b/package/daq/daq.mk >> > new file mode 100644 >> > index 000000000000..f10c31d4a157 >> > --- /dev/null >> > +++ b/package/daq/daq.mk >> > @@ -0,0 +1,26 @@ >> > >> > +################################################################################ >> > +# >> > +# daq >> > +# >> > >> > +################################################################################ >> > + >> > +DAQ_VERSION = 2.0.6 >> > +DAQ_SITE = https://www.snort.org/downloads/snort >> > +DAQ_SOURCE = daq-$(DAQ_VERSION).tar.gz >> > + >> > +DAQ_LICENSE = GPL-2.0 >> > +DAQ_LICENSE_FILES = COPYING >> Just realized I never upstreamed this package we had been carrying internally. There were a couple differences with CONF_OPTS and a netfilter queue dependency (may have been self imposed). https://nopaste.xyz/?ba118cb90d65e34d#Gk9cY60V/sMzu+UT5nY/YTb8bDq2KV+P1swXhc4v28s= Matt
Sergio, On Wed, Jan 3, 2018 at 8:15 AM, Matthew Weber <matthew.weber@rockwellcollins.com> wrote: > Sergio, > > On Sun, Dec 31, 2017 at 6:22 AM, Sergio Prado > <sergio.prado@e-labworks.com> wrote: >>> > diff --git a/package/daq/daq.mk b/package/daq/daq.mk >>> > new file mode 100644 >>> > index 000000000000..f10c31d4a157 >>> > --- /dev/null >>> > +++ b/package/daq/daq.mk >>> > @@ -0,0 +1,26 @@ >>> > >>> > +################################################################################ >>> > +# >>> > +# daq >>> > +# >>> > >>> > +################################################################################ >>> > + >>> > +DAQ_VERSION = 2.0.6 >>> > +DAQ_SITE = https://www.snort.org/downloads/snort >>> > +DAQ_SOURCE = daq-$(DAQ_VERSION).tar.gz >>> > + >>> > +DAQ_LICENSE = GPL-2.0 >>> > +DAQ_LICENSE_FILES = COPYING >>> > > Just realized I never upstreamed this package we had been carrying > internally. There were a couple differences with CONF_OPTS and a > netfilter queue dependency (may have been self imposed). > https://nopaste.xyz/?ba118cb90d65e34d#Gk9cY60V/sMzu+UT5nY/YTb8bDq2KV+P1swXhc4v28s= > DAQ was used internally for snort, here's what I've got for that one too. Never got to upstreaming it and it probably has some bugs :-) https://nopaste.xyz/?326d9f18b3df4fc2#0B2Zs/N6eiD6OWiMHVvMA0OpAeD7w36hZkDKg/rRFKk= Matt
Hi Matthew, I think the CONF_OPTS changes are not needed, but my patch is missing the optional dependency on libnetfilter queue. I'll prepare a patch with this change. Thanks for pointing that out! Best regards, Sergio Prado Embedded Labworks Office: +55 11 2628-3461 Mobile: +55 11 97123-3420 2018-01-03 12:15 GMT-02:00 Matthew Weber <matthew.weber@rockwellcollins.com> : > Sergio, > > On Sun, Dec 31, 2017 at 6:22 AM, Sergio Prado > <sergio.prado@e-labworks.com> wrote: > >> > diff --git a/package/daq/daq.mk b/package/daq/daq.mk > >> > new file mode 100644 > >> > index 000000000000..f10c31d4a157 > >> > --- /dev/null > >> > +++ b/package/daq/daq.mk > >> > @@ -0,0 +1,26 @@ > >> > > >> > +########################################################### > ##################### > >> > +# > >> > +# daq > >> > +# > >> > > >> > +########################################################### > ##################### > >> > + > >> > +DAQ_VERSION = 2.0.6 > >> > +DAQ_SITE = https://www.snort.org/downloads/snort > >> > +DAQ_SOURCE = daq-$(DAQ_VERSION).tar.gz > >> > + > >> > +DAQ_LICENSE = GPL-2.0 > >> > +DAQ_LICENSE_FILES = COPYING > >> > > Just realized I never upstreamed this package we had been carrying > internally. There were a couple differences with CONF_OPTS and a > netfilter queue dependency (may have been self imposed). > https://nopaste.xyz/?ba118cb90d65e34d#Gk9cY60V/sMzu+UT5nY/YTb8bDq2KV+ > P1swXhc4v28s= > > > Matt > <div dir="ltr">Hi Matthew,<div><br></div><div>I think the CONF_OPTS changes are not needed, but my patch is missing the optional dependency on libnetfilter queue. I'll prepare a patch with this change.</div><div><br></div><div>Thanks for pointing that out!</div><div><br></div><div>Best regards,</div></div><div class="gmail_extra"><br clear="all"><div><div class="gmail_signature" data-smartmail="gmail_signature"><div dir="ltr"><div><span style="font-family:arial,sans-serif;font-size:13px;background-color:rgb(255,255,255)">Sergio Prado</span><br style="font-family:arial,sans-serif;font-size:13px;background-color:rgb(255,255,255)"><span style="font-family:arial,sans-serif;font-size:13px;background-color:rgb(255,255,255)">Embedded Labworks</span><br style="color:rgb(34,34,34);font-family:arial,sans-serif;font-size:13px;background-color:rgb(255,255,255)"><span style="font-family:arial,sans-serif;font-size:13px;background-color:rgb(255,255,255)">Office:</span><span style="color:rgb(34,34,34);font-family:arial,sans-serif;font-size:13px;background-color:rgb(255,255,255)"> </span><a value="+551138250748" style="color:rgb(17,85,204);font-family:arial,sans-serif;font-size:13px;background-color:rgb(255,255,255)">+55 11 2628-3461</a><br style="color:rgb(34,34,34);font-family:arial,sans-serif;font-size:13px;background-color:rgb(255,255,255)"><span style="font-family:arial,sans-serif;font-size:13px;background-color:rgb(255,255,255)">Mobile</span><span style="font-family:arial,sans-serif;font-size:13px;background-color:rgb(255,255,255)">:</span><span style="color:rgb(34,34,34);font-family:arial,sans-serif;font-size:13px;background-color:rgb(255,255,255)"> </span><a value="+5511971233420" style="color:rgb(17,85,204);font-family:arial,sans-serif;font-size:13px;background-color:rgb(255,255,255)">+55 11 97123-3420</a></div></div></div></div> <br><div class="gmail_quote">2018-01-03 12:15 GMT-02:00 Matthew Weber <span dir="ltr"><<a href="mailto:matthew.weber@rockwellcollins.com" target="_blank">matthew.weber@rockwellcollins.com</a>></span>:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Sergio,<br> <span class=""><br> On Sun, Dec 31, 2017 at 6:22 AM, Sergio Prado<br> <<a href="mailto:sergio.prado@e-labworks.com">sergio.prado@e-labworks.com</a>> wrote:<br> >> > diff --git a/package/daq/<a href="http://daq.mk" rel="noreferrer" target="_blank">daq.mk</a> b/package/daq/<a href="http://daq.mk" rel="noreferrer" target="_blank">daq.mk</a><br> >> > new file mode 100644<br> >> > index 000000000000..f10c31d4a157<br> >> > --- /dev/null<br> >> > +++ b/package/daq/<a href="http://daq.mk" rel="noreferrer" target="_blank">daq.mk</a><br> >> > @@ -0,0 +1,26 @@<br> >> ><br> >> > +#############################<wbr>##############################<wbr>#####################<br> >> > +#<br> >> > +# daq<br> >> > +#<br> >> ><br> >> > +#############################<wbr>##############################<wbr>#####################<br> >> > +<br> >> > +DAQ_VERSION = 2.0.6<br> >> > +DAQ_SITE = <a href="https://www.snort.org/downloads/snort" rel="noreferrer" target="_blank">https://www.snort.org/<wbr>downloads/snort</a><br> >> > +DAQ_SOURCE = daq-$(DAQ_VERSION).tar.gz<br> >> > +<br> >> > +DAQ_LICENSE = GPL-2.0<br> >> > +DAQ_LICENSE_FILES = COPYING<br> >><br> <br> </span>Just realized I never upstreamed this package we had been carrying<br> internally. There were a couple differences with CONF_OPTS and a<br> netfilter queue dependency (may have been self imposed).<br> <a href="https://nopaste.xyz/?ba118cb90d65e34d#Gk9cY60V/sMzu+UT5nY/YTb8bDq2KV+P1swXhc4v28s=" rel="noreferrer" target="_blank">https://nopaste.xyz/?<wbr>ba118cb90d65e34d#Gk9cY60V/<wbr>sMzu+UT5nY/YTb8bDq2KV+<wbr>P1swXhc4v28s=</a><br> <br> <br> Matt<br> </blockquote></div><br></div>
Hi Matthew, Actually I was preparing the snort patch. :) I'll take a look at yours and see if I am missing something. Thanks! Sergio Prado Embedded Labworks Office: +55 11 2628-3461 Mobile: +55 11 97123-3420 2018-01-03 13:40 GMT-02:00 Matthew Weber <matthew.weber@rockwellcollins.com> : > Sergio, > > On Wed, Jan 3, 2018 at 8:15 AM, Matthew Weber > <matthew.weber@rockwellcollins.com> wrote: > > Sergio, > > > > On Sun, Dec 31, 2017 at 6:22 AM, Sergio Prado > > <sergio.prado@e-labworks.com> wrote: > >>> > diff --git a/package/daq/daq.mk b/package/daq/daq.mk > >>> > new file mode 100644 > >>> > index 000000000000..f10c31d4a157 > >>> > --- /dev/null > >>> > +++ b/package/daq/daq.mk > >>> > @@ -0,0 +1,26 @@ > >>> > > >>> > +########################################################### > ##################### > >>> > +# > >>> > +# daq > >>> > +# > >>> > > >>> > +########################################################### > ##################### > >>> > + > >>> > +DAQ_VERSION = 2.0.6 > >>> > +DAQ_SITE = https://www.snort.org/downloads/snort > >>> > +DAQ_SOURCE = daq-$(DAQ_VERSION).tar.gz > >>> > + > >>> > +DAQ_LICENSE = GPL-2.0 > >>> > +DAQ_LICENSE_FILES = COPYING > >>> > > > > Just realized I never upstreamed this package we had been carrying > > internally. There were a couple differences with CONF_OPTS and a > > netfilter queue dependency (may have been self imposed). > > https://nopaste.xyz/?ba118cb90d65e34d#Gk9cY60V/sMzu+UT5nY/YTb8bDq2KV+ > P1swXhc4v28s= > > > > DAQ was used internally for snort, here's what I've got for that one > too. Never got to upstreaming it and it probably has some bugs :-) > https://nopaste.xyz/?326d9f18b3df4fc2#0B2Zs/N6eiD6OWiMHVvMA0OpAeD7w36hZkDK > g/rRFKk= > > Matt > <div dir="ltr">Hi Matthew,<div><br></div><div>Actually I was preparing the snort patch. :)</div><div><br></div><div>I'll take a look at yours and see if I am missing something.</div><div><br></div><div>Thanks!</div></div><div class="gmail_extra"><br clear="all"><div><div class="gmail_signature" data-smartmail="gmail_signature"><div dir="ltr"><div><span style="font-family:arial,sans-serif;font-size:13px;background-color:rgb(255,255,255)">Sergio Prado</span><br style="font-family:arial,sans-serif;font-size:13px;background-color:rgb(255,255,255)"><span style="font-family:arial,sans-serif;font-size:13px;background-color:rgb(255,255,255)">Embedded Labworks</span><br style="color:rgb(34,34,34);font-family:arial,sans-serif;font-size:13px;background-color:rgb(255,255,255)"><span style="font-family:arial,sans-serif;font-size:13px;background-color:rgb(255,255,255)">Office:</span><span style="color:rgb(34,34,34);font-family:arial,sans-serif;font-size:13px;background-color:rgb(255,255,255)"> </span><a value="+551138250748" style="color:rgb(17,85,204);font-family:arial,sans-serif;font-size:13px;background-color:rgb(255,255,255)">+55 11 2628-3461</a><br style="color:rgb(34,34,34);font-family:arial,sans-serif;font-size:13px;background-color:rgb(255,255,255)"><span style="font-family:arial,sans-serif;font-size:13px;background-color:rgb(255,255,255)">Mobile</span><span style="font-family:arial,sans-serif;font-size:13px;background-color:rgb(255,255,255)">:</span><span style="color:rgb(34,34,34);font-family:arial,sans-serif;font-size:13px;background-color:rgb(255,255,255)"> </span><a value="+5511971233420" style="color:rgb(17,85,204);font-family:arial,sans-serif;font-size:13px;background-color:rgb(255,255,255)">+55 11 97123-3420</a></div></div></div></div> <br><div class="gmail_quote">2018-01-03 13:40 GMT-02:00 Matthew Weber <span dir="ltr"><<a href="mailto:matthew.weber@rockwellcollins.com" target="_blank">matthew.weber@rockwellcollins.com</a>></span>:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Sergio,<br> <div><div class="h5"><br> On Wed, Jan 3, 2018 at 8:15 AM, Matthew Weber<br> <<a href="mailto:matthew.weber@rockwellcollins.com">matthew.weber@<wbr>rockwellcollins.com</a>> wrote:<br> > Sergio,<br> ><br> > On Sun, Dec 31, 2017 at 6:22 AM, Sergio Prado<br> > <<a href="mailto:sergio.prado@e-labworks.com">sergio.prado@e-labworks.com</a>> wrote:<br> >>> > diff --git a/package/daq/<a href="http://daq.mk" rel="noreferrer" target="_blank">daq.mk</a> b/package/daq/<a href="http://daq.mk" rel="noreferrer" target="_blank">daq.mk</a><br> >>> > new file mode 100644<br> >>> > index 000000000000..f10c31d4a157<br> >>> > --- /dev/null<br> >>> > +++ b/package/daq/<a href="http://daq.mk" rel="noreferrer" target="_blank">daq.mk</a><br> >>> > @@ -0,0 +1,26 @@<br> >>> ><br> >>> > +#############################<wbr>##############################<wbr>#####################<br> >>> > +#<br> >>> > +# daq<br> >>> > +#<br> >>> ><br> >>> > +#############################<wbr>##############################<wbr>#####################<br> >>> > +<br> >>> > +DAQ_VERSION = 2.0.6<br> >>> > +DAQ_SITE = <a href="https://www.snort.org/downloads/snort" rel="noreferrer" target="_blank">https://www.snort.org/<wbr>downloads/snort</a><br> >>> > +DAQ_SOURCE = daq-$(DAQ_VERSION).tar.gz<br> >>> > +<br> >>> > +DAQ_LICENSE = GPL-2.0<br> >>> > +DAQ_LICENSE_FILES = COPYING<br> >>><br> ><br> > Just realized I never upstreamed this package we had been carrying<br> > internally. There were a couple differences with CONF_OPTS and a<br> > netfilter queue dependency (may have been self imposed).<br> > <a href="https://nopaste.xyz/?ba118cb90d65e34d#Gk9cY60V/sMzu+UT5nY/YTb8bDq2KV+P1swXhc4v28s=" rel="noreferrer" target="_blank">https://nopaste.xyz/?<wbr>ba118cb90d65e34d#Gk9cY60V/<wbr>sMzu+UT5nY/YTb8bDq2KV+<wbr>P1swXhc4v28s=</a><br> ><br> <br> </div></div>DAQ was used internally for snort, here's what I've got for that one<br> too. Never got to upstreaming it and it probably has some bugs :-)<br> <a href="https://nopaste.xyz/?326d9f18b3df4fc2#0B2Zs/N6eiD6OWiMHVvMA0OpAeD7w36hZkDKg/rRFKk=" rel="noreferrer" target="_blank">https://nopaste.xyz/?<wbr>326d9f18b3df4fc2#0B2Zs/<wbr>N6eiD6OWiMHVvMA0OpAeD7w36hZkDK<wbr>g/rRFKk=</a><br> <br> Matt<br> </blockquote></div><br></div>
diff --git a/DEVELOPERS b/DEVELOPERS index 9f4f2822036e..8f847358f614 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1564,6 +1564,7 @@ F: package/rtl8189fs/ F: package/xr819-xradio/ N: Sergio Prado <sergio.prado@e-labworks.com> +F: package/daq/ F: package/libgdiplus/ F: package/mongodb/ F: package/pimd/ diff --git a/package/Config.in b/package/Config.in index bd39a374f06f..c1e52a3f0998 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1338,6 +1338,7 @@ menu "Networking" source "package/cgic/Config.in" source "package/cppzmq/Config.in" source "package/czmq/Config.in" + source "package/daq/Config.in" source "package/filemq/Config.in" source "package/flickcurl/Config.in" source "package/fmlib/Config.in" diff --git a/package/daq/0001-Fix-build-against-the-musl-C-library.patch b/package/daq/0001-Fix-build-against-the-musl-C-library.patch new file mode 100644 index 000000000000..a37fe9a7ec56 --- /dev/null +++ b/package/daq/0001-Fix-build-against-the-musl-C-library.patch @@ -0,0 +1,29 @@ +From d3eec1a3b7c67a5e6f524c65608fd2eacac3782b Mon Sep 17 00:00:00 2001 +From: Sergio Prado <sergio.prado@e-labworks.com> +Date: Sun, 24 Dec 2017 12:58:49 -0200 +Subject: [PATCH] Fix build against the musl C library + +Signed-off-by: Sergio Prado <sergio.prado@e-labworks.com> +--- + os-daq-modules/daq_ipfw.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/os-daq-modules/daq_ipfw.c b/os-daq-modules/daq_ipfw.c +index 016beb06ad61..c2a41759bb04 100644 +--- a/os-daq-modules/daq_ipfw.c ++++ b/os-daq-modules/daq_ipfw.c +@@ -23,10 +23,10 @@ + #include <stdlib.h> + #include <string.h> + #include <stdio.h> ++#include <unistd.h> + + #include <sys/types.h> + #include <sys/time.h> +-#include <sys/unistd.h> + + #include <netinet/in.h> + #include <sys/socket.h> +-- +1.9.1 + diff --git a/package/daq/Config.in b/package/daq/Config.in new file mode 100644 index 000000000000..0627274b52ad --- /dev/null +++ b/package/daq/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_DAQ + bool "daq" + select BR2_PACKAGE_LIBPCAP + select BR2_PACKAGE_LIBDNET + depends on !BR2_STATIC_LIBS # dlfcn.h + help + DAQ is a Data Acquisition library for packet I/O from the + Snort project. + + https://www.snort.org + +comment "daq needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/package/daq/daq.hash b/package/daq/daq.hash new file mode 100644 index 000000000000..6a0cb5ed0781 --- /dev/null +++ b/package/daq/daq.hash @@ -0,0 +1,5 @@ +# Locally computed: +sha256 d41da5f7793e66044e6927dd868c0525e7ee4ec1a3515bf74ef9a30cd9273af0 daq-2.0.6.tar.gz + +# Hash for license files: +sha256 07f28289c09fd9eb5a6ff7bc710ff40363601b1bbc6f3637d8ed412150e90819 COPYING diff --git a/package/daq/daq.mk b/package/daq/daq.mk new file mode 100644 index 000000000000..f10c31d4a157 --- /dev/null +++ b/package/daq/daq.mk @@ -0,0 +1,26 @@ +################################################################################ +# +# daq +# +################################################################################ + +DAQ_VERSION = 2.0.6 +DAQ_SITE = https://www.snort.org/downloads/snort +DAQ_SOURCE = daq-$(DAQ_VERSION).tar.gz + +DAQ_LICENSE = GPL-2.0 +DAQ_LICENSE_FILES = COPYING + +DAQ_DEPENDENCIES = libpcap libdnet + +# package does not build in parallel due to improper make rules +# related to the generation of the tokdefs.h header file +DAQ_MAKE = $(MAKE1) + +# assume these flags are available to prevent configure from +# running test programs while cross compiling +DAQ_CONF_ENV = \ + ac_cv_lib_pcap_pcap_lib_version="yes" \ + daq_cv_libpcap_version_1x="yes" + +$(eval $(autotools-package))
Signed-off-by: Sergio Prado <sergio.prado@e-labworks.com> --- DEVELOPERS | 1 + package/Config.in | 1 + ...0001-Fix-build-against-the-musl-C-library.patch | 29 ++++++++++++++++++++++ package/daq/Config.in | 13 ++++++++++ package/daq/daq.hash | 5 ++++ package/daq/daq.mk | 26 +++++++++++++++++++ 6 files changed, 75 insertions(+) create mode 100644 package/daq/0001-Fix-build-against-the-musl-C-library.patch create mode 100644 package/daq/Config.in create mode 100644 package/daq/daq.hash create mode 100644 package/daq/daq.mk