[oe] [meta-oe][PATCH] dnsmasq: upgrade 2.72->2.75

[Lei, Maohui]

Hi

Excuse me. This patch has been in master-next for a long time. Why not been merged into master?


Cheers
Lei



> -----Original Message-----
> From: Lei, Maohui 
> Sent: Friday, August 14, 2015 1:57 PM
> To: openembedded-devel at lists.openembedded.org
> Cc: Lei, Maohui 
> Subject: [oe] [meta-oe][PATCH] dnsmasq: upgrade 2.72->2.75
> 
> -parallel-make.patch is not needed any more,so delete.
> 
> Signed-off-by: Lei Maohui <leimaohui at cn.fujitsu.com>
> ---
>  .../dnsmasq/dnsmasq/parallel-make.patch               | 19 -------------------
>  .../recipes-support/dnsmasq/dnsmasq_2.72.bb           | 10 ----------
>  .../recipes-support/dnsmasq/dnsmasq_2.75.bb           |  9 +++++++++
>  3 files changed, 9 insertions(+), 29 deletions(-)  delete mode 100644
> meta-networking/recipes-support/dnsmasq/dnsmasq/parallel-make.patch
>  delete mode 100644 meta-networking/recipes-support/dnsmasq/dnsmasq_2.72.bb
>  create mode 100644 meta-networking/recipes-support/dnsmasq/dnsmasq_2.75.bb
> 
> 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 6d5b722..0000000
> --- a/meta-networking/recipes-support/dnsmasq/dnsmasq/parallel-make.patch
> +++ /dev/null
> @@ -1,19 +0,0 @@
> -The dnsmasq target depends on .configured and $(objs). .configured does an rm --f *.o.
> Yet the only thing telling make to build the .configured target before -the $(objs) target
> was the order of the dependencies of the dnsmasq target. We -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 at mentor.com>
> -Upstream-status: Pending
> -
> ---- dnsmasq-2.68.orig/Makefile
> -+++ dnsmasq-2.68/Makefile
> -@@ -139,6 +139,8 @@ bloatcheck : $(BUILDDIR)/dnsmasq_baselin
> -	@rm -f *.o
> -	@touch $@
> -
> -+$(objs): .configured
> -+
> - $(objs:.o=.c) $(hdrs):
> -	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 bd59194..0000000
> --- a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.72.bb
> +++ /dev/null
> @@ -1,10 +0,0 @@
> -require dnsmasq.inc
> -
> -SRC_URI += "\
> -    file://parallel-make.patch \
> -    file://lua.patch \
> -"
> -
> -SRC_URI[dnsmasq-2.72.md5sum] = "cf82f81cf09ad3d47612985012240483"
> -SRC_URI[dnsmasq-2.72.sha256sum] =
> "635f1b47417d17cf32e45cfcfd0213ac39fd09918479a25373ba9b2ce4adc05d"
> -
> 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 0000000..a11aabb
> --- /dev/null
> +++ b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.75.bb
> @@ -0,0 +1,9 @@
> +require dnsmasq.inc
> +
> +SRC_URI += "\
> +    file://lua.patch \
> +"
> +
> +SRC_URI[dnsmasq-2.75.md5sum] = "d99ac126d4fe910c679d88430559669b"
> +SRC_URI[dnsmasq-2.75.sha256sum] =
> "f8252c0a0ba162c2cd45f81140c7c17cc40a5fca2b869d1a420835b74acad294"
> +
> --
> 1.8.4.2