All of lore.kernel.org
 help / color / mirror / Atom feed
From: Martin Jansa <martin.jansa@gmail.com>
To: openembedded-devel@lists.openembedded.org
Cc: Christopher Larson <chris_larson@mentor.com>
Subject: Re: [meta-oe][PATCH v2 0/5] Various dnsmasq fixes/improvements
Date: Tue, 12 Aug 2014 13:40:31 +0200	[thread overview]
Message-ID: <20140812114031.GI14848@jama> (raw)
In-Reply-To: <cover.1407773390.git.chris_larson@mentor.com>

[-- Attachment #1: Type: text/plain, Size: 4023 bytes --]

On Mon, Aug 11, 2014 at 09:12:21AM -0700, Christopher Larson wrote:
> From: Christopher Larson <chris_larson@mentor.com>
> 
> This is rebased on current master. The parallel make fix's commit message is
> adjusted to match what it does, and the lua patch is fixed.. It seems
> something inadvertantly trimmed trailing whitespace out of the patch, oops.
> 
> The following changes since commit 4d4ab8fd320b58323033c12cf705e7b3ce10d659:
> 
>   integrate fcgi-2.4.0 and add OML license file (2014-08-10 17:23:22 +0100)
> 
> are available in the git repository at:

Thanks for v2, it looks like some trailing spaces were lost in v1, so
hopefully it will apply now:

diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch b/meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch
index 63dd71a..aac7b97 100644
--- a/meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch
+++ b/meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch
@@ -1,15 +1,16 @@
 Upstream-status: Inappropriate [OE specific]
 Signed-off-by: Christopher Larson <chris_larson@mentor.com>
 
---- dnsmasq-2.68.orig/Makefile
-+++ dnsmasq-2.68/Makefile
-@@ -57,8 +57,8 @@ idn_cflags =  `echo $(COPTS) | $(top)/bl
- idn_libs =    `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_IDN $(PKG_CONFIG) --libs libidn`
+--- dnsmasq-2.68.orig/Makefile       2014-08-11 09:05:17.000000000 -0700
++++ dnsmasq-2.68/Makefile    2014-08-11 09:05:51.930648617 -0700
+@@ -57,8 +57,8 @@
+ idn_libs =    `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_IDN $(PKG_CONFIG) --libs libidn` 
  ct_cflags =   `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_CONNTRACK $(PKG_CONFIG) --cflags libnetfilter_conntrack`
  ct_libs =     `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_CONNTRACK $(PKG_CONFIG) --libs libnetfilter_conntrack`
--lua_cflags =  `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --cflags lua5.1`
--lua_libs =    `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --libs lua5.1`
+-lua_cflags =  `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --cflags lua5.1` 
+-lua_libs =    `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --libs lua5.1` 
 +lua_cflags =  `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --cflags lua`
 +lua_libs =    `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --libs lua`
  sunos_libs =  `if uname | grep SunOS >/dev/null 2>&1; then echo -lsocket -lnsl -lposix4; fi`
  version =     -DVERSION='\"`$(top)/bld/get-version $(top)`\"'
+ 


> 
>   https://github.com/kergoth/meta-openembedded dnsmasq-fixes
> 
> for you to fetch changes up to 2e84f59401a5ce57ba17841ff4ddb01cffeb1145:
> 
>   dnsmasq: add packageconfigs for idn, conntrack, lua (2014-08-11 09:07:14 -0700)
> 
> ----------------------------------------------------------------
> Christopher Larson (5):
>       dnsmasq: add missing inherit pkgconfig
>       dnsmasq: obey CFLAGS & LDFLAGS
>       dnsmasq: move parallel make patch to .bb, add upstream-status
>       dnsmasq: look for lua.pc, not lua5.1.pc
>       dnsmasq: add packageconfigs for idn, conntrack, lua
> 
>  meta-networking/recipes-support/dnsmasq/dnsmasq.inc   | 19 ++++++++++++++-----
>  .../recipes-support/dnsmasq/dnsmasq/lua.patch         | 16 ++++++++++++++++
>  .../dnsmasq/{files => dnsmasq}/parallel-make.patch    |  1 +
>  .../recipes-support/dnsmasq/dnsmasq_2.68.bb           |  5 +++++
>  4 files changed, 36 insertions(+), 5 deletions(-)
>  create mode 100644 meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch
>  rename meta-networking/recipes-support/dnsmasq/{files => dnsmasq}/parallel-make.patch (96%)
> 
> -- 
> 1.8.3.4
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

      parent reply	other threads:[~2014-08-12 11:39 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-11 16:12 [meta-oe][PATCH v2 0/5] Various dnsmasq fixes/improvements Christopher Larson
2014-08-11 16:12 ` [meta-oe][PATCH v2 1/5] dnsmasq: add missing inherit pkgconfig Christopher Larson
2014-08-11 16:12 ` [meta-oe][PATCH v2 2/5] dnsmasq: obey CFLAGS & LDFLAGS Christopher Larson
2014-08-11 16:12 ` [meta-oe][PATCH v2 3/5] dnsmasq: move parallel make patch to .bb, add upstream-status Christopher Larson
2014-08-11 16:12 ` [meta-oe][PATCH v2 4/5] dnsmasq: look for lua.pc, not lua5.1.pc Christopher Larson
2014-08-11 16:12 ` [meta-oe][PATCH v2 5/5] dnsmasq: add packageconfigs for idn, conntrack, lua Christopher Larson
2014-08-12 11:40 ` Martin Jansa [this message]

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=20140812114031.GI14848@jama \
    --to=martin.jansa@gmail.com \
    --cc=chris_larson@mentor.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 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.