summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-networking/recipes-support/dnsmasq/dnsmasq/parallel-make.patch19
-rw-r--r--meta-networking/recipes-support/dnsmasq/dnsmasq_2.72.bb10
-rw-r--r--meta-networking/recipes-support/dnsmasq/dnsmasq_2.75.bb9
3 files changed, 9 insertions, 29 deletions
diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq/parallel-make.patch b/meta-networking/recipes-support/dnsmasq/dnsmasq/parallel-make.patch
deleted file mode 100644
index 6d5b722ea..000000000
--- a/meta-networking/recipes-support/dnsmasq/dnsmasq/parallel-make.patch
+++ /dev/null
@@ -1,19 +0,0 @@
1The dnsmasq target depends on .configured and $(objs). .configured does an rm
2-f *.o. Yet the only thing telling make to build the .configured target before
3the $(objs) target was the order of the dependencies of the dnsmasq target. We
4can't rely on that order when doing a paralllel make build, so add an explicit
5rule to enforce that order.
6
7Signed-off-by: Christopher Larson <chris_larson@mentor.com>
8Upstream-status: Pending
9
10--- dnsmasq-2.68.orig/Makefile
11+++ dnsmasq-2.68/Makefile
12@@ -139,6 +139,8 @@ bloatcheck : $(BUILDDIR)/dnsmasq_baselin
13 @rm -f *.o
14 @touch $@
15
16+$(objs): .configured
17+
18 $(objs:.o=.c) $(hdrs):
19 ln -s $(top)/$(SRC)/$@ .
diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.72.bb b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.72.bb
deleted file mode 100644
index bd5919492..000000000
--- a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.72.bb
+++ /dev/null
@@ -1,10 +0,0 @@
1require dnsmasq.inc
2
3SRC_URI += "\
4 file://parallel-make.patch \
5 file://lua.patch \
6"
7
8SRC_URI[dnsmasq-2.72.md5sum] = "cf82f81cf09ad3d47612985012240483"
9SRC_URI[dnsmasq-2.72.sha256sum] = "635f1b47417d17cf32e45cfcfd0213ac39fd09918479a25373ba9b2ce4adc05d"
10
diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.75.bb b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.75.bb
new file mode 100644
index 000000000..a11aabbd9
--- /dev/null
+++ b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.75.bb
@@ -0,0 +1,9 @@
1require dnsmasq.inc
2
3SRC_URI += "\
4 file://lua.patch \
5"
6
7SRC_URI[dnsmasq-2.75.md5sum] = "d99ac126d4fe910c679d88430559669b"
8SRC_URI[dnsmasq-2.75.sha256sum] = "f8252c0a0ba162c2cd45f81140c7c17cc40a5fca2b869d1a420835b74acad294"
9