diff options
| author |   Christopher Larson <chris_larson@mentor.com> | 2014-08-11 09:12:24 -0700 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2014-08-13 23:28:03 +0200 |
| commit | a46abacebdf83cd20f421828435e0403f5f3eb8d (patch) | |
| tree | ba9e14cf2b01b9a2ac489b9911657839cc17a580 /meta-networking/recipes-support | |
| parent | e87a84abd470ce3f963a7640aee4051640c8c8b6 (diff) | |
| download | meta-openembedded-contrib-a46abacebdf83cd20f421828435e0403f5f3eb8d.tar.gz | |
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.
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-networking/recipes-support')
3 files changed, 3 insertions, 1 deletions
diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc b/meta-networking/recipes-support/dnsmasq/dnsmasq.inc index 7037cb1351..92c5367868 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 b1bef7a161..6caa92a923 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 3d1040cf3b..6d5b722eab 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 |