diff options
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 7037cb135..92c536786 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 | |||
11 | file://init \ | 11 | file://init \ |
12 | file://dnsmasq.conf \ | 12 | file://dnsmasq.conf \ |
13 | file://dnsmasq.service \ | 13 | file://dnsmasq.service \ |
14 | file://parallel-make.patch \ | ||
15 | " | 14 | " |
16 | 15 | ||
17 | inherit pkgconfig update-rc.d systemd | 16 | 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 b1bef7a16..6caa92a92 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 @@ | |||
1 | require dnsmasq.inc | 1 | require dnsmasq.inc |
2 | 2 | ||
3 | SRC_URI += "file://parallel-make.patch" | ||
4 | |||
3 | SRC_URI[dnsmasq-2.68.md5sum] = "6f8351ca0901f248efdb81532778d2ef" | 5 | SRC_URI[dnsmasq-2.68.md5sum] = "6f8351ca0901f248efdb81532778d2ef" |
4 | SRC_URI[dnsmasq-2.68.sha256sum] = "402019d61f53f1ccc04cc6218719fd3b158ea3fca9a83ab55471f981a2097c2f" | 6 | 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 3d1040cf3..6d5b722ea 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 | |||
5 | rule to enforce that order. | 5 | rule to enforce that order. |
6 | 6 | ||
7 | Signed-off-by: Christopher Larson <chris_larson@mentor.com> | 7 | Signed-off-by: Christopher Larson <chris_larson@mentor.com> |
8 | Upstream-status: Pending | ||
8 | 9 | ||
9 | --- dnsmasq-2.68.orig/Makefile | 10 | --- dnsmasq-2.68.orig/Makefile |
10 | +++ dnsmasq-2.68/Makefile | 11 | +++ dnsmasq-2.68/Makefile |