[meta-oe][PATCH 0/5] Various dnsmasq fixes/improvements

[meta-oe][PATCH 0/5] Various dnsmasq fixes/improvements

[Christopher Larson]

From: Christopher Larson <chris_larson@mentor.com>

The following changes since commit a9636f77ac00bafd1429dc52bdf2f8f2446866f9:

  wireshark: update configuration and epoch (2014-08-06 19:51:59 -0400)

are available in the git repository at:

  git@github.com:kergoth/meta-openembedded dnsmasq-fixes

for you to fetch changes up to ce63b6d184231a0a1797b91e2ad530bcdc4c7fee:

  dnsmasq: add packageconfigs for idn, conntrack, lua (2014-08-07 14:42:08 -0700)

----------------------------------------------------------------
Christopher Larson (5):
  dnsmasq: add missing inherit pkgconfig
  dnsmasq: obey CFLAGS & LDFLAGS
  dnsmasq: fix parallel make issue
  dnsmasq: look for lua.pc, not lua5.1.pc
  dnsmasq: add packageconfigs for idn, conntrack, lua

 meta-networking/recipes-support/dnsmasq/dnsmasq.inc   | 18 ++++++++++++++----
 .../recipes-support/dnsmasq/dnsmasq/lua.patch         | 15 +++++++++++++++
 .../dnsmasq/dnsmasq/parallel-make.patch               | 19 +++++++++++++++++++
 .../recipes-support/dnsmasq/dnsmasq_2.68.bb           |  5 +++++
 4 files changed, 53 insertions(+), 4 deletions(-)
 create mode 100644 meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch
 create mode 100644 meta-networking/recipes-support/dnsmasq/dnsmasq/parallel-make.patch

-- 
1.8.3.4

[meta-oe][PATCH 1/5] dnsmasq: add missing inherit pkgconfig

[Christopher Larson]

From: Christopher Larson <chris_larson@mentor.com>

dnsmasq runs pkg-config to get cflags/libs for its dependencies.

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
 meta-networking/recipes-support/dnsmasq/dnsmasq.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc b/meta-networking/recipes-support/dnsmasq/dnsmasq.inc
index e57ab72..fd5793a 100644
--- a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc
+++ b/meta-networking/recipes-support/dnsmasq/dnsmasq.inc
@@ -13,7 +13,7 @@ SRC_URI = "http://www.thekelleys.org.uk/dnsmasq/${@['archive/', ''][float(d.getV
            file://dnsmasq.service \
 "
 
-inherit update-rc.d systemd
+inherit pkgconfig update-rc.d systemd
 
 INITSCRIPT_NAME = "dnsmasq"
 INITSCRIPT_PARAMS = "defaults"
-- 
1.8.3.4

[meta-oe][PATCH 2/5] dnsmasq: obey CFLAGS & LDFLAGS

[Christopher Larson]

From: Christopher Larson <chris_larson@mentor.com>

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
 meta-networking/recipes-support/dnsmasq/dnsmasq.inc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc b/meta-networking/recipes-support/dnsmasq/dnsmasq.inc
index fd5793a..92c5367 100644
--- a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc
+++ b/meta-networking/recipes-support/dnsmasq/dnsmasq.inc
@@ -21,6 +21,10 @@ INITSCRIPT_PARAMS = "defaults"
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[dbus] = "COPTS=-DHAVE_DBUS,,dbus"
 EXTRA_OEMAKE = "${EXTRA_OECONF}"
+EXTRA_OEMAKE += "\
+    'CFLAGS=${CFLAGS}' \
+    'LDFLAGS=${LDFLAGS}' \
+"
 
 do_compile_append() {
     # build dhcp_release
-- 
1.8.3.4

[meta-oe][PATCH 3/5] dnsmasq: fix parallel make issue

[Christopher Larson]

From: Christopher Larson <chris_larson@mentor.com>

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
 .../recipes-support/dnsmasq/dnsmasq_2.68.bb           |  2 ++
 .../recipes-support/dnsmasq/files/parallel-make.patch | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 meta-networking/recipes-support/dnsmasq/files/parallel-make.patch

diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.68.bb b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.68.bb
index b1bef7a..6caa92a 100644
--- a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.68.bb
+++ b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.68.bb
@@ -1,4 +1,6 @@
 require dnsmasq.inc
 
+SRC_URI += "file://parallel-make.patch"
+
 SRC_URI[dnsmasq-2.68.md5sum] = "6f8351ca0901f248efdb81532778d2ef"
 SRC_URI[dnsmasq-2.68.sha256sum] = "402019d61f53f1ccc04cc6218719fd3b158ea3fca9a83ab55471f981a2097c2f"
diff --git a/meta-networking/recipes-support/dnsmasq/files/parallel-make.patch b/meta-networking/recipes-support/dnsmasq/files/parallel-make.patch
new file mode 100644
index 0000000..6d5b722
--- /dev/null
+++ b/meta-networking/recipes-support/dnsmasq/files/parallel-make.patch
@@ -0,0 +1,19 @@
+The dnsmasq target depends on .configured and $(objs). .configured does an rm
+-f *.o. Yet the only thing telling make to build the .configured target before
+the $(objs) target was the order of the dependencies of the dnsmasq target. We
+can't rely on that order when doing a paralllel make build, so add an explicit
+rule to enforce that order.
+
+Signed-off-by: Christopher Larson <chris_larson@mentor.com>
+Upstream-status: Pending
+
+--- dnsmasq-2.68.orig/Makefile
++++ dnsmasq-2.68/Makefile
+@@ -139,6 +139,8 @@ bloatcheck : $(BUILDDIR)/dnsmasq_baselin
+	@rm -f *.o
+	@touch $@
+
++$(objs): .configured
++
+ $(objs:.o=.c) $(hdrs):
+	ln -s $(top)/$(SRC)/$@ .
-- 
1.8.3.4

[meta-oe][PATCH 4/5] dnsmasq: look for lua.pc, not lua5.1.pc

[Christopher Larson]

From: Christopher Larson <chris_larson@mentor.com>

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
 meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch | 15 +++++++++++++++
 .../dnsmasq/{files => dnsmasq}/parallel-make.patch        |  0
 meta-networking/recipes-support/dnsmasq/dnsmasq_2.68.bb   |  5 ++++-
 3 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch
 rename meta-networking/recipes-support/dnsmasq/{files => dnsmasq}/parallel-make.patch (100%)

diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch b/meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch
new file mode 100644
index 0000000..63dd71a
--- /dev/null
+++ b/meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch
@@ -0,0 +1,15 @@
+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`
+ 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 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)`\"'
diff --git a/meta-networking/recipes-support/dnsmasq/files/parallel-make.patch b/meta-networking/recipes-support/dnsmasq/dnsmasq/parallel-make.patch
similarity index 100%
rename from meta-networking/recipes-support/dnsmasq/files/parallel-make.patch
rename to meta-networking/recipes-support/dnsmasq/dnsmasq/parallel-make.patch
diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.68.bb b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.68.bb
index 6caa92a..61b94a0 100644
--- a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.68.bb
+++ b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.68.bb
@@ -1,6 +1,9 @@
 require dnsmasq.inc
 
-SRC_URI += "file://parallel-make.patch"
+SRC_URI += "\
+    file://parallel-make.patch \
+    file://lua.patch \
+"
 
 SRC_URI[dnsmasq-2.68.md5sum] = "6f8351ca0901f248efdb81532778d2ef"
 SRC_URI[dnsmasq-2.68.sha256sum] = "402019d61f53f1ccc04cc6218719fd3b158ea3fca9a83ab55471f981a2097c2f"
-- 
1.8.3.4

[meta-oe][PATCH 5/5] dnsmasq: add packageconfigs for idn, conntrack, lua

[Christopher Larson]

From: Christopher Larson <chris_larson@mentor.com>

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
 meta-networking/recipes-support/dnsmasq/dnsmasq.inc | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc b/meta-networking/recipes-support/dnsmasq/dnsmasq.inc
index 92c5367..1335245 100644
--- a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc
+++ b/meta-networking/recipes-support/dnsmasq/dnsmasq.inc
@@ -18,10 +18,16 @@ inherit pkgconfig update-rc.d systemd
 INITSCRIPT_NAME = "dnsmasq"
 INITSCRIPT_PARAMS = "defaults"
 
-PACKAGECONFIG ??= ""
-PACKAGECONFIG[dbus] = "COPTS=-DHAVE_DBUS,,dbus"
-EXTRA_OEMAKE = "${EXTRA_OECONF}"
-EXTRA_OEMAKE += "\
+PACKAGECONFIG ?= ""
+PACKAGECONFIG[dbus] = ",,dbus"
+PACKAGECONFIG[idn] = ",,libidn"
+PACKAGECONFIG[conntrack] = ",,libnetfilter-conntrack"
+PACKAGECONFIG[lua] = ",,lua"
+EXTRA_OEMAKE = "\
+    'COPTS=${@base_contains('PACKAGECONFIG', 'dbus', '-DHAVE_DBUS', '', d)} \
+           ${@base_contains('PACKAGECONFIG', 'idn', '-DHAVE_IDN', '', d)} \
+           ${@base_contains('PACKAGECONFIG', 'conntrack', '-DHAVE_CONNTRACK', '', d)} \
+           ${@base_contains('PACKAGECONFIG', 'lua', '-DHAVE_LUASCRIPT', '', d)}' \
     'CFLAGS=${CFLAGS}' \
     'LDFLAGS=${LDFLAGS}' \
 "
-- 
1.8.3.4

Re: [meta-oe][PATCH 3/5] dnsmasq: fix parallel make issue

[Martin Jansa]

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

On Sat, Aug 09, 2014 at 06:01:13PM -0700, Christopher Larson wrote:
> From: Christopher Larson <chris_larson@mentor.com>

Is this v2 of this change which was sent earlier?

commit 9550453f7d1c0773b0e5ba7af478222f55021240
Author: Shrikant Bobade <Shrikant_Bobade@mentor.com>
Date:   Mon Aug 4 14:42:57 2014 +0530

    dnsmasq: fix parallel make failure

> Signed-off-by: Christopher Larson <chris_larson@mentor.com>
> ---
>  .../recipes-support/dnsmasq/dnsmasq_2.68.bb           |  2 ++
>  .../recipes-support/dnsmasq/files/parallel-make.patch | 19 +++++++++++++++++++
>  2 files changed, 21 insertions(+)
>  create mode 100644 meta-networking/recipes-support/dnsmasq/files/parallel-make.patch
> 
> diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.68.bb b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.68.bb
> index b1bef7a..6caa92a 100644
> --- a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.68.bb
> +++ b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.68.bb
> @@ -1,4 +1,6 @@
>  require dnsmasq.inc
>  
> +SRC_URI += "file://parallel-make.patch"
> +
>  SRC_URI[dnsmasq-2.68.md5sum] = "6f8351ca0901f248efdb81532778d2ef"
>  SRC_URI[dnsmasq-2.68.sha256sum] = "402019d61f53f1ccc04cc6218719fd3b158ea3fca9a83ab55471f981a2097c2f"
> diff --git a/meta-networking/recipes-support/dnsmasq/files/parallel-make.patch b/meta-networking/recipes-support/dnsmasq/files/parallel-make.patch
> new file mode 100644
> index 0000000..6d5b722
> --- /dev/null
> +++ b/meta-networking/recipes-support/dnsmasq/files/parallel-make.patch
> @@ -0,0 +1,19 @@
> +The dnsmasq target depends on .configured and $(objs). .configured does an rm
> +-f *.o. Yet the only thing telling make to build the .configured target before
> +the $(objs) target was the order of the dependencies of the dnsmasq target. We
> +can't rely on that order when doing a paralllel make build, so add an explicit
> +rule to enforce that order.
> +
> +Signed-off-by: Christopher Larson <chris_larson@mentor.com>
> +Upstream-status: Pending
> +
> +--- dnsmasq-2.68.orig/Makefile
> ++++ dnsmasq-2.68/Makefile
> +@@ -139,6 +139,8 @@ bloatcheck : $(BUILDDIR)/dnsmasq_baselin
> +	@rm -f *.o
> +	@touch $@
> +
> ++$(objs): .configured
> ++
> + $(objs:.o=.c) $(hdrs):
> +	ln -s $(top)/$(SRC)/$@ .
> -- 
> 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 --]

Re: [meta-oe][PATCH 3/5] dnsmasq: fix parallel make issue

[Christopher Larson]

On Sun, Aug 10, 2014 at 2:24 AM, Martin Jansa <martin.jansa@gmail.com>
wrote:

> > From: Christopher Larson <chris_larson@mentor.com>
>
> Is this v2 of this change which was sent earlier?
>


They should be the same, just this one is part of a series with other
changes. Either should work fine for that particular issue.

-Chris

Re: [meta-oe][PATCH 3/5] dnsmasq: fix parallel make issue

[Martin Jansa]

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

On Sun, Aug 10, 2014 at 05:36:32PM -0700, Christopher Larson wrote:
> On Sun, Aug 10, 2014 at 2:24 AM, Martin Jansa <martin.jansa@gmail.com>
> wrote:
> 
> > > From: Christopher Larson <chris_larson@mentor.com>
> >
> > Is this v2 of this change which was sent earlier?
> >
> 
> 
> They should be the same, just this one is part of a series with other
> changes. Either should work fine for that particular issue.

There were some smaller differences (like Upstream-Status and SRC_URI
addition in .inc instead of .bb).

I've resolved them as conflicts in next patch.

Thanks

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

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

Re: [meta-oe][PATCH 3/5] dnsmasq: fix parallel make issue

[Martin Jansa]

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

On Mon, Aug 11, 2014 at 10:46:47AM +0200, Martin Jansa wrote:
> On Sun, Aug 10, 2014 at 05:36:32PM -0700, Christopher Larson wrote:
> > On Sun, Aug 10, 2014 at 2:24 AM, Martin Jansa <martin.jansa@gmail.com>
> > wrote:
> > 
> > > > From: Christopher Larson <chris_larson@mentor.com>
> > >
> > > Is this v2 of this change which was sent earlier?
> > >
> > 
> > 
> > They should be the same, just this one is part of a series with other
> > changes. Either should work fine for that particular issue.
> 
> There were some smaller differences (like Upstream-Status and SRC_URI
> addition in .inc instead of .bb).
> 
> I've resolved them as conflicts in next patch.

Hmm, maybe not correctly, can you please check what's wrong in
master-next or resend rebased v2?

NOTE: Running task 16205 of 29186 (ID: 11621, /home/jenkins/oe/world/shr-core/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.68.bb, do_patch)
NOTE: recipe dnsmasq-2.68-r0: task do_patch: Started
ERROR: Command Error: exit status: 1  Output:
Applying patch lua.patch
patching file Makefile
Hunk #1 FAILED at 57.
1 out of 1 hunk FAILED -- rejects in file Makefile
Patch lua.patch does not apply (enforce with -f)
ERROR: Function failed: patch_do_patch
ERROR: Logfile of failure stored in: /home/jenkins/oe/world/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/dnsmasq/2.68-r0/temp/log.do_patch.24548
NOTE: recipe dnsmasq-2.68-r0: task do_patch: Failed
ERROR: Task 11621 (/home/jenkins/oe/world/shr-core/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.68.bb, do_patch) failed with exit code '1'

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

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

Re: [meta-oe][PATCH 3/5] dnsmasq: fix parallel make issue

[Christopher Larson]

On Mon, Aug 11, 2014 at 1:51 AM, Martin Jansa <martin.jansa@gmail.com>
wrote:

> On Mon, Aug 11, 2014 at 10:46:47AM +0200, Martin Jansa wrote:
> > On Sun, Aug 10, 2014 at 05:36:32PM -0700, Christopher Larson wrote:
> > > On Sun, Aug 10, 2014 at 2:24 AM, Martin Jansa <martin.jansa@gmail.com>
> > > wrote:
> > >
> > > > > From: Christopher Larson <chris_larson@mentor.com>
> > > >
> > > > Is this v2 of this change which was sent earlier?
> > > >
> > >
> > >
> > > They should be the same, just this one is part of a series with other
> > > changes. Either should work fine for that particular issue.
> >
> > There were some smaller differences (like Upstream-Status and SRC_URI
> > addition in .inc instead of .bb).
> >
> > I've resolved them as conflicts in next patch.
>
> Hmm, maybe not correctly, can you please check what's wrong in
> master-next or resend rebased v2?


Hmm, will do, thanks.
-- 
Christopher Larson
clarson at kergoth dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics