Various dnsmasq fixes/improvements

PATCH Superseded Christopher Larson 4 participants 11 messages Aug 10, 2014 – Aug 11, 2014

lore

Share & tools

lore

Christopher Larson

author

2014-08-10 01:03 UTC #0 lore raw

cover Various dnsmasq fixes/improvements

From: Christopher Larson <[email protected]>

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:

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

Signature · 1 line

1.8.3.4

Christopher Larson

author

2014-08-10 01:03 UTC #1 lore raw

PATCH 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 e57ab72..fd5793a 100644
@@ -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"

Signature · 1 line

1.8.3.4

Christopher Larson

author

2014-08-10 01:03 UTC #2 lore raw

PATCH 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 fd5793a..92c5367 100644
@@ -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

Signature · 1 line

1.8.3.4

Christopher Larson

author

2014-08-10 01:03 UTC #3 lore raw

PATCH 3/5 dnsmasq: fix parallel make issue

In reply to Christopher Larson

From: Christopher Larson <[email protected]>

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

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

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 new file +19 -0

new file mode 100644
index 0000000..6d5b722
@@ -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 <[email protected]>
+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)/$@ .

Signature · 1 line

1.8.3.4

Martin Jansa

2014-08-10 09:23 UTC #4 lore raw

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

Quoted 1 line · Christopher Larson

From: Christopher Larson <[email protected]>

Is this v2 of this change which was sent earlier?

commit 9550453f7d1c0773b0e5ba7af478222f55021240

Author: Shrikant Bobade <[email protected]>
Date:   Mon Aug 4 14:42:57 2014 +0530

dnsmasq: fix parallel make failure

Quoted 51 lines

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

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

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 new file +19 -0

new file mode 100644
index 0000000..6d5b722
@@ -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 <[email protected]>
+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)/$@ .

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]

Christopher Larson

2014-08-11 00:36 UTC #5 lore raw

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

Quoted 4 lines · Martin Jansa

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

Martin Jansa

2014-08-11 08:46 UTC #6 lore raw

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

Quoted 11 lines · Christopher Larson

Quoted 4 lines · Martin Jansa
Quoted 1 line
From: Christopher Larson <[email protected]>
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

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Martin Jansa

2014-08-11 08:51 UTC #7 lore raw

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

Quoted 10 lines · Martin Jansa

Quoted 9 lines · Christopher Larson
Quoted 4 lines · Martin Jansa
Quoted 1 line
From: Christopher Larson <[email protected]>
Is this v2 of this change which was sent earlier?

Quoted 7 lines

Quoted 2 lines
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'

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Christopher Larson

2014-08-11 15:54 UTC #8 lore raw

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

Quoted 14 lines · Martin Jansa

Quoted 13 lines · Martin Jansa
Quoted 11 lines · Christopher Larson
Quoted 4 lines · Martin Jansa
Quoted 1 line
From: Christopher Larson <[email protected]>
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.

Quoted 7 lines

Quoted 4 lines
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.

Signature · 5 lines

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

Christopher Larson

author

2014-08-10 01:03 UTC #9 lore raw

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

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

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

new file mode 100644
index 0000000..63dd71a
@@ -0,0 +1,15 @@
+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`
+ 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-10 01:03 UTC #10 lore raw

PATCH 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