diff options
| author | leimaohui <leimaohui@cn.fujitsu.com> | 2015-08-14 13:56:57 +0800 |
|---|---|---|
| committer | Joe MacDonald <joe_macdonald@mentor.com> | 2015-09-15 10:16:27 -0400 |
| commit | 1624ca2f9f94a0b9eb76a1d37d5984d6efdda695 (patch) | |
| tree | a065539af757514f1ae9d2c432a280fec30d616b | |
| parent | fa855df1a02c92a364b6c0cfb79cef9f41af3bb0 (diff) | |
| download | meta-openembedded-1624ca2f9f94a0b9eb76a1d37d5984d6efdda695.tar.gz | |
dnsmasq: upgrade 2.72->2.75
-parallel-make.patch is not needed any more,so delete.
Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
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 6d5b722eab..0000000000 --- a/meta-networking/recipes-support/dnsmasq/dnsmasq/parallel-make.patch +++ /dev/null | |||
| @@ -1,19 +0,0 @@ | |||
| 1 | The 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 | ||
| 3 | the $(objs) target was the order of the dependencies of the dnsmasq target. We | ||
| 4 | can't rely on that order when doing a paralllel make build, so add an explicit | ||
| 5 | rule to enforce that order. | ||
| 6 | |||
| 7 | Signed-off-by: Christopher Larson <chris_larson@mentor.com> | ||
| 8 | Upstream-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 bd5919492e..0000000000 --- a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.72.bb +++ /dev/null | |||
| @@ -1,10 +0,0 @@ | |||
| 1 | require dnsmasq.inc | ||
| 2 | |||
| 3 | SRC_URI += "\ | ||
| 4 | file://parallel-make.patch \ | ||
| 5 | file://lua.patch \ | ||
| 6 | " | ||
| 7 | |||
| 8 | SRC_URI[dnsmasq-2.72.md5sum] = "cf82f81cf09ad3d47612985012240483" | ||
| 9 | SRC_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 0000000000..a11aabbd94 --- /dev/null +++ b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.75.bb | |||
| @@ -0,0 +1,9 @@ | |||
| 1 | require dnsmasq.inc | ||
| 2 | |||
| 3 | SRC_URI += "\ | ||
| 4 | file://lua.patch \ | ||
| 5 | " | ||
| 6 | |||
| 7 | SRC_URI[dnsmasq-2.75.md5sum] = "d99ac126d4fe910c679d88430559669b" | ||
| 8 | SRC_URI[dnsmasq-2.75.sha256sum] = "f8252c0a0ba162c2cd45f81140c7c17cc40a5fca2b869d1a420835b74acad294" | ||
| 9 | |||
