Re: [oe] [meta-networking][PATCH v2 1/3] snort : add recipe
Hello,joe I investigate barnyard2 and barnyard . I have the following conclusions: 1) Barnyard2 maintains majority of the command syntax of barnyard. 2) Barnyard has not seen an updated in over 4 years and is not going to be maintained by the original developers. 3) Barnyard2 is a very popular plugin . I will submit new patch about snort + Barnyard2. Thanks, chunrong -Original Message- From: Joe MacDonald [mailto:j...@deserted.net] Sent: Wednesday, October 30, 2013 8:49 PM To: Guo Chunrong-B40290 Cc: openembedded-devel@lists.openembedded.org Subject: Re: [oe] [meta-networking][PATCH v2 1/3] snort : add recipe [RE: [oe] [meta-networking][PATCH v2 1/3] snort : add recipe] On 13.10.30 (Wed 01:40) Guo Chunrong-B40290 wrote: Hi, Joe MacDonald Thank you for your comments. The current snort simply do not need sysvinit config. I apologize, I don't mean to belabor the point, but can you point me at that information? http://www.snort.org/docs/ contains a lot of documentation around getting snort started on various systems and there are a number of startup scripts there that indicate they belong in /etc/init.d of their respective distributions. Perhaps things have changed in the most recent version of snort, but the Snort Startup Scripts section seem to apply to the versions of snort you're proposing we include in meta-networking. Also, please don't forget about the include path and barnyard questions. Thanks. -J. Thanks, Chunrong -Original Message- From: Joe MacDonald [mailto:j...@deserted.net] Sent: Wednesday, October 30, 2013 3:20 AM To: openembedded-devel@lists.openembedded.org Cc: Guo Chunrong-B40290 Subject: Re: [oe] [meta-networking][PATCH v2 1/3] snort : add recipe Hi Chunrong, Sorry about the confusion here, there were still at least a couple of outstanding questions / requests, I thought. I had a quick look back at the latest barnyard recipe and it appears to be removing the include path as opposed to using -I=/usr/include/pcap that Khem suggested, I was hoping to hear back on the question I had as well WRT barnyard versus barnyard2 (I could make the license tweak myself since I'm confident that won't invalidate any of your work) and the Gentoo mirror as the primary source for this version of Barnyard. I also noticed that in the most recent version of the snort recipe the sysvinit components have been dropped entirely. Was that due to problems inheriting update-rc.d as Koen suggested? (Or perhaps the current snort simply doesn't have a functional sysvinit config? I hope that's not the case.) I'm probably not the only one still making use of sysvinit stuff in some scenarios. :-) -J. [Re: [oe] [meta-networking][PATCH v2 1/3] snort : add recipe] On 13.10.28 (Mon 02:23) Guo Chunrong-B40290 wrote: pings -Original Message- From: Guo Chunrong-B40290 Sent: Friday, October 18, 2013 4:22 PM To: openembedded-devel@lists.openembedded.org Cc: Liu Ting-B28495; Luo Zhenhua-B19537; Guo Chunrong-B40290 Subject: [meta-networking][PATCH v2 1/3] snort : add recipe From: Chunrong Guo b40...@freescale.com *snort - a free lightweight network intrusion detection system for UNIX and Windows Signed-off-by: Chunrong Guo b40...@freescale.com --- .../snort/files/disable-dap-address-space-id.patch | 52 ++ .../snort/files/disable-inaddr-none.patch | 75 .../recipes-connectivity/snort/snort_2.9.4.6.bb| 64 + 3 files changed, 191 insertions(+), 0 deletions(-) create mode 100644 meta-networking/recipes-connectivity/snort/files/disable-dap-address -s pace-id.patch create mode 100644 meta-networking/recipes-connectivity/snort/files/disable-inaddr-none .p atch create mode 100644 meta-networking/recipes-connectivity/snort/snort_2.9.4.6.bb diff --git a/meta-networking/recipes-connectivity/snort/files/disable-dap-addre ss -space-id.patch b/meta-networking/recipes-connectivity/snort/files/disable-dap-addre ss -space-id.patch new file mode 100644 index 000..39e5c9c --- /dev/null +++ b/meta-networking/recipes-connectivity/snort/files/disable-dap-a +++ dd +++ re +++ ss-space-id.patch @@ -0,0 +1,52 @@ +Upstream-Status:Inappropriate [embedded specific] + +fix the below error: +checking for dap address space id... configure: +configure: error: cannot run test program while cross compiling + + +Signed-off-by: Chunrong Guo b40...@freescale.com + +--- a/configure.in 2013-08-23 00:06:37.239361932 -0500 b/configure.in 2013-08-23 00:07:32.860266534 -0500 +@@ -679,23 +679,23 @@ + + AC_CHECK_FUNCS([daq_hup_apply] [daq_acquire_with_meta]) + +-AC_MSG_CHECKING([for daq address space ID]) -AC_RUN_IFELSE( +-[AC_LANG_PROGRAM( -[[ -#include daq.h -]], -[[ +-
[oe] [meta-oe][PATCH v3 1/3 ] snort: add recipe
From: Chunrong Guo b40...@freescale.com *snort - a free lightweight network intrusion detection system for UNIX and Windows Signed-off-by: Chunrong Guo b40...@freescale.com --- .../snort/files/disable-dap-address-space-id.patch | 52 + .../snort/files/disable-inaddr-none.patch | 75 ++ .../recipes-connectivity/snort/files/snort.init| 109 .../recipes-connectivity/snort/snort_2.9.4.6.bb| 71 + 4 files changed, 307 insertions(+), 0 deletions(-) create mode 100644 meta-networking/recipes-connectivity/snort/files/disable-dap-address-space-id.patch create mode 100644 meta-networking/recipes-connectivity/snort/files/disable-inaddr-none.patch create mode 100644 meta-networking/recipes-connectivity/snort/files/snort.init create mode 100644 meta-networking/recipes-connectivity/snort/snort_2.9.4.6.bb diff --git a/meta-networking/recipes-connectivity/snort/files/disable-dap-address-space-id.patch b/meta-networking/recipes-connectivity/snort/files/disable-dap-address-space-id.patch new file mode 100644 index 000..39e5c9c --- /dev/null +++ b/meta-networking/recipes-connectivity/snort/files/disable-dap-address-space-id.patch @@ -0,0 +1,52 @@ +Upstream-Status:Inappropriate [embedded specific] + +fix the below error: +checking for dap address space id... configure: +configure: error: cannot run test program while cross compiling + + +Signed-off-by: Chunrong Guo b40...@freescale.com + +--- a/configure.in 2013-08-23 00:06:37.239361932 -0500 b/configure.in 2013-08-23 00:07:32.860266534 -0500 +@@ -679,23 +679,23 @@ + + AC_CHECK_FUNCS([daq_hup_apply] [daq_acquire_with_meta]) + +-AC_MSG_CHECKING([for daq address space ID]) +-AC_RUN_IFELSE( +-[AC_LANG_PROGRAM( +-[[ +-#include daq.h +-]], +-[[ +- DAQ_PktHdr_t hdr; +- hdr.address_space_id = 0; +-]])], +-[have_daq_address_space_id=yes], +-[have_daq_address_space_id=no]) +-AC_MSG_RESULT($have_daq_address_space_id) +-if test x$have_daq_address_space_id = xyes; then +-AC_DEFINE([HAVE_DAQ_ADDRESS_SPACE_ID],[1], +-[DAQ version supports address space ID in header.]) +-fi ++#AC_MSG_CHECKING([for daq address space ID]) ++#AC_RUN_IFELSE( ++#[AC_LANG_PROGRAM( ++#[[ ++##include daq.h ++#]], ++#[[ ++# DAQ_PktHdr_t hdr; ++# hdr.address_space_id = 0; ++#]])], ++have_daq_address_space_id=yes ++#[have_daq_address_space_id=no]) ++#AC_MSG_RESULT($have_daq_address_space_id) ++#if test x$have_daq_address_space_id = xyes; then ++#AC_DEFINE([HAVE_DAQ_ADDRESS_SPACE_ID],[1], ++#[DAQ version supports address space ID in header.]) ++#fi + + # any sparc platform has to have this one defined. + AC_MSG_CHECKING(for sparc) diff --git a/meta-networking/recipes-connectivity/snort/files/disable-inaddr-none.patch b/meta-networking/recipes-connectivity/snort/files/disable-inaddr-none.patch new file mode 100644 index 000..9dafe63 --- /dev/null +++ b/meta-networking/recipes-connectivity/snort/files/disable-inaddr-none.patch @@ -0,0 +1,75 @@ +Upstream-Status: Inappropriate [embedded specific] + +fix the below error: +checking for INADDR_NONE... configure: +configure: error: cannot run test program while cross compiling + +Signed-off-by: Chunrong Guo b40...@freescale.com + + +--- a/configure.in 2013-08-21 03:56:17.197414789 -0500 b/configure.in 2013-08-21 23:19:05.298553560 -0500 +@@ -281,25 +281,7 @@ + AC_CHECK_TYPES([boolean]) + + # In case INADDR_NONE is not defined (like on Solaris) +-have_inaddr_none=no +-AC_MSG_CHECKING([for INADDR_NONE]) +-AC_RUN_IFELSE( +-[AC_LANG_PROGRAM( +-[[ +-#include sys/types.h +-#include netinet/in.h +-#include arpa/inet.h +-]], +-[[ +- if (inet_addr(10,5,2) == INADDR_NONE); +-return 0; +-]])], +-[have_inaddr_none=yes], +-[have_inaddr_none=no]) +-AC_MSG_RESULT($have_inaddr_none) +-if test x$have_inaddr_none = xno; then +- AC_DEFINE([INADDR_NONE],[-1],[For INADDR_NONE definition]) +-fi ++have_inaddr_none=yes + + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include stdio.h +@@ -397,21 +379,21 @@ + fi + fi + +-AC_MSG_CHECKING([for pcap_lex_destroy]) +-AC_RUN_IFELSE( +-[AC_LANG_PROGRAM( +-[[ +-#include pcap.h +-]], +-[[ +- pcap_lex_destroy(); +-]])], +-[have_pcap_lex_destroy=yes], +-[have_pcap_lex_destroy=no]) +-AC_MSG_RESULT($have_pcap_lex_destroy) +-if test x$have_pcap_lex_destroy = xyes; then +-AC_DEFINE([HAVE_PCAP_LEX_DESTROY],[1],[Can cleanup lex buffer stack created by pcap bpf filter]) +-fi ++#AC_MSG_CHECKING([for pcap_lex_destroy]) ++#AC_RUN_IFELSE( ++#[AC_LANG_PROGRAM( ++#[[ ++##include pcap.h ++#]], ++#[[ ++# pcap_lex_destroy(); ++#]])], ++have_pcap_lex_destroy=yes ++#[have_pcap_lex_destroy=no]) ++#AC_MSG_RESULT($have_pcap_lex_destroy) ++#if test x$have_pcap_lex_destroy = xyes; then ++#AC_DEFINE([HAVE_PCAP_LEX_DESTROY],[1],[Can cleanup lex buffer stack created by pcap bpf filter]) ++#fi + + AC_MSG_CHECKING([for pcap_lib_version]) + AC_LINK_IFELSE( diff --git
[oe] [meta-oe][PATCH v3 2/3 ] barnyard2: add recipe
From: Chunrong Guo b40...@freescale.com *Barnyard2 is a output system for Snort Signed-off-by: Chunrong Guo b40...@freescale.com --- .../barnyard2-1.8/barnyard2-cross-fix.patch| 21 .../barnyard2/barnyard2_1.8.bb | 18 + 2 files changed, 39 insertions(+), 0 deletions(-) create mode 100644 meta-networking/recipes-connectivity/barnyard2/barnyard2-1.8/barnyard2-cross-fix.patch create mode 100644 meta-networking/recipes-connectivity/barnyard2/barnyard2_1.8.bb diff --git a/meta-networking/recipes-connectivity/barnyard2/barnyard2-1.8/barnyard2-cross-fix.patch b/meta-networking/recipes-connectivity/barnyard2/barnyard2-1.8/barnyard2-cross-fix.patch new file mode 100644 index 000..0e94598 --- /dev/null +++ b/meta-networking/recipes-connectivity/barnyard2/barnyard2-1.8/barnyard2-cross-fix.patch @@ -0,0 +1,21 @@ +Index: barnyard2-1.8/configure.in +=== +--- barnyard2-1.8.orig/configure.in2010-08-03 15:12:06.0 +0400 barnyard2-1.8/configure.in 2010-08-03 15:13:46.0 +0400 +@@ -73,7 +73,6 @@ + # libpcap doesn't even LOOK at the timeout you give it under Linux + AC_DEFINE([PCAP_TIMEOUT_IGNORED],[1],[Define if pcap timeout is ignored]) + AC_SUBST(extra_incl) +-extra_incl=-I/usr/include/pcap + ;; + *-hpux10*|*-hpux11*) + AC_DEFINE([HPUX],[1],[Define if HP-UX 10 or 11]) +@@ -230,7 +229,7 @@ + # In case INADDR_NONE is not defined (like on Solaris) + have_inaddr_none=no + AC_MSG_CHECKING([for INADDR_NONE]) +-AC_RUN_IFELSE( ++AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[ + #include sys/types.h diff --git a/meta-networking/recipes-connectivity/barnyard2/barnyard2_1.8.bb b/meta-networking/recipes-connectivity/barnyard2/barnyard2_1.8.bb new file mode 100644 index 000..14acdac --- /dev/null +++ b/meta-networking/recipes-connectivity/barnyard2/barnyard2_1.8.bb @@ -0,0 +1,18 @@ +DESCRIPTION = Barnyard2 is a fork of the original barnyard project, designed specifically for Snort's new unified2 file format +HOMEPAGE = http://www.securixlive.com/barnyard2/; +LICENSE = GPLv2 +LIC_FILES_CHKSUM = file://LICENSE;md5=751419260aa954499f7abaabaa882bbe +DEPENDS = libpcap + +SRC_URI = \ + http://www.securixlive.com/download/barnyard2/${BP}.tar.gz \ + file://barnyard2-cross-fix.patch \ + +SRC_URI[md5sum] = 72fc6c490db6ea6a0f46c27d24998067 +SRC_URI[sha256sum] = 1abfe6530d721debd98921421722b02c844c289564730b1e85729e4915b2bb7a + +inherit autotools pkgconfig + +EXTRA_OECONF = --enable-prelude --enable-gre --without-mysql + +CONFFILES_${PN} = ${sysconfdir}/barnyard2.conf -- 1.7.5.4 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH v3 3/3 ] libdnet: add recipe
From: Chunrong Guo b40...@freescale.com *dumb networking library *snort depends libdnet Signed-off-by: Chunrong Guo b40...@freescale.com --- .../recipes-connectivity/libdnet/libdnet_1.12.bb | 14 ++ 1 files changed, 14 insertions(+), 0 deletions(-) create mode 100644 meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb diff --git a/meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb b/meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb new file mode 100644 index 000..40b5758 --- /dev/null +++ b/meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb @@ -0,0 +1,14 @@ +DESCRIPTION = dumb networking library +HOMEPAGE = http://code.google.com/p/libdnet/; +LICENSE = BSD +LIC_FILES_CHKSUM = file://LICENSE;md5=0036c1b155f4e999f3e0a373490b5db9 + +SRC_URI = http://libdnet.googlecode.com/files/libdnet-${PV}.tgz; + +SRC_URI[md5sum] = 9253ef6de1b5e28e9c9a62b882e44cc9 +SRC_URI[sha256sum] = 83b33039787cf0e977cef7f18a5d5e7aaffc4505548a83d31bd3515eb026 + +inherit autotools + +acpaths = -I ./config/ + -- 1.7.5.4 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH v2] tcpreplay:add recipe
Boah Leute könnt ihr mal aufhören mein Postfach zuzumüllen?! 2013/11/1 Zongchun YU b40...@freescale.com get rid of that, and why are the configure patches not ok for upstreaming ? Hello Khem. Thanks for your comments, I am a newcomer for upstreaming. Do you mean that first I should send the two patches to upstream? Best Regards Zongchun -邮件原件- 发件人: Khem Raj [mailto:raj.k...@gmail.com] 发送时间: 2013年11月1日 0:36 收件人: openembeded-devel 抄送: Zongchun Yu; b44...@freescale.com 主题: Re: [oe] [meta-oe][PATCH v2] tcpreplay:add recipe On Thu, Oct 31, 2013 at 12:40 AM, b40...@freescale.com wrote: +PR = r0 get rid of that, and why are the configure patches not ok for upstreaming ? ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH v2] tcpreplay:add recipe
On Thu, Oct 31, 2013 at 09:10:12AM +0100, Martin Jansa wrote: On Thu, Oct 31, 2013 at 02:40:47AM -0500, b40...@freescale.com wrote: From: Zongchun Yu zongchun...@freescale.com *tcpreplay - a suite of GPLv3 licensed tools for UNIX operating systems which gives you the ability to use previously captured traffic in libpcap format to test a variety of network devices. Signed-off-by: Zongchun Yu zongchun...@freescale.com --- .../files/tcpreplay-3.4.4-cross-compile.patch | 90 .../files/tcpreplay-3.4.4-no-bfp-support.patch | 13 +++ .../recipes-support/tcpreplay/tcpreplay_3.4.4.bb | 23 + 3 files changed, 126 insertions(+) create mode 100755 meta-oe/recipes-support/tcpreplay/files/tcpreplay-3.4.4-cross-compile.patch create mode 100644 meta-oe/recipes-support/tcpreplay/files/tcpreplay-3.4.4-no-bfp-support.patch create mode 100644 meta-oe/recipes-support/tcpreplay/tcpreplay_3.4.4.bb Looks like something for meta-networking? it fails to detect libpcap in my world builds: | checking for libpcap... /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm/usr | checking for library containing pcap_close... no | configure: error: Unable to link libpcap in /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm/usr | Configure failed. The contents of all config.log files follows to aid debugging | /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/tcpreplay/3.4.4-r0/tcpreplay-3.4.4/config.log | This file contains any messages produced by compilers while | running configure, to aid debugging if configure makes a mistake. | configure:18128: checking for libpcap | configure:18170: result: /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm/usr | configure:18180: checking for library containing pcap_close | configure:18211: arm-oe-linux-gnueabi-gcc -march=armv5te -marm -mthumb-interwork --sysroot=/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm -o conftest -D_U_=__attribute__((unused)) -O2 -pipe -g -feliminate-unused-debug-types -Wall -O3 -std=gnu99 -Wextra -Wno-variadic-macros -Wfatal-errors -I/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm/usr/include -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed conftest.c /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm/usr/lib/libpcap.a 5 | ./pcap-linux.c:525: error: undefined reference to 'nl_socket_alloc' | ./pcap-linux.c:532: error: undefined reference to 'genl_connect' | ./pcap-linux.c:538: error: undefined reference to 'genl_ctrl_alloc_cache' | ./pcap-linux.c:546: error: undefined reference to 'genl_ctrl_search_by_name' | ./pcap-linux.c:558: error: undefined reference to 'nl_socket_free' | ./pcap-linux.c:540: error: undefined reference to 'nl_geterror' | ./pcap-linux.c:556: error: undefined reference to 'nl_cache_free' | ./pcap-linux.c:565: error: undefined reference to 'genl_family_put' | ./pcap-linux.c:566: error: undefined reference to 'nl_cache_free' | ./pcap-linux.c:567: error: undefined reference to 'nl_socket_free' | ./pcap-linux.c:678: error: undefined reference to 'nlmsg_alloc' | ./pcap-linux.c:685: error: undefined reference to 'genl_family_get_id' | ./pcap-linux.c:685: error: undefined reference to 'genlmsg_put' | ./pcap-linux.c:687: error: undefined reference to 'nla_put' | ./pcap-linux.c:689: error: undefined reference to 'nl_send_auto_complete' | ./pcap-linux.c:697: error: undefined reference to 'nl_wait_for_ack' | ./pcap-linux.c:709: error: undefined reference to 'nlmsg_free' | ./pcap-linux.c:716: error: undefined reference to 'nlmsg_free' | ./pcap-linux.c:691: error: undefined reference to 'nl_geterror' | ./pcap-linux.c:702: error: undefined reference to 'nlmsg_free' | ./pcap-linux.c:699: error: undefined reference to 'nl_geterror' | ./pcap-linux.c:582: error: undefined reference to 'nlmsg_alloc' | ./pcap-linux.c:589: error: undefined reference to 'genl_family_get_id' | ./pcap-linux.c:589: error: undefined reference to 'genlmsg_put' | ./pcap-linux.c:591: error: undefined reference to 'nla_put' | ./pcap-linux.c:592: error: undefined reference to 'nla_put' | ./pcap-linux.c:593: error: undefined reference to 'nla_put' | ./pcap-linux.c:595: error: undefined reference to 'nl_send_auto_complete' | ./pcap-linux.c:623: error: undefined reference to 'nl_wait_for_ack' | ./pcap-linux.c:637: error: undefined reference to 'nlmsg_free' | ./pcap-linux.c:616: error: undefined reference to 'nl_geterror' | collect2: error: ld returned 1 exit status | configure:18211: $? = 1 diff --git a/meta-oe/recipes-support/tcpreplay/files/tcpreplay-3.4.4-cross-compile.patch b/meta-oe/recipes-support/tcpreplay/files/tcpreplay-3.4.4-cross-compile.patch new file mode 100755 index 000..226f97a --- /dev/null +++ b/meta-oe/recipes-support/tcpreplay/files/tcpreplay-3.4.4-cross-compile.patch @@ -0,0 +1,90 @@
Re: [oe] [meta-oe][PATCH v2] tcpreplay:add recipe
it fails to detect libpcap in my world builds: Thanks for your feedback. I am investigating this issue. It will be fixed in the latest patches. ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking][PATCH v2 1/3] snort : add recipe
[RE: [oe] [meta-networking][PATCH v2 1/3] snort : add recipe] On 13.11.01 (Fri 07:15) Chunrong Guo wrote: Hello,joe I investigate barnyard2 and barnyard . I have the following conclusions: 1) Barnyard2 maintains majority of the command syntax of barnyard. 2) Barnyard has not seen an updated in over 4 years and is not going to be maintained by the original developers. 3) Barnyard2 is a very popular plugin . I will submit new patch about snort + Barnyard2. Thanks. That was my read on barnyard v. barnyard2 as well but it is good to know you've verified my impression. I saw the latest version (please do try to ensure you tag them with meta-networking in the subject) and I'll have a look at them and try them out later this morning. -J. Thanks, chunrong -Original Message- From: Joe MacDonald [mailto:j...@deserted.net] Sent: Wednesday, October 30, 2013 8:49 PM To: Guo Chunrong-B40290 Cc: openembedded-devel@lists.openembedded.org Subject: Re: [oe] [meta-networking][PATCH v2 1/3] snort : add recipe [RE: [oe] [meta-networking][PATCH v2 1/3] snort : add recipe] On 13.10.30 (Wed 01:40) Guo Chunrong-B40290 wrote: Hi, Joe MacDonald Thank you for your comments. The current snort simply do not need sysvinit config. I apologize, I don't mean to belabor the point, but can you point me at that information? http://www.snort.org/docs/ contains a lot of documentation around getting snort started on various systems and there are a number of startup scripts there that indicate they belong in /etc/init.d of their respective distributions. Perhaps things have changed in the most recent version of snort, but the Snort Startup Scripts section seem to apply to the versions of snort you're proposing we include in meta-networking. Also, please don't forget about the include path and barnyard questions. Thanks. -J. Thanks, Chunrong -Original Message- From: Joe MacDonald [mailto:j...@deserted.net] Sent: Wednesday, October 30, 2013 3:20 AM To: openembedded-devel@lists.openembedded.org Cc: Guo Chunrong-B40290 Subject: Re: [oe] [meta-networking][PATCH v2 1/3] snort : add recipe Hi Chunrong, Sorry about the confusion here, there were still at least a couple of outstanding questions / requests, I thought. I had a quick look back at the latest barnyard recipe and it appears to be removing the include path as opposed to using -I=/usr/include/pcap that Khem suggested, I was hoping to hear back on the question I had as well WRT barnyard versus barnyard2 (I could make the license tweak myself since I'm confident that won't invalidate any of your work) and the Gentoo mirror as the primary source for this version of Barnyard. I also noticed that in the most recent version of the snort recipe the sysvinit components have been dropped entirely. Was that due to problems inheriting update-rc.d as Koen suggested? (Or perhaps the current snort simply doesn't have a functional sysvinit config? I hope that's not the case.) I'm probably not the only one still making use of sysvinit stuff in some scenarios. :-) -J. [Re: [oe] [meta-networking][PATCH v2 1/3] snort : add recipe] On 13.10.28 (Mon 02:23) Guo Chunrong-B40290 wrote: pings -Original Message- From: Guo Chunrong-B40290 Sent: Friday, October 18, 2013 4:22 PM To: openembedded-devel@lists.openembedded.org Cc: Liu Ting-B28495; Luo Zhenhua-B19537; Guo Chunrong-B40290 Subject: [meta-networking][PATCH v2 1/3] snort : add recipe From: Chunrong Guo b40...@freescale.com *snort - a free lightweight network intrusion detection system for UNIX and Windows Signed-off-by: Chunrong Guo b40...@freescale.com --- .../snort/files/disable-dap-address-space-id.patch | 52 ++ .../snort/files/disable-inaddr-none.patch | 75 .../recipes-connectivity/snort/snort_2.9.4.6.bb| 64 + 3 files changed, 191 insertions(+), 0 deletions(-) create mode 100644 meta-networking/recipes-connectivity/snort/files/disable-dap-address -s pace-id.patch create mode 100644 meta-networking/recipes-connectivity/snort/files/disable-inaddr-none .p atch create mode 100644 meta-networking/recipes-connectivity/snort/snort_2.9.4.6.bb diff --git a/meta-networking/recipes-connectivity/snort/files/disable-dap-addre ss -space-id.patch b/meta-networking/recipes-connectivity/snort/files/disable-dap-addre ss -space-id.patch new file mode 100644 index 000..39e5c9c --- /dev/null +++ b/meta-networking/recipes-connectivity/snort/files/disable-dap-a +++ dd +++ re +++ ss-space-id.patch @@ -0,0 +1,52 @@ +Upstream-Status:Inappropriate [embedded specific] + +fix the below error:
Re: [oe] [meta-networking][PATCH] cifs-utils: Add PACKAGECONFIG for cifscreds, cifsupcall
Merged, thanks. -J. [[oe] [meta-networking][PATCH] cifs-utils: Add PACKAGECONFIG for cifscreds, cifsupcall] On 13.10.31 (Thu 21:10) Martin Jansa wrote: * make files in bindir/sbindir a bit more deterministic Signed-off-by: Martin Jansa martin.ja...@gmail.com --- meta-networking/recipes-support/cifs/cifs-utils_git.bb | 4 1 file changed, 4 insertions(+) diff --git a/meta-networking/recipes-support/cifs/cifs-utils_git.bb b/meta-networking/recipes-support/cifs/cifs-utils_git.bb index d8de714..2b7a0dd 100644 --- a/meta-networking/recipes-support/cifs/cifs-utils_git.bb +++ b/meta-networking/recipes-support/cifs/cifs-utils_git.bb @@ -14,6 +14,10 @@ S = ${WORKDIR}/git PACKAGECONFIG ??= PACKAGECONFIG[cap] = --with-libcap,--without-libcap,libcap +# when enabled, it creates ${bindir}/cifscreds and --ignore-fail-on-non-empty in do_install_append is needed +PACKAGECONFIG[cifscreds] = --enable-cifscreds,--disable-cifscreds,keyutils +# when enabled, it creates ${sbindir}/cifs.upcall and --ignore-fail-on-non-empty in do_install_append is needed +PACKAGECONFIG[cifsupcall] = --enable-cifsupcall,--disable-cifsupcall,krb5 talloc keyutils inherit autotools pkgconfig -- -Joe MacDonald. :wq signature.asc Description: Digital signature ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking][PATCH v2] cyrus-sasl: ensure size_t is defined for use by sasl.h
Merged, thanks. -J. [[meta-networking][PATCH v2] cyrus-sasl: ensure size_t is defined for use by sasl.h] On 13.10.30 (Wed 14:45) Mark Asselstine wrote: While making use of the cyrus-sasl library an external application will most likely include sasl.h which will cause compilation failures if steps haven't been taken to define size_t. This should not be the responsibility of the application building against the sasl library but rather handled already in sasl.h. Here we ensure sasl.h has the proper includes to have size_t defined before it is used. Signed-off-by: Mark Asselstine mark.asselst...@windriver.com --- v2 changes: * using upstream patch. Posix I believe says to use sys/types.h but in any case stddef.h works fine. * removed PR addition + bump * added upstream status line ...l.h-include-stddef.h-for-size_t-on-NetBSD.patch | 31 ++ .../cyrus-sasl/cyrus-sasl_2.1.26.bb| 1 + 2 files changed, 32 insertions(+) create mode 100644 meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/sasl.h-include-stddef.h-for-size_t-on-NetBSD.patch diff --git a/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/sasl.h-include-stddef.h-for-size_t-on-NetBSD.patch b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/sasl.h-include-stddef.h-for-size_t-on-NetBSD.patch new file mode 100644 index 000..ecbab84 --- /dev/null +++ b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/sasl.h-include-stddef.h-for-size_t-on-NetBSD.patch @@ -0,0 +1,31 @@ +From 92d72789c811b0d55f624a8bac5ccc4412f5996e Mon Sep 17 00:00:00 2001 +From: Ken Murchison mu...@andrew.cmu.edu +Date: Thu, 20 Dec 2012 18:14:50 -0500 +Subject: [PATCH] sasl.h: #include stddef.h for size_t on NetBSD + +This patch was imported from git://git.cyrusimap.org/cyrus-sasl +commit 67a188693796a14e3a76ac603104807fbbfddfc4 + +Upstream-Status: Backport + +Signed-off-by: Mark Asselstine mark.asselst...@windriver.com +--- + include/sasl.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/include/sasl.h b/include/sasl.h +index fef4d51..8b8a63f 100755 +--- a/include/sasl.h b/include/sasl.h +@@ -121,6 +121,8 @@ + #ifndef SASL_H + #define SASL_H 1 + ++#include stddef.h /* For size_t */ ++ + /* Keep in sync with win32/common.mak */ + #define SASL_VERSION_MAJOR 2 + #define SASL_VERSION_MINOR 1 +-- +1.8.3.2 + diff --git a/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb index f05ab85..2abaee2 100644 --- a/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb +++ b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb @@ -9,6 +9,7 @@ SRC_URI = ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${PV}.tar.gz \ file://Fix-hardcoded-libdir.patch \ file://debian_patches_0009_sasldb_al.diff \ file://debian_patches_0014_avoid_pic_overwrite.diff \ +file://sasl.h-include-stddef.h-for-size_t-on-NetBSD.patch \ inherit autotools pkgconfig useradd -- -Joe MacDonald. :wq signature.asc Description: Digital signature ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking][PATCH 1/5] cyrus-sasl: remove the unnecessary pkg_postinst
Merged this set. Thanks. -J. [[oe][meta-networking][PATCH 1/5] cyrus-sasl: remove the unnecessary pkg_postinst] On 13.10.31 (Thu 14:29) qi.c...@windriver.com wrote: From: Chen Qi qi.c...@windriver.com saslpasswd2 is used by an administrator to set a user's sasl password, setting a default one in pkg_postinst in not only unnecessary but also inappropriate. Besides, running saslpasswd2 takes a significant amount of time to finish, so this pkg_postinst will make the first boot take longer time. According to the above two reasons, the patch remove the pkg_postint. Signed-off-by: Chen Qi qi.c...@windriver.com --- .../cyrus-sasl/cyrus-sasl_2.1.26.bb|5 - 1 file changed, 5 deletions(-) diff --git a/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb index f05ab85..b4e9190 100644 --- a/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb +++ b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb @@ -54,11 +54,6 @@ USERADD_PACKAGES = ${PN}-bin GROUPADD_PARAM_${PN}-bin = --system mail USERADD_PARAM_${PN}-bin = --system --home=/var/spool/mail -g mail cyrus -pkg_postinst_${PN}-bin () { -echo cyrus | saslpasswd2 -p -c cyrus -chgrp mail /etc/sasldb2 -} - SRC_URI[md5sum] = a7f4e5e559a0e37b3ffc438c9456e425 SRC_URI[sha256sum] = 8fbc5136512b59bb793657f36fadda6359cae3b08f01fd16b3d406f1345b7bc3 -- -Joe MacDonald. :wq signature.asc Description: Digital signature ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [OE] [PATCH meta-networking] quagga/ripd: Fix two bugs after received SIGHUP signal
And to close the loop, I merged the modified version of your patch that we discussed below. Thanks. -J. [Re: [oe] [OE] [PATCH meta-networking] quagga/ripd: Fix two bugs after received SIGHUP signal] On 13.10.31 (Thu 09:59) Joe MacDonald wrote: [Re: [oe] [OE] [PATCH meta-networking] quagga/ripd: Fix two bugs after received SIGHUP signal] On 13.10.31 (Thu 09:52) Xufeng Zhang wrote: On 10/30/2013 09:36 PM, Joe MacDonald wrote: Hi Xufeng, [Re: [oe] [OE] [PATCH meta-networking] quagga/ripd: Fix two bugs after received SIGHUP signal] On 13.10.28 (Mon 11:37) Xufeng Zhang wrote: On 10/25/2013 09:31 PM, Joe MacDonald wrote: [Re: [oe] [OE] [PATCH meta-networking] quagga/ripd: Fix two bugs after received SIGHUP signal] On 13.10.25 (Fri 09:47) Xufeng Zhang wrote: On 10/25/2013 01:44 AM, Joe MacDonald wrote: [[oe] [OE] [PATCH meta-networking] quagga/ripd: Fix two bugs after received SIGHUP signal] On 13.10.24 (Thu 17:48) Xufeng Zhang wrote: There are two problems for ripd implementation after received SIGHUP signal: 1). ripd didn't clean up ifp-connected list before reload configuration file which makes the same advertise packet being sent multiple times(depends on how many SIGHUP was recieved). 2). ripd reset ri-split_horizon flag to RIP_NO_SPLIT_HORIZON during restart which is different from the flag when ripd is firstly started up, leading to unnecessary route to be advertised. [YOCTO #5266] Hey Xufeng, Normally I wouldn't go this deep into the detail but since you referenced the Yocto bug and the Quagga discussion in the commit log and the bug itself, I thought I'd try to understand what's going on here. The last thing I saw from the Quagga maintainer is this: The ifp-connected list contains connected prefixes of a given interface. These exist regardless of particular routing protocols and emptying the list during ripd reconfiguration would be plain wrong. I allow for a chance there is a bug that is related to ifp-connected and SIGHUP handling at once, but not in this specific way. What he said is that this ifp-connected list is exist in all routing protocols, and if it needs cleanup, it should be done in a more general way, such as in zebra client which is independent of routing protocol. I'm not sure that's the interpretation I would have taken from the quoted text, but if what you indicate is what the maintainer meant, then is he not saying that the SIGHUP handling issue also exists for other routing daemons in the suite? quoted the sentence: The ifp-connected list contains connected prefixes of a given interface. These exist regardless of particular routing protocols and emptying the list during ripd reconfiguration would be plain wrong. All the other daemons also refer to the ifp-connected list, and I have checked the SIGHUP handler code of all daemons, except ospfd and ospf6d(they only print a log when SIGHUP is received), all the other daemons suffer the same problem as ripd since they reload the configuration file. Are you saying a similar patch would then be required for potentially all daemons in quagga? Not all. Six of eight, then. ;-) Nine, if watchquagga also contains dodgy SIGHUP handler code, but it probably doesn't care about the connected list. Don't get me wrong, repairing one is better than repairing none, but on my first read of his comments it didn't seem like the maintainer even agreed that there was a bug at all and your interpretation suggests that the same bug likely impacts all quagga daemons. Any sense on whether that's the case? I allow for a chance there is a bug that is related to ifp-connected and SIGHUP handling at once, but not in this specific way. My understanding is that if there is a bug related to ifp-connected, we should not fix in such specific way. Yes, the maintainer didn't agree that there is really a bug here, but this is really a abnormal behavior: every time when SIGHUP is received, the same address is appended to ifp-connected list over and over again, so if too much SIGHUP are received, there will be a flood for the advertised packets. Okay, so given that, I'm inclined to merge this set with a note in the upstream-status in the patch indicating it is unlikely to be merged. How about Submitted with a footnote pointing at the discussion thread? I think it's fine. Do I need to send V2 patch? Nope, if you're happy with my proposed amendments, I'll just update the patch in my tree. Do you think it'd be possible to provide similar patches for the other daemons that suffer this problem? I'll take the current submission, but if you had time to do a follow-up later on for the other daemons, that'd be great. Ok, I'll do this job for the other daemons. Fantastic, thanks! -J.
[oe] [meta-oe][PATCH] python-mako: use BBCLASSEXTEND instead of native recipe
There isn't a need for a separate native recipe, so use BBCLASSEXTEND and overrides. Signed-off-by: Ross Burton ross.bur...@intel.com --- meta-oe/recipes-devtools/python/python-mako-native_0.7.2.bb |5 - meta-oe/recipes-devtools/python/python-mako_0.7.2.bb|3 +++ 2 files changed, 3 insertions(+), 5 deletions(-) delete mode 100644 meta-oe/recipes-devtools/python/python-mako-native_0.7.2.bb diff --git a/meta-oe/recipes-devtools/python/python-mako-native_0.7.2.bb b/meta-oe/recipes-devtools/python/python-mako-native_0.7.2.bb deleted file mode 100644 index 05479db..000 --- a/meta-oe/recipes-devtools/python/python-mako-native_0.7.2.bb +++ /dev/null @@ -1,5 +0,0 @@ -require python-mako_${PV}.bb -inherit native pythonnative - -DEPENDS = python-native -RDEPENDS_${PN} = diff --git a/meta-oe/recipes-devtools/python/python-mako_0.7.2.bb b/meta-oe/recipes-devtools/python/python-mako_0.7.2.bb index 9e381f3..1d2bdd7 100644 --- a/meta-oe/recipes-devtools/python/python-mako_0.7.2.bb +++ b/meta-oe/recipes-devtools/python/python-mako_0.7.2.bb @@ -17,3 +17,6 @@ RDEPENDS_${PN} = python-threading \ python-netclient \ python-html \ +RDEPENDS_${PN}_class-native = + +BBCLASSEXTEND = native nativesdk -- 1.7.10.4 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] mesa-glut: add Mesa's OpenGL Utility Toolkit implementation
Signed-off-by: Ross Burton ross.bur...@intel.com --- meta-oe/licenses/Kilgard |5 + meta-oe/recipes-graphics/mesa/mesa-glut_8.0.1.bb | 14 ++ 2 files changed, 19 insertions(+) create mode 100644 meta-oe/licenses/Kilgard create mode 100644 meta-oe/recipes-graphics/mesa/mesa-glut_8.0.1.bb diff --git a/meta-oe/licenses/Kilgard b/meta-oe/licenses/Kilgard new file mode 100644 index 000..8836db1 --- /dev/null +++ b/meta-oe/licenses/Kilgard @@ -0,0 +1,5 @@ +Copyright (c) Mark J. Kilgard, 1994, 1995, 1996, 1998. + +This program is freely distributable without licensing fees and is +provided without guarantee or warrantee expressed or implied. This +program is -not- in the public domain. diff --git a/meta-oe/recipes-graphics/mesa/mesa-glut_8.0.1.bb b/meta-oe/recipes-graphics/mesa/mesa-glut_8.0.1.bb new file mode 100644 index 000..7006b41 --- /dev/null +++ b/meta-oe/recipes-graphics/mesa/mesa-glut_8.0.1.bb @@ -0,0 +1,14 @@ +SUMMARY = OpenGL Utility Toolkit +LICENSE = Kilgard +LIC_FILES_CHKSUM = file://include/GL/glut.h;md5=4aab626c830aed79d7b2e5a76dfa2dd6;startline=4;endline=8 + +SRC_URI = git://anongit.freedesktop.org/mesa/glut + +SRCREV = ee89e9aeb49604b036e06f1df6478d32006b30cd +PV = 8.0.0+git${SRCPV} + +S = ${WORKDIR}/git + +inherit autotools pkgconfig + +DEPENDS = virtual/libx11 libxmu libxi virtual/libgl libglu -- 1.7.10.4 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 1/2] pinpoint: add missing build dependency on cogl
Signed-off-by: Ross Burton ross.bur...@intel.com --- meta-gnome/recipes-apps/pinpoint/pinpoint_git.bb |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-gnome/recipes-apps/pinpoint/pinpoint_git.bb b/meta-gnome/recipes-apps/pinpoint/pinpoint_git.bb index cc247f9..d9bc350 100644 --- a/meta-gnome/recipes-apps/pinpoint/pinpoint_git.bb +++ b/meta-gnome/recipes-apps/pinpoint/pinpoint_git.bb @@ -7,7 +7,7 @@ LICENSE = LGPLv2.1 LIC_FILES_CHKSUM = file://COPYING;md5=fbc093901857fcd118f065f900982c24 \ file://pinpoint.c;beginline=6;endline=17;md5=201d438283607da393fae6aca085454c -DEPENDS = gnome-common glib-2.0 gdk-pixbuf clutter-1.0 clutter-gst-1.0 +DEPENDS = gnome-common glib-2.0 gdk-pixbuf cogl-1.0 clutter-1.0 clutter-gst-1.0 inherit autotools gettext -- 1.7.10.4 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 2/2] pinpoint: add gdk-pixbuf loaders to runtime recommendations
A pinpoint that can't load images isn't really useful, so recommend the PNG and JPEG loaders. Signed-off-by: Ross Burton ross.bur...@intel.com --- meta-gnome/recipes-apps/pinpoint/pinpoint_git.bb |1 + 1 file changed, 1 insertion(+) diff --git a/meta-gnome/recipes-apps/pinpoint/pinpoint_git.bb b/meta-gnome/recipes-apps/pinpoint/pinpoint_git.bb index d9bc350..7dc09da 100644 --- a/meta-gnome/recipes-apps/pinpoint/pinpoint_git.bb +++ b/meta-gnome/recipes-apps/pinpoint/pinpoint_git.bb @@ -18,3 +18,4 @@ PV = 0.1.4+gitr${SRCPV} S = ${WORKDIR}/git +RRECOMMENDS_${PN} = gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-png -- 1.7.10.4 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH] autofs: correct QA issues with orphaned systemd files
If we build a project without systemd support on a system that has systemd enabled, the following QA items get flagged: /lib /lib/systemd /lib/systemd/system /lib/systemd/system/autofs.service Trying to keep the solution to the problem as contained as possible in a way that may be accepted up-stream by adding an optional parameter to the --with-systemd flag. Signed-off-by: Joe MacDonald j...@deserted.net --- ...emd-allow-with-systemd-to-take-a-path-arg.patch | 45 ++ .../recipes-daemons/autofs/autofs_5.0.7.bb | 4 +- 2 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 meta-networking/recipes-daemons/autofs/autofs-5.0.7/0001-systemd-allow-with-systemd-to-take-a-path-arg.patch diff --git a/meta-networking/recipes-daemons/autofs/autofs-5.0.7/0001-systemd-allow-with-systemd-to-take-a-path-arg.patch b/meta-networking/recipes-daemons/autofs/autofs-5.0.7/0001-systemd-allow-with-systemd-to-take-a-path-arg.patch new file mode 100644 index 000..0eeceb0 --- /dev/null +++ b/meta-networking/recipes-daemons/autofs/autofs-5.0.7/0001-systemd-allow-with-systemd-to-take-a-path-arg.patch @@ -0,0 +1,45 @@ +From 40971911d653bf53de295d7462c643e4073916b9 Mon Sep 17 00:00:00 2001 +From: Joe MacDonald j...@deserted.net +Date: Fri, 1 Nov 2013 12:47:18 -0400 +Subject: [PATCH] systemd: allow --with-systemd to take a path arg + +If building for a cross-compile environment with systemd it is convenient +to be able to specify a systemd path for the target that may not be the +same as that on the host. + +Signed-off-by: Joe MacDonald j...@deserted.net +--- + aclocal.m4 | 10 -- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/aclocal.m4 b/aclocal.m4 +index 3e6f223..105e3e9 100644 +--- a/aclocal.m4 b/aclocal.m4 +@@ -229,8 +229,10 @@ dnl Check the location of the systemd unit files directory + dnl -- + AC_DEFUN([AF_WITH_SYSTEMD], + [AC_ARG_WITH(systemd, +-[ --with-systemd install systemd unit file if systemd unit directory +-is found on system], ++[ --with-systemd@:@=systemddir@:@ install systemd unit file. If 'yes' ++probe the system for unit directory. ++If a path is specified, assume that ++is a valid install path.], + [if test $withval = yes; then + if test -z $systemddir; then + AC_MSG_CHECKING([location of the systemd unit files directory]) +@@ -247,6 +249,10 @@ AC_DEFUN([AF_WITH_SYSTEMD], + else + AC_MSG_RESULT(not found) + fi ++else ++ if test $withval != no; then ++ systemddir=$withval ++ fi + fi]) + ]) + +-- +1.7.10.4 + diff --git a/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb b/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb index c4eea31..54e89f5 100644 --- a/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb +++ b/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb @@ -60,6 +60,7 @@ SRC_URI = ${KERNELORG_MIRROR}/linux/daemons/autofs/v5/autofs-${PV}.tar.bz2 \ file://autofs-5.0.7-do-not-check-for-modprobe.patch \ file://fix_disable_ldap.patch \ file://autofs-5.0.7-fix-lib-deps.patch \ + file://0001-systemd-allow-with-systemd-to-take-a-path-arg.patch \ SRC_URI[md5sum] = bc46838dece83c02d800ff144ed9f431 @@ -73,7 +74,7 @@ INITSCRIPT_PARAMS = defaults # FIXME: modules/Makefile has crappy rules that don't obey LDFLAGS CFLAGS += ${LDFLAGS} -PACKAGECONFIG[systemd] = --with-systemd,--without-systemd,systemd +PACKAGECONFIG[systemd] = --with-systemd=${systemd_unitdir}/system,--without-systemd,systemd PACKAGECONFIG ?= ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} @@ -85,7 +86,6 @@ EXTRA_OECONF += --disable-mount-locking \ CACHED_CONFIGUREVARS = ac_cv_path_RANLIB=${RANLIB} \ ac_cv_path_RPCGEN=rpcgen \ -systemddir=${systemd_unitdir}/system \ do_configure_prepend () { -- 1.8.4 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking][PATCH] autofs: correct QA issues with orphaned systemd files
Okay, that'd be 'no'. Wrong version of the patch, v2 coming soon. -J. [[oe] [meta-networking][PATCH] autofs: correct QA issues with orphaned systemd files] On 13.11.01 (Fri 14:14) Joe MacDonald wrote: If we build a project without systemd support on a system that has systemd enabled, the following QA items get flagged: /lib /lib/systemd /lib/systemd/system /lib/systemd/system/autofs.service Trying to keep the solution to the problem as contained as possible in a way that may be accepted up-stream by adding an optional parameter to the --with-systemd flag. Signed-off-by: Joe MacDonald j...@deserted.net --- ...emd-allow-with-systemd-to-take-a-path-arg.patch | 45 ++ .../recipes-daemons/autofs/autofs_5.0.7.bb | 4 +- 2 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 meta-networking/recipes-daemons/autofs/autofs-5.0.7/0001-systemd-allow-with-systemd-to-take-a-path-arg.patch diff --git a/meta-networking/recipes-daemons/autofs/autofs-5.0.7/0001-systemd-allow-with-systemd-to-take-a-path-arg.patch b/meta-networking/recipes-daemons/autofs/autofs-5.0.7/0001-systemd-allow-with-systemd-to-take-a-path-arg.patch new file mode 100644 index 000..0eeceb0 --- /dev/null +++ b/meta-networking/recipes-daemons/autofs/autofs-5.0.7/0001-systemd-allow-with-systemd-to-take-a-path-arg.patch @@ -0,0 +1,45 @@ +From 40971911d653bf53de295d7462c643e4073916b9 Mon Sep 17 00:00:00 2001 +From: Joe MacDonald j...@deserted.net +Date: Fri, 1 Nov 2013 12:47:18 -0400 +Subject: [PATCH] systemd: allow --with-systemd to take a path arg + +If building for a cross-compile environment with systemd it is convenient +to be able to specify a systemd path for the target that may not be the +same as that on the host. + +Signed-off-by: Joe MacDonald j...@deserted.net +--- + aclocal.m4 | 10 -- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/aclocal.m4 b/aclocal.m4 +index 3e6f223..105e3e9 100644 +--- a/aclocal.m4 b/aclocal.m4 +@@ -229,8 +229,10 @@ dnl Check the location of the systemd unit files directory + dnl -- + AC_DEFUN([AF_WITH_SYSTEMD], + [AC_ARG_WITH(systemd, +-[ --with-systemd install systemd unit file if systemd unit directory +- is found on system], ++[ --with-systemd@:@=systemddir@:@ install systemd unit file. If 'yes' ++ probe the system for unit directory. ++ If a path is specified, assume that ++ is a valid install path.], + [if test $withval = yes; then + if test -z $systemddir; then + AC_MSG_CHECKING([location of the systemd unit files directory]) +@@ -247,6 +249,10 @@ AC_DEFUN([AF_WITH_SYSTEMD], + else + AC_MSG_RESULT(not found) + fi ++else ++ if test $withval != no; then ++ systemddir=$withval ++ fi + fi]) + ]) + +-- +1.7.10.4 + diff --git a/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb b/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb index c4eea31..54e89f5 100644 --- a/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb +++ b/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb @@ -60,6 +60,7 @@ SRC_URI = ${KERNELORG_MIRROR}/linux/daemons/autofs/v5/autofs-${PV}.tar.bz2 \ file://autofs-5.0.7-do-not-check-for-modprobe.patch \ file://fix_disable_ldap.patch \ file://autofs-5.0.7-fix-lib-deps.patch \ + file://0001-systemd-allow-with-systemd-to-take-a-path-arg.patch \ SRC_URI[md5sum] = bc46838dece83c02d800ff144ed9f431 @@ -73,7 +74,7 @@ INITSCRIPT_PARAMS = defaults # FIXME: modules/Makefile has crappy rules that don't obey LDFLAGS CFLAGS += ${LDFLAGS} -PACKAGECONFIG[systemd] = --with-systemd,--without-systemd,systemd +PACKAGECONFIG[systemd] = --with-systemd=${systemd_unitdir}/system,--without-systemd,systemd PACKAGECONFIG ?= ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} @@ -85,7 +86,6 @@ EXTRA_OECONF += --disable-mount-locking \ CACHED_CONFIGUREVARS = ac_cv_path_RANLIB=${RANLIB} \ ac_cv_path_RPCGEN=rpcgen \ -systemddir=${systemd_unitdir}/system \ do_configure_prepend () { -- -Joe MacDonald. :wq signature.asc Description: Digital signature ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][v2][PATCH] autofs: correct QA issues with orphaned systemd files
If we build a project without systemd support on a system that has systemd enabled, the following QA items get flagged: /lib /lib/systemd /lib/systemd/system /lib/systemd/system/autofs.service Trying to keep the solution to the problem as contained as possible in a way that may be accepted up-stream by adding an optional parameter to the --with-systemd flag. Signed-off-by: Joe MacDonald j...@deserted.net --- Corrected version. Basically this problem appeared if I built on a systemd-system for a system without systemd in DISTRO_FEATURES. Autodetection was still half-happening. ...emd-allow-with-systemd-to-take-a-path-arg.patch | 47 ++ .../recipes-daemons/autofs/autofs_5.0.7.bb | 4 +- 2 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 meta-networking/recipes-daemons/autofs/autofs-5.0.7/0001-systemd-allow-with-systemd-to-take-a-path-arg.patch diff --git a/meta-networking/recipes-daemons/autofs/autofs-5.0.7/0001-systemd-allow-with-systemd-to-take-a-path-arg.patch b/meta-networking/recipes-daemons/autofs/autofs-5.0.7/0001-systemd-allow-with-systemd-to-take-a-path-arg.patch new file mode 100644 index 000..742f25d --- /dev/null +++ b/meta-networking/recipes-daemons/autofs/autofs-5.0.7/0001-systemd-allow-with-systemd-to-take-a-path-arg.patch @@ -0,0 +1,47 @@ +From 40971911d653bf53de295d7462c643e4073916b9 Mon Sep 17 00:00:00 2001 +From: Joe MacDonald j...@deserted.net +Date: Fri, 1 Nov 2013 12:47:18 -0400 +Subject: [PATCH] systemd: allow --with-systemd to take a path arg + +If building for a cross-compile environment with systemd it is convenient +to be able to specify a systemd path for the target that may not be the +same as that on the host. + +Upstream-status: Submitted [http://www.spinics.net/lists/autofs/msg00740.html] + +Signed-off-by: Joe MacDonald j...@deserted.net +--- + aclocal.m4 | 10 -- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/aclocal.m4 b/aclocal.m4 +index 3e6f223..105e3e9 100644 +--- a/aclocal.m4 b/aclocal.m4 +@@ -229,8 +229,10 @@ dnl Check the location of the systemd unit files directory + dnl -- + AC_DEFUN([AF_WITH_SYSTEMD], + [AC_ARG_WITH(systemd, +-[ --with-systemd install systemd unit file if systemd unit directory +-is found on system], ++[ --with-systemd@:@=systemddir@:@ install systemd unit file. If 'yes' ++probe the system for unit directory. ++If a path is specified, assume that ++is a valid install path.], + [if test $withval = yes; then + if test -z $systemddir; then + AC_MSG_CHECKING([location of the systemd unit files directory]) +@@ -247,6 +249,10 @@ AC_DEFUN([AF_WITH_SYSTEMD], + else + AC_MSG_RESULT(not found) + fi ++else ++ if test $withval != no; then ++ systemddir=$withval ++ fi + fi]) + ]) + +-- +1.7.10.4 + diff --git a/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb b/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb index c4eea31..54e89f5 100644 --- a/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb +++ b/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb @@ -60,6 +60,7 @@ SRC_URI = ${KERNELORG_MIRROR}/linux/daemons/autofs/v5/autofs-${PV}.tar.bz2 \ file://autofs-5.0.7-do-not-check-for-modprobe.patch \ file://fix_disable_ldap.patch \ file://autofs-5.0.7-fix-lib-deps.patch \ + file://0001-systemd-allow-with-systemd-to-take-a-path-arg.patch \ SRC_URI[md5sum] = bc46838dece83c02d800ff144ed9f431 @@ -73,7 +74,7 @@ INITSCRIPT_PARAMS = defaults # FIXME: modules/Makefile has crappy rules that don't obey LDFLAGS CFLAGS += ${LDFLAGS} -PACKAGECONFIG[systemd] = --with-systemd,--without-systemd,systemd +PACKAGECONFIG[systemd] = --with-systemd=${systemd_unitdir}/system,--without-systemd,systemd PACKAGECONFIG ?= ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} @@ -85,7 +86,6 @@ EXTRA_OECONF += --disable-mount-locking \ CACHED_CONFIGUREVARS = ac_cv_path_RANLIB=${RANLIB} \ ac_cv_path_RPCGEN=rpcgen \ -systemddir=${systemd_unitdir}/system \ do_configure_prepend () { -- 1.8.4 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel