dnsmasq: move parallel make patch to .bb, add upstream-status

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

(From meta-openembedded rev: a46abacebdf83cd20f421828435e0403f5f3eb8d)

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

diff --git a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq.inc b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq.inc
index 7037cb1..92c5367 100644 (file)
--- a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq.inc
+++ b/meta-openembedded/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-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.68.bb b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.68.bb
index b1bef7a..6caa92a 100644 (file)
--- a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.68.bb
+++ b/meta-openembedded/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-openembedded/meta-networking/recipes-support/dnsmasq/files/parallel-make.patch b/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/parallel-make.patch
index 3d1040c..6d5b722 100644 (file)
--- a/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/parallel-make.patch
+++ b/meta-openembedded/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