From: Paul Eggleton <paul.eggleton@linux.intel.com>
To: Thomas Fitzsimmons <fitzsim@cisco.com>
Cc: openembedded-devel@lists.openembedded.org
Subject: Re: [meta-networking][PATCH] net-snmp: Backport fix for NETSNMP_NO_SYSTEMD typos
Date: Sat, 01 Jun 2013 10:25:43 +0100 [thread overview]
Message-ID: <5272086.yW5j78zTuC@helios> (raw)
In-Reply-To: <m6pgd2s6a4yg.fsf@cisco.com>
Hi Thomas,
On Friday 31 May 2013 23:24:23 Thomas Fitzsimmons wrote:
> This patch fixes a net-snmp build failure for non-systemd builds [1]:
> | .libs/snmpd.o: In function `main':
> | [...]/net-snmp/5.7.2-r0/net-snmp-5.7.2/agent/snmpd.c:459: undefined
> | reference to `netsnmp_sd_listen_fds' collect2: error: ld returned 1 exit
> | status
>
> It backports a typo fix from upstream:
>
> commit 3692875172352f72cf3afd0d35f355e83d7e421b
> Author: Bart Van Assche <bvanassche@acm.org>
> Date: Mon Aug 8 18:22:08 2011 +0200
>
> Fix typos introduced in commit 19499c3c90bf9d7b2b9e5d08baa26cc6bba28a11.
> Unbreaks the build.
>
> Thomas
>
> 1. Previously reported here:
> http://permalink.gmane.org/gmane.comp.handhelds.openembedded/57756
>
> Signed-off-by: Thomas Fitzsimmons <fitzsim@cisco.com>
> ---
> .../net-snmp/net-snmp/systemd-support.patch | 5 +++--
> 1 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git
> a/meta-networking/recipes-protocols/net-snmp/net-snmp/systemd-support.patch
> b/meta-networking/recipes-protocols/net-snmp/net-snmp/systemd-support.patch
> index 18955f2..b88531f 100644
> ---
> a/meta-networking/recipes-protocols/net-snmp/net-snmp/systemd-support.patch
> +++
> b/meta-networking/recipes-protocols/net-snmp/net-snmp/systemd-support.patch
> @@ -7,6 +7,7 @@ fef6cddfdb94da1a6b1fb768af62918b80f11fd3
> 0641e43c694c485cbbffef0556efc4641bd3ff50
> 76530a89f1c8bbd0b63acce63e10d5d4812a1a16 (conflict resolved)
> bf108d7f1354f6276fc43c129963f2c49b9fc242
> +3692875172352f72cf3afd0d35f355e83d7e421b
> 74412748067c685e1d8ab6ed3bcc3ca9c2774844
> 86132e3f1e6ef7b4e0b96d8fa24e37c81b71b0e0
> 63557cf8986a33dba1d4429b583a901361052c4f
> @@ -89,10 +90,10 @@ index b177d5b..08bdfc7 100644
> #endif
>
> #ifndef WIN32
> -+#ifndef NETSNMP_NO_SYSYSTEMD
> ++#ifndef NETSNMP_NO_SYSTEMD
> + /* check if systemd has sockets for us and don't close them */
> + prepared_sockets = netsnmp_sd_listen_fds(0);
> -+#endif /* NETSNMP_NO_SYSYSTEMD */
> ++#endif /* NETSNMP_NO_SYSTEMD */
> +
> /*
> * close all non-standard file descriptors we may have
Could you please include a header with the description, Signed-off-by and
"Upstream-Status: Backport" at the top of the inner patch itself? This makes
things easier when upgrading the recipe in future.
Thanks,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
next prev parent reply other threads:[~2013-06-01 9:25 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-01 3:24 [meta-networking][PATCH] net-snmp: Backport fix for NETSNMP_NO_SYSTEMD typos Thomas Fitzsimmons
2013-06-01 9:25 ` Paul Eggleton [this message]
2013-06-01 14:48 ` Thomas Fitzsimmons
2013-06-03 12:39 ` Joe MacDonald
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5272086.yW5j78zTuC@helios \
--to=paul.eggleton@linux.intel.com \
--cc=fitzsim@cisco.com \
--cc=openembedded-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox