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

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

[Christopher Larson]

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:

  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

[meta-oe][PATCH v2 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 1955d6f..71a491f 100644
--- a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc
+++ b/meta-networking/recipes-support/dnsmasq/dnsmasq.inc
@@ -14,7 +14,7 @@ SRC_URI = "http://www.thekelleys.org.uk/dnsmasq/${@['archive/', ''][float(d.getV
            file://parallel-make.patch \
 "
 
-inherit update-rc.d systemd
+inherit pkgconfig update-rc.d systemd
 
 INITSCRIPT_NAME = "dnsmasq"
 INITSCRIPT_PARAMS = "defaults"
-- 
1.8.3.4

[meta-oe][PATCH v2 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 71a491f..7037cb1 100644
--- a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc
+++ b/meta-networking/recipes-support/dnsmasq/dnsmasq.inc
@@ -22,6 +22,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 v2 3/5] dnsmasq: move parallel make patch to .bb, add upstream-status

[Christopher Larson]

From: Christopher Larson <chris_larson@mentor.com>

Patches really belong in the recipe, not the .inc, given patches are generally
version-bound.

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
 meta-networking/recipes-support/dnsmasq/dnsmasq.inc               | 1 -
 meta-networking/recipes-support/dnsmasq/dnsmasq_2.68.bb           | 2 ++
 meta-networking/recipes-support/dnsmasq/files/parallel-make.patch | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc b/meta-networking/recipes-support/dnsmasq/dnsmasq.inc
index 7037cb1..92c5367 100644
--- a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc
+++ b/meta-networking/recipes-support/dnsmasq/dnsmasq.inc
@@ -11,7 +11,6 @@ SRC_URI = "http://www.thekelleys.org.uk/dnsmasq/${@['archive/', ''][float(d.getV
            file://init \
            file://dnsmasq.conf \
            file://dnsmasq.service \
-           file://parallel-make.patch \
 "
 
 inherit pkgconfig update-rc.d systemd
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
index 3d1040c..6d5b722 100644
--- a/meta-networking/recipes-support/dnsmasq/files/parallel-make.patch
+++ b/meta-networking/recipes-support/dnsmasq/files/parallel-make.patch
@@ -5,6 +5,7 @@ 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
-- 
1.8.3.4

[meta-oe][PATCH v2 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>
---
 .../recipes-support/dnsmasq/dnsmasq/lua.patch            | 16 ++++++++++++++++
 .../dnsmasq/{files => dnsmasq}/parallel-make.patch       |  0
 meta-networking/recipes-support/dnsmasq/dnsmasq_2.68.bb  |  5 ++++-
 3 files changed, 20 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..aac7b97
--- /dev/null
+++ b/meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch
@@ -0,0 +1,16 @@
+Upstream-status: Inappropriate [OE specific]
+Signed-off-by: Christopher Larson <chris_larson@mentor.com>
+
+--- 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 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 v2 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 v2 0/5] Various dnsmasq fixes/improvements

[Martin Jansa]

[-- 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 --]