Various dnsmasq fixes/improvements

PATCH In review Christopher Larson 2 participants 7 messages Aug 11, 2014 – Aug 12, 2014

lore

Share & tools

lore

Christopher Larson

author

2014-08-11 16:12 UTC #0 lore raw

v2 cover Various dnsmasq fixes/improvements

From: Christopher Larson <[email protected]>

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%)

Signature · 1 line

1.8.3.4

Christopher Larson

author

2014-08-11 16:13 UTC #1 lore raw

PATCH v2 1/5 dnsmasq: add missing inherit pkgconfig

From: Christopher Larson <[email protected]>

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

Signed-off-by Christopher Larson <[email protected]>

---
 meta-networking/recipes-support/dnsmasq/dnsmasq.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

meta-networking/recipes-support/dnsmasq/dnsmasq.inc +1 -1

index 1955d6f..71a491f 100644
@@ -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"

Signature · 1 line

1.8.3.4

Christopher Larson

author

2014-08-11 16:13 UTC #2 lore raw

PATCH v2 2/5 dnsmasq: obey CFLAGS & LDFLAGS

In reply to Christopher Larson

From: Christopher Larson <[email protected]>

Signed-off-by Christopher Larson <[email protected]>

---
 meta-networking/recipes-support/dnsmasq/dnsmasq.inc | 4 ++++
 1 file changed, 4 insertions(+)

meta-networking/recipes-support/dnsmasq/dnsmasq.inc +4 -0

index 71a491f..7037cb1 100644
@@ -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

Signature · 1 line

1.8.3.4

Christopher Larson

author

2014-08-11 16:13 UTC #3 lore raw

PATCH v2 3/5 dnsmasq: move parallel make patch to .bb, add upstream-status

In reply to Christopher Larson

From: Christopher Larson <[email protected]>

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

Signed-off-by Christopher Larson <[email protected]>

---
 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(-)

meta-networking/recipes-support/dnsmasq/dnsmasq.inc +0 -1

index 7037cb1..92c5367 100644
@@ -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

meta-networking/recipes-support/dnsmasq/dnsmasq_2.68.bb +2 -0

index b1bef7a..6caa92a 100644
@@ -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"

meta-networking/recipes-support/dnsmasq/files/parallel-make.patch +1 -0

index 3d1040c..6d5b722 100644
@@ -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 <[email protected]>
+Upstream-status: Pending
 
 --- dnsmasq-2.68.orig/Makefile
 +++ dnsmasq-2.68/Makefile

Signature · 1 line

1.8.3.4

Christopher Larson

author

2014-08-11 16:13 UTC #4 lore raw

PATCH v2 4/5 dnsmasq: look for lua.pc, not lua5.1.pc

In reply to Christopher Larson

From: Christopher Larson <[email protected]>

Signed-off-by Christopher Larson <[email protected]>

---
 .../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%)

meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch new file +16 -0

new file mode 100644
index 0000000..aac7b97
@@ -0,0 +1,16 @@
+Upstream-status: Inappropriate [OE specific]
+Signed-off-by: Christopher Larson <[email protected]>
+
+--- 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)`\"'
+

meta-networking/recipes-support/dnsmasq/dnsmasq/parallel-make.patch renamed from meta-networking/recipes-support/dnsmasq/files/parallel-make.patch +0 -0

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

meta-networking/recipes-support/dnsmasq/dnsmasq_2.68.bb +4 -1

index 6caa92a..61b94a0 100644
@@ -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"

Signature · 1 line

1.8.3.4

Christopher Larson

author

2014-08-11 16:13 UTC #5 lore raw

PATCH v2 5/5 dnsmasq: add packageconfigs for idn, conntrack, lua

In reply to Christopher Larson

From: Christopher Larson <[email protected]>

Signed-off-by Christopher Larson <[email protected]>

---
 meta-networking/recipes-support/dnsmasq/dnsmasq.inc | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

meta-networking/recipes-support/dnsmasq/dnsmasq.inc +10 -4

index 92c5367..1335245 100644
@@ -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}' \
 "

Signature · 1 line

1.8.3.4

Martin Jansa

2014-08-12 11:39 UTC #6 lore raw

In reply to Christopher Larson

Quoted 11 lines · Christopher Larson

From: Christopher Larson <[email protected]>
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:

meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch +7 -6

index 63dd71a..aac7b97 100644
@@ -1,15 +1,16 @@
 Upstream-status: Inappropriate [OE specific]
 Signed-off-by: Christopher Larson <[email protected]>
 
---- 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)`\"'
+

Quoted 31 lines

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%)
Signature · 7 lines
1.8.3.4

-- 
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]