From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from plane.gmane.org (plane.gmane.org [80.91.229.3]) by mail.openembedded.org (Postfix) with ESMTP id F236F620C2 for ; Sat, 1 Jun 2013 14:47:44 +0000 (UTC) Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Uin5t-0002L1-Ha for openembedded-devel@lists.openembedded.org; Sat, 01 Jun 2013 16:47:45 +0200 Received: from tfitzsim-lnx.cisco.com ([161.44.225.6]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 01 Jun 2013 16:47:45 +0200 Received: from fitzsim by tfitzsim-lnx.cisco.com with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 01 Jun 2013 16:47:45 +0200 X-Injected-Via-Gmane: http://gmane.org/ To: openembedded-devel@lists.openembedded.org From: Thomas Fitzsimmons Date: Sat, 01 Jun 2013 10:48:13 -0400 Message-ID: References: <5272086.yW5j78zTuC@helios> Mime-Version: 1.0 X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: tfitzsim-lnx.cisco.com User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.1.50 (gnu/linux) Cancel-Lock: sha1:AFFuQrJwd6Zsm/xBppicE6S4fgc= Subject: Re: [meta-networking][PATCH] net-snmp: Backport fix for NETSNMP_NO_SYSTEMD typos X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: openembedded-devel@lists.openembedded.org List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Jun 2013 14:47:45 -0000 Content-Type: text/plain Hi Paul, Paul Eggleton writes: > 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 >> 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 >> --- >> .../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. This is actually a patch to an existing backport patch that has a header (but no signed-off-by): Systemd support backported from the master branch as of 23/04/2012 (post 5.7.1, pre 5.8). The following commits have been cherry-picked: 19499c3c90bf9d7b2b9e5d08baa26cc6bba28a11 fef6cddfdb94da1a6b1fb768af62918b80f11fd3 0641e43c694c485cbbffef0556efc4641bd3ff50 76530a89f1c8bbd0b63acce63e10d5d4812a1a16 (conflict resolved) bf108d7f1354f6276fc43c129963f2c49b9fc242 3692875172352f72cf3afd0d35f355e83d7e421b 74412748067c685e1d8ab6ed3bcc3ca9c2774844 86132e3f1e6ef7b4e0b96d8fa24e37c81b71b0e0 63557cf8986a33dba1d4429b583a901361052c4f Upstream-Status: Backport I updated the header with the extra commit I cherry-picked. How should I handle Signed-off-by in this situation? Thomas