merged.

Bruce

On Fri, Aug 7, 2015 at 5:40 AM, Li xin <[email protected]> wrote:
> Dropped 0001-Dont-compile-extensions.patch, it is not needed anymore.
>
> Signed-off-by: Li Xin <[email protected]>
> ---
>  .../ruby/json/0001-Dont-compile-extensions.patch     | 20 
> --------------------
>  meta-openstack/recipes-devtools/ruby/json_git.bb     |  5 ++---
>  2 files changed, 2 insertions(+), 23 deletions(-)
>  delete mode 100644 
> meta-openstack/recipes-devtools/ruby/json/0001-Dont-compile-extensions.patch
>
> diff --git 
> a/meta-openstack/recipes-devtools/ruby/json/0001-Dont-compile-extensions.patch
>  
> b/meta-openstack/recipes-devtools/ruby/json/0001-Dont-compile-extensions.patch
> deleted file mode 100644
> index 0c2f513..0000000
> --- 
> a/meta-openstack/recipes-devtools/ruby/json/0001-Dont-compile-extensions.patch
> +++ /dev/null
> @@ -1,20 +0,0 @@
> -From 8c6e4b688cc7feade17caa832f9304262025fd17 Mon Sep 17 00:00:00 2001
> -From: Qian Lei <[email protected]>
> -Date: Tue, 27 Jan 2015 19:34:26 +0800
> -Subject: [PATCH] Dont compile extensions
> -
> -Signed-off-by: Qian Lei <[email protected]>
> ----
> - json.gemspec | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/json.gemspec b/json.gemspec
> -index 75926b1..af7e9ca 100644
> ---- a/json.gemspec
> -+++ b/json.gemspec
> -@@ -13 +13 @@ Gem::Specification.new do |s|
> --  s.extensions = ["ext/json/ext/generator/extconf.rb", 
> "ext/json/ext/parser/extconf.rb"]
> -+#  s.extensions = ["ext/json/ext/generator/extconf.rb", 
> "ext/json/ext/parser/extconf.rb"]
> ---
> -1.8.3.1
> -
> diff --git a/meta-openstack/recipes-devtools/ruby/json_git.bb 
> b/meta-openstack/recipes-devtools/ruby/json_git.bb
> index f738ece..a417798 100644
> --- a/meta-openstack/recipes-devtools/ruby/json_git.bb
> +++ b/meta-openstack/recipes-devtools/ruby/json_git.bb
> @@ -9,15 +9,14 @@ LIC_FILES_CHKSUM = 
> "file://COPYING;md5=aef161fe3c86f1a8d6c71d3b8c5655c5"
>
>  PR = "r0"
>
> -BPV = "1.8.1"
> +BPV = "1.8.3"
>  PV = "${BPV}"
> -SRCREV = "92a96dea2b24b9c68856004d69491f46aedd0925"
> +SRCREV = "db4c71a7701b95c30f945ee1536240920dcfdc17"
>
>  S = "${WORKDIR}/git"
>
>  SRC_URI = " \
>      git://github.com/flori/json.git \
> -    file://0001-Dont-compile-extensions.patch \
>      "
>
>  inherit ruby
> --
> 1.8.4.2
>
> --
> _______________________________________________
> meta-virtualization mailing list
> [email protected]
> https://lists.yoctoproject.org/listinfo/meta-virtualization



-- 
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"
-- 
_______________________________________________
meta-virtualization mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/meta-virtualization

Reply via email to