All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 0/3] Small correction for the previous pathces
@ 2015-02-13 10:35 Tudor Florea
  2015-02-13 10:35 ` [PATCH 1/3] json: make the previous patch really apply Tudor Florea
                   ` (3 more replies)
  0 siblings, 4 replies; 8+ messages in thread
From: Tudor Florea @ 2015-02-13 10:35 UTC (permalink / raw)
  To: meta-virtualization

This is to really apply previous couple of patches for yajl-ruby and json.
Also remove a patch for iproute2 as the code is already applied.

Tudor Florea (3):
  json: make the previous patch really apply
  yajl-ruby: make the previous patch really apply
  iproute2: remove patch already applied

 meta-openstack/recipes-devtools/ruby/json_git.bb   |  2 +-
 .../recipes-devtools/ruby/yajl-ruby_git.bb         |  2 +-
 ...003-Don-t-enforce-that-dev-already-exists.patch | 27 ----------------------
 .../iproute2/iproute2_3.16.0.bbappend              |  2 --
 4 files changed, 2 insertions(+), 31 deletions(-)
 delete mode 100644 meta-openstack/recipes-support/iproute2/iproute2/0003-Don-t-enforce-that-dev-already-exists.patch

-- 
1.9.1



^ permalink raw reply	[flat|nested] 8+ messages in thread
* [PATCH 1/3] json: make the previous patch really apply
  2015-02-13 10:35 [PATCH 0/3] Small correction for the previous pathces Tudor Florea
@ 2015-02-13 10:35 ` Tudor Florea
  2015-02-13 10:35 ` [PATCH 2/3] yajl-ruby: " Tudor Florea
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 8+ messages in thread
From: Tudor Florea @ 2015-02-13 10:35 UTC (permalink / raw)
  To: meta-virtualization

Change to get the patch 0001-Dont-compile-extensions.patch applied.

Signed-off-by: Tudor Florea <tudor.florea@enea.com>
---
 meta-openstack/recipes-devtools/ruby/json_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-openstack/recipes-devtools/ruby/json_git.bb b/meta-openstack/recipes-devtools/ruby/json_git.bb
index a852500..f738ece 100644
--- a/meta-openstack/recipes-devtools/ruby/json_git.bb
+++ b/meta-openstack/recipes-devtools/ruby/json_git.bb
@@ -17,9 +17,9 @@ S = "${WORKDIR}/git"
 
 SRC_URI = " \
     git://github.com/flori/json.git \
+    file://0001-Dont-compile-extensions.patch \
     "
 
 inherit ruby
 
 BBCLASSEXTEND = "native"
-    file://0001-Dont-compile-extensions.patch \
-- 
1.9.1



^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [PATCH 2/3] yajl-ruby: make the previous patch really apply
  2015-02-13 10:35 [PATCH 0/3] Small correction for the previous pathces Tudor Florea
  2015-02-13 10:35 ` [PATCH 1/3] json: make the previous patch really apply Tudor Florea
@ 2015-02-13 10:35 ` Tudor Florea
  2015-02-13 10:35 ` [PATCH 3/3] iproute2: remove patch already applied Tudor Florea
  2015-02-17  4:50 ` [PATCH 0/3] Small correction for the previous pathces Bruce Ashfield
  3 siblings, 0 replies; 8+ messages in thread
From: Tudor Florea @ 2015-02-13 10:35 UTC (permalink / raw)
  To: meta-virtualization

Change to get the patch 0001-Dont-compile-extensions.patch applied.

Signed-off-by: Tudor Florea <tudor.florea@enea.com>
---
 meta-openstack/recipes-devtools/ruby/yajl-ruby_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-openstack/recipes-devtools/ruby/yajl-ruby_git.bb b/meta-openstack/recipes-devtools/ruby/yajl-ruby_git.bb
index 9531142..ecc8d43 100644
--- a/meta-openstack/recipes-devtools/ruby/yajl-ruby_git.bb
+++ b/meta-openstack/recipes-devtools/ruby/yajl-ruby_git.bb
@@ -18,9 +18,9 @@ S = "${WORKDIR}/git"
 
 SRC_URI = " \
     git://github.com/brianmario/yajl-ruby.git \
+    file://0001-Don-t-compile-extensions.patch \
     "
 
 inherit ruby
 
 BBCLASSEXTEND = "native"
-    file://0001-Don-t-compile-extensions.patch \
-- 
1.9.1



^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [PATCH 3/3] iproute2: remove patch already applied
  2015-02-13 10:35 [PATCH 0/3] Small correction for the previous pathces Tudor Florea
  2015-02-13 10:35 ` [PATCH 1/3] json: make the previous patch really apply Tudor Florea
  2015-02-13 10:35 ` [PATCH 2/3] yajl-ruby: " Tudor Florea
@ 2015-02-13 10:35 ` Tudor Florea
  2015-02-17  4:52   ` Bruce Ashfield
  2015-02-17  4:50 ` [PATCH 0/3] Small correction for the previous pathces Bruce Ashfield
  3 siblings, 1 reply; 8+ messages in thread
From: Tudor Florea @ 2015-02-13 10:35 UTC (permalink / raw)
  To: meta-virtualization

Remove the patch 0003-Don-t-enforce-that-dev-already-exists.patch
as the code is already applied.

Signed-off-by: Tudor Florea <tudor.florea@enea.com>
---
 ...003-Don-t-enforce-that-dev-already-exists.patch | 27 ----------------------
 .../iproute2/iproute2_3.16.0.bbappend              |  2 --
 2 files changed, 29 deletions(-)
 delete mode 100644 meta-openstack/recipes-support/iproute2/iproute2/0003-Don-t-enforce-that-dev-already-exists.patch

diff --git a/meta-openstack/recipes-support/iproute2/iproute2/0003-Don-t-enforce-that-dev-already-exists.patch b/meta-openstack/recipes-support/iproute2/iproute2/0003-Don-t-enforce-that-dev-already-exists.patch
deleted file mode 100644
index b296abe..0000000
--- a/meta-openstack/recipes-support/iproute2/iproute2/0003-Don-t-enforce-that-dev-already-exists.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 4a5577fab7490573ceaafa6e4417cf03bca178f1 Mon Sep 17 00:00:00 2001
-Message-Id: <4a5577fab7490573ceaafa6e4417cf03bca178f1.1407786415.git.agx@sigxcpu.org>
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
-Date: Mon, 11 Aug 2014 21:41:51 +0200
-Subject: [PATCH] Don't enforce that dev already exists
-
-Commit 9a02651a87d0fd56e2e7eedd63921a050a42b3ec tried to make sure
-the device can be looked up but that e.g. isn't true for
-
-  ip link add vnet10 type veth peer name vnet11
-
-where vnet10 isn't yet existent.
----
- ip/iplink.c | 2 --
- 1 file changed, 2 deletions(-)
-
---- a/ip/iplink.c
-+++ b/ip/iplink.c
-@@ -571,8 +571,6 @@ int iplink_parse(int argc, char **argv,
- 				duparg2("dev", *argv);
- 			*dev = *argv;
- 			dev_index = ll_name_to_index(*dev);
--			if (dev_index == 0)
--				invarg("Unknown device", *argv);
- 		}
- 		argc--; argv++;
- 	}
diff --git a/meta-openstack/recipes-support/iproute2/iproute2_3.16.0.bbappend b/meta-openstack/recipes-support/iproute2/iproute2_3.16.0.bbappend
index 8949646..2fde00d 100644
--- a/meta-openstack/recipes-support/iproute2/iproute2_3.16.0.bbappend
+++ b/meta-openstack/recipes-support/iproute2/iproute2_3.16.0.bbappend
@@ -2,5 +2,3 @@ FILESEXTRAPATHS_append := "${THISDIR}/${PN}"
 
 RRECOMMENDS_${PN} += "kernel-module-veth \
 	"
-
-SRC_URI += " file://0003-Don-t-enforce-that-dev-already-exists.patch"
-- 
1.9.1



^ permalink raw reply related	[flat|nested] 8+ messages in thread
* Re: [PATCH 0/3] Small correction for the previous pathces
  2015-02-13 10:35 [PATCH 0/3] Small correction for the previous pathces Tudor Florea
                   ` (2 preceding siblings ...)
  2015-02-13 10:35 ` [PATCH 3/3] iproute2: remove patch already applied Tudor Florea
@ 2015-02-17  4:50 ` Bruce Ashfield
  3 siblings, 0 replies; 8+ messages in thread
From: Bruce Ashfield @ 2015-02-17  4:50 UTC (permalink / raw)
  To: Tudor Florea; +Cc: meta-virtualization

Argh. I had fixed these locally, but didn't push the changes.

Sorry for the breakage. I've rebased and pushed my changes now.

Bruce

On Fri, Feb 13, 2015 at 5:35 AM, Tudor Florea <tudor.florea@enea.com> wrote:
> This is to really apply previous couple of patches for yajl-ruby and json.
> Also remove a patch for iproute2 as the code is already applied.
>
> Tudor Florea (3):
>   json: make the previous patch really apply
>   yajl-ruby: make the previous patch really apply
>   iproute2: remove patch already applied
>
>  meta-openstack/recipes-devtools/ruby/json_git.bb   |  2 +-
>  .../recipes-devtools/ruby/yajl-ruby_git.bb         |  2 +-
>  ...003-Don-t-enforce-that-dev-already-exists.patch | 27 ----------------------
>  .../iproute2/iproute2_3.16.0.bbappend              |  2 --
>  4 files changed, 2 insertions(+), 31 deletions(-)
>  delete mode 100644 meta-openstack/recipes-support/iproute2/iproute2/0003-Don-t-enforce-that-dev-already-exists.patch
>
> --
> 1.9.1
>
> --
> _______________________________________________
> meta-virtualization mailing list
> meta-virtualization@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-virtualization



-- 
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"


^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [PATCH 3/3] iproute2: remove patch already applied
  2015-02-13 10:35 ` [PATCH 3/3] iproute2: remove patch already applied Tudor Florea
@ 2015-02-17  4:52   ` Bruce Ashfield
  2015-02-17 19:09     ` [PATCH v2 1/1] " Tudor Florea
  0 siblings, 1 reply; 8+ messages in thread
From: Bruce Ashfield @ 2015-02-17  4:52 UTC (permalink / raw)
  To: Tudor Florea; +Cc: meta-virtualization

On Fri, Feb 13, 2015 at 5:35 AM, Tudor Florea <tudor.florea@enea.com> wrote:
> Remove the patch 0003-Don-t-enforce-that-dev-already-exists.patch
> as the code is already applied.

We should be documenting the meta-oe, or upstream commit ID that made this
local bbappend no longer required.

Since the revisions of meta-openstack and meta-oe float, and are different for
everyone .. this is critical information.

So can we get the patch header updated with that information ?

Bruce

>
> Signed-off-by: Tudor Florea <tudor.florea@enea.com>
> ---
>  ...003-Don-t-enforce-that-dev-already-exists.patch | 27 ----------------------
>  .../iproute2/iproute2_3.16.0.bbappend              |  2 --
>  2 files changed, 29 deletions(-)
>  delete mode 100644 meta-openstack/recipes-support/iproute2/iproute2/0003-Don-t-enforce-that-dev-already-exists.patch
>
> diff --git a/meta-openstack/recipes-support/iproute2/iproute2/0003-Don-t-enforce-that-dev-already-exists.patch b/meta-openstack/recipes-support/iproute2/iproute2/0003-Don-t-enforce-that-dev-already-exists.patch
> deleted file mode 100644
> index b296abe..0000000
> --- a/meta-openstack/recipes-support/iproute2/iproute2/0003-Don-t-enforce-that-dev-already-exists.patch
> +++ /dev/null
> @@ -1,27 +0,0 @@
> -From 4a5577fab7490573ceaafa6e4417cf03bca178f1 Mon Sep 17 00:00:00 2001
> -Message-Id: <4a5577fab7490573ceaafa6e4417cf03bca178f1.1407786415.git.agx@sigxcpu.org>
> -From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
> -Date: Mon, 11 Aug 2014 21:41:51 +0200
> -Subject: [PATCH] Don't enforce that dev already exists
> -
> -Commit 9a02651a87d0fd56e2e7eedd63921a050a42b3ec tried to make sure
> -the device can be looked up but that e.g. isn't true for
> -
> -  ip link add vnet10 type veth peer name vnet11
> -
> -where vnet10 isn't yet existent.
> ----
> - ip/iplink.c | 2 --
> - 1 file changed, 2 deletions(-)
> -
> ---- a/ip/iplink.c
> -+++ b/ip/iplink.c
> -@@ -571,8 +571,6 @@ int iplink_parse(int argc, char **argv,
> -                               duparg2("dev", *argv);
> -                       *dev = *argv;
> -                       dev_index = ll_name_to_index(*dev);
> --                      if (dev_index == 0)
> --                              invarg("Unknown device", *argv);
> -               }
> -               argc--; argv++;
> -       }
> diff --git a/meta-openstack/recipes-support/iproute2/iproute2_3.16.0.bbappend b/meta-openstack/recipes-support/iproute2/iproute2_3.16.0.bbappend
> index 8949646..2fde00d 100644
> --- a/meta-openstack/recipes-support/iproute2/iproute2_3.16.0.bbappend
> +++ b/meta-openstack/recipes-support/iproute2/iproute2_3.16.0.bbappend
> @@ -2,5 +2,3 @@ FILESEXTRAPATHS_append := "${THISDIR}/${PN}"
>
>  RRECOMMENDS_${PN} += "kernel-module-veth \
>         "
> -
> -SRC_URI += " file://0003-Don-t-enforce-that-dev-already-exists.patch"
> --
> 1.9.1
>
> --
> _______________________________________________
> meta-virtualization mailing list
> meta-virtualization@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-virtualization



-- 
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"


^ permalink raw reply	[flat|nested] 8+ messages in thread
* [PATCH v2 1/1] iproute2: remove patch already applied
  2015-02-17  4:52   ` Bruce Ashfield
@ 2015-02-17 19:09     ` Tudor Florea
  2015-02-21  3:13       ` Bruce Ashfield
  0 siblings, 1 reply; 8+ messages in thread
From: Tudor Florea @ 2015-02-17 19:09 UTC (permalink / raw)
  To: meta-virtualization

Remove the patch 0003-Don-t-enforce-that-dev-already-exists.patch
as the similar patch exist in poky git repo added by
commit 673bb3cffc1fdedb7c25178233c8699650194545
Author: Roy.Li <rongqing.li@windriver.com>
Date:   Wed Oct 29 14:01:07 2014 +0800

Signed-off-by: Tudor Florea <tudor.florea@enea.com>
---
 ...003-Don-t-enforce-that-dev-already-exists.patch | 27 ----------------------
 .../iproute2/iproute2_3.16.0.bbappend              |  2 --
 2 files changed, 29 deletions(-)
 delete mode 100644 meta-openstack/recipes-support/iproute2/iproute2/0003-Don-t-enforce-that-dev-already-exists.patch

diff --git a/meta-openstack/recipes-support/iproute2/iproute2/0003-Don-t-enforce-that-dev-already-exists.patch b/meta-openstack/recipes-support/iproute2/iproute2/0003-Don-t-enforce-that-dev-already-exists.patch
deleted file mode 100644
index b296abe..0000000
--- a/meta-openstack/recipes-support/iproute2/iproute2/0003-Don-t-enforce-that-dev-already-exists.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 4a5577fab7490573ceaafa6e4417cf03bca178f1 Mon Sep 17 00:00:00 2001
-Message-Id: <4a5577fab7490573ceaafa6e4417cf03bca178f1.1407786415.git.agx@sigxcpu.org>
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
-Date: Mon, 11 Aug 2014 21:41:51 +0200
-Subject: [PATCH] Don't enforce that dev already exists
-
-Commit 9a02651a87d0fd56e2e7eedd63921a050a42b3ec tried to make sure
-the device can be looked up but that e.g. isn't true for
-
-  ip link add vnet10 type veth peer name vnet11
-
-where vnet10 isn't yet existent.
----
- ip/iplink.c | 2 --
- 1 file changed, 2 deletions(-)
-
---- a/ip/iplink.c
-+++ b/ip/iplink.c
-@@ -571,8 +571,6 @@ int iplink_parse(int argc, char **argv,
- 				duparg2("dev", *argv);
- 			*dev = *argv;
- 			dev_index = ll_name_to_index(*dev);
--			if (dev_index == 0)
--				invarg("Unknown device", *argv);
- 		}
- 		argc--; argv++;
- 	}
diff --git a/meta-openstack/recipes-support/iproute2/iproute2_3.16.0.bbappend b/meta-openstack/recipes-support/iproute2/iproute2_3.16.0.bbappend
index 8949646..2fde00d 100644
--- a/meta-openstack/recipes-support/iproute2/iproute2_3.16.0.bbappend
+++ b/meta-openstack/recipes-support/iproute2/iproute2_3.16.0.bbappend
@@ -2,5 +2,3 @@ FILESEXTRAPATHS_append := "${THISDIR}/${PN}"
 
 RRECOMMENDS_${PN} += "kernel-module-veth \
 	"
-
-SRC_URI += " file://0003-Don-t-enforce-that-dev-already-exists.patch"
-- 
1.9.1



^ permalink raw reply related	[flat|nested] 8+ messages in thread
* Re: [PATCH v2 1/1] iproute2: remove patch already applied
  2015-02-17 19:09     ` [PATCH v2 1/1] " Tudor Florea
@ 2015-02-21  3:13       ` Bruce Ashfield
  0 siblings, 0 replies; 8+ messages in thread
From: Bruce Ashfield @ 2015-02-21  3:13 UTC (permalink / raw)
  To: Tudor Florea; +Cc: meta-virtualization

Thanks. I've applied this patch, and will push it once build testing has
completed.

Bruce

On Tue, Feb 17, 2015 at 2:09 PM, Tudor Florea <tudor.florea@enea.com> wrote:
> Remove the patch 0003-Don-t-enforce-that-dev-already-exists.patch
> as the similar patch exist in poky git repo added by
> commit 673bb3cffc1fdedb7c25178233c8699650194545
> Author: Roy.Li <rongqing.li@windriver.com>
> Date:   Wed Oct 29 14:01:07 2014 +0800
>
> Signed-off-by: Tudor Florea <tudor.florea@enea.com>
> ---
>  ...003-Don-t-enforce-that-dev-already-exists.patch | 27 ----------------------
>  .../iproute2/iproute2_3.16.0.bbappend              |  2 --
>  2 files changed, 29 deletions(-)
>  delete mode 100644 meta-openstack/recipes-support/iproute2/iproute2/0003-Don-t-enforce-that-dev-already-exists.patch
>
> diff --git a/meta-openstack/recipes-support/iproute2/iproute2/0003-Don-t-enforce-that-dev-already-exists.patch b/meta-openstack/recipes-support/iproute2/iproute2/0003-Don-t-enforce-that-dev-already-exists.patch
> deleted file mode 100644
> index b296abe..0000000
> --- a/meta-openstack/recipes-support/iproute2/iproute2/0003-Don-t-enforce-that-dev-already-exists.patch
> +++ /dev/null
> @@ -1,27 +0,0 @@
> -From 4a5577fab7490573ceaafa6e4417cf03bca178f1 Mon Sep 17 00:00:00 2001
> -Message-Id: <4a5577fab7490573ceaafa6e4417cf03bca178f1.1407786415.git.agx@sigxcpu.org>
> -From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
> -Date: Mon, 11 Aug 2014 21:41:51 +0200
> -Subject: [PATCH] Don't enforce that dev already exists
> -
> -Commit 9a02651a87d0fd56e2e7eedd63921a050a42b3ec tried to make sure
> -the device can be looked up but that e.g. isn't true for
> -
> -  ip link add vnet10 type veth peer name vnet11
> -
> -where vnet10 isn't yet existent.
> ----
> - ip/iplink.c | 2 --
> - 1 file changed, 2 deletions(-)
> -
> ---- a/ip/iplink.c
> -+++ b/ip/iplink.c
> -@@ -571,8 +571,6 @@ int iplink_parse(int argc, char **argv,
> -                               duparg2("dev", *argv);
> -                       *dev = *argv;
> -                       dev_index = ll_name_to_index(*dev);
> --                      if (dev_index == 0)
> --                              invarg("Unknown device", *argv);
> -               }
> -               argc--; argv++;
> -       }
> diff --git a/meta-openstack/recipes-support/iproute2/iproute2_3.16.0.bbappend b/meta-openstack/recipes-support/iproute2/iproute2_3.16.0.bbappend
> index 8949646..2fde00d 100644
> --- a/meta-openstack/recipes-support/iproute2/iproute2_3.16.0.bbappend
> +++ b/meta-openstack/recipes-support/iproute2/iproute2_3.16.0.bbappend
> @@ -2,5 +2,3 @@ FILESEXTRAPATHS_append := "${THISDIR}/${PN}"
>
>  RRECOMMENDS_${PN} += "kernel-module-veth \
>         "
> -
> -SRC_URI += " file://0003-Don-t-enforce-that-dev-already-exists.patch"
> --
> 1.9.1
>
> --
> _______________________________________________
> meta-virtualization mailing list
> meta-virtualization@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-virtualization



-- 
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"


^ permalink raw reply	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2015-02-21  3:13 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-02-13 10:35 [PATCH 0/3] Small correction for the previous pathces Tudor Florea
2015-02-13 10:35 ` [PATCH 1/3] json: make the previous patch really apply Tudor Florea
2015-02-13 10:35 ` [PATCH 2/3] yajl-ruby: " Tudor Florea
2015-02-13 10:35 ` [PATCH 3/3] iproute2: remove patch already applied Tudor Florea
2015-02-17  4:52   ` Bruce Ashfield
2015-02-17 19:09     ` [PATCH v2 1/1] " Tudor Florea
2015-02-21  3:13       ` Bruce Ashfield
2015-02-17  4:50 ` [PATCH 0/3] Small correction for the previous pathces Bruce Ashfield

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.