openembedded-devel.lists.openembedded.org archive mirror
 help / color / mirror / Atom feed
* [meta-oe][PATCH] protobuf-c: update to 1.4.0
@ 2021-10-14 22:14 Oleksandr Kravchuk
  2021-10-15  4:07 ` [oe] " Khem Raj
  0 siblings, 1 reply; 2+ messages in thread
From: Oleksandr Kravchuk @ 2021-10-14 22:14 UTC (permalink / raw)
  To: openembedded-devel; +Cc: Oleksandr Kravchuk

Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
---
 .../0001-avoid-race-condition.patch           | 36 -------------------
 ...rotobuf-c_1.3.3.bb => protobuf-c_1.4.0.bb} |  7 ++--
 2 files changed, 2 insertions(+), 41 deletions(-)
 delete mode 100644 meta-oe/recipes-devtools/protobuf/protobuf-c/0001-avoid-race-condition.patch
 rename meta-oe/recipes-devtools/protobuf/{protobuf-c_1.3.3.bb => protobuf-c_1.4.0.bb} (87%)

diff --git a/meta-oe/recipes-devtools/protobuf/protobuf-c/0001-avoid-race-condition.patch b/meta-oe/recipes-devtools/protobuf/protobuf-c/0001-avoid-race-condition.patch
deleted file mode 100644
index 4fc7703d8..000000000
--- a/meta-oe/recipes-devtools/protobuf/protobuf-c/0001-avoid-race-condition.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 216e31260b618ec73862f9f5336597f391444dac Mon Sep 17 00:00:00 2001
-From: Chen Qi <Qi.Chen@windriver.com>
-Date: Sun, 29 Sep 2019 17:20:42 +0800
-Subject: [PATCH] avoid race condition
-
-It's possible that the cxx-generate-packed-data.cc is compiled
-while the t/test-full.pb.h is being generated. This will result
-the following error.
-
-  DEBUG:	./t/test-full.pb.h:4:0: error: unterminated #ifndef
-  ./t/test-full.pb.h:4:0: error: unterminated #ifndef
-
-Add a dependency to avoid such problem.
-
-Upstream-Status: Pending
-
-Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
----
- Makefile.am | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Makefile.am b/Makefile.am
-index b0cb065..1608ae0 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -156,6 +156,7 @@ noinst_PROGRAMS += \
- t_generated_code2_cxx_generate_packed_data_SOURCES = \
- 	t/generated-code2/cxx-generate-packed-data.cc \
- 	t/test-full.pb.cc
-+t/generated-code2/cxx-generate-packed-data.cc: t/test-full.pb.h
- $(t_generated_code2_cxx_generate_packed_data_OBJECTS): t/test-full.pb.h
- t_generated_code2_cxx_generate_packed_data_CXXFLAGS = \
- 	$(AM_CXXFLAGS) \
--- 
-2.17.1
-
diff --git a/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.3.bb b/meta-oe/recipes-devtools/protobuf/protobuf-c_1.4.0.bb
similarity index 87%
rename from meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.3.bb
rename to meta-oe/recipes-devtools/protobuf/protobuf-c_1.4.0.bb
index 1a0bf535c..cc037d393 100644
--- a/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.3.bb
+++ b/meta-oe/recipes-devtools/protobuf/protobuf-c_1.4.0.bb
@@ -12,11 +12,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=cb901168715f4782a2b06c3ddaefa558"
 
 DEPENDS = "protobuf-native protobuf"
 
-SRCREV = "f20a3fa131c275a0e795d99a28f94b4dbbb5af26"
-
-SRC_URI = "git://github.com/protobuf-c/protobuf-c.git \
-           file://0001-avoid-race-condition.patch \
-          "
+SRC_URI = "git://github.com/protobuf-c/protobuf-c.git"
+SRCREV = "f224ab2eeb648a818eb20687d7150a285442c907"
 
 S = "${WORKDIR}/git"
 
-- 
2.25.1



^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [oe] [meta-oe][PATCH] protobuf-c: update to 1.4.0
  2021-10-14 22:14 [meta-oe][PATCH] protobuf-c: update to 1.4.0 Oleksandr Kravchuk
@ 2021-10-15  4:07 ` Khem Raj
  0 siblings, 0 replies; 2+ messages in thread
From: Khem Raj @ 2021-10-15  4:07 UTC (permalink / raw)
  To: Oleksandr Kravchuk, openembedded-devel



On 10/14/21 3:14 PM, Oleksandr Kravchuk wrote:
> Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
> ---
>   .../0001-avoid-race-condition.patch           | 36 -------------------
>   ...rotobuf-c_1.3.3.bb => protobuf-c_1.4.0.bb} |  7 ++--
>   2 files changed, 2 insertions(+), 41 deletions(-)
>   delete mode 100644 meta-oe/recipes-devtools/protobuf/protobuf-c/0001-avoid-race-condition.patch
>   rename meta-oe/recipes-devtools/protobuf/{protobuf-c_1.3.3.bb => protobuf-c_1.4.0.bb} (87%)
> 
> diff --git a/meta-oe/recipes-devtools/protobuf/protobuf-c/0001-avoid-race-condition.patch b/meta-oe/recipes-devtools/protobuf/protobuf-c/0001-avoid-race-condition.patch
> deleted file mode 100644
> index 4fc7703d8..000000000
> --- a/meta-oe/recipes-devtools/protobuf/protobuf-c/0001-avoid-race-condition.patch
> +++ /dev/null

why is this patch dropped ?

> @@ -1,36 +0,0 @@
> -From 216e31260b618ec73862f9f5336597f391444dac Mon Sep 17 00:00:00 2001
> -From: Chen Qi <Qi.Chen@windriver.com>
> -Date: Sun, 29 Sep 2019 17:20:42 +0800
> -Subject: [PATCH] avoid race condition
> -
> -It's possible that the cxx-generate-packed-data.cc is compiled
> -while the t/test-full.pb.h is being generated. This will result
> -the following error.
> -
> -  DEBUG:	./t/test-full.pb.h:4:0: error: unterminated #ifndef
> -  ./t/test-full.pb.h:4:0: error: unterminated #ifndef
> -
> -Add a dependency to avoid such problem.
> -
> -Upstream-Status: Pending
> -
> -Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
> ----
> - Makefile.am | 1 +
> - 1 file changed, 1 insertion(+)
> -
> -diff --git a/Makefile.am b/Makefile.am
> -index b0cb065..1608ae0 100644
> ---- a/Makefile.am
> -+++ b/Makefile.am
> -@@ -156,6 +156,7 @@ noinst_PROGRAMS += \
> - t_generated_code2_cxx_generate_packed_data_SOURCES = \
> - 	t/generated-code2/cxx-generate-packed-data.cc \
> - 	t/test-full.pb.cc
> -+t/generated-code2/cxx-generate-packed-data.cc: t/test-full.pb.h
> - $(t_generated_code2_cxx_generate_packed_data_OBJECTS): t/test-full.pb.h
> - t_generated_code2_cxx_generate_packed_data_CXXFLAGS = \
> - 	$(AM_CXXFLAGS) \
> ---
> -2.17.1
> -
> diff --git a/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.3.bb b/meta-oe/recipes-devtools/protobuf/protobuf-c_1.4.0.bb
> similarity index 87%
> rename from meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.3.bb
> rename to meta-oe/recipes-devtools/protobuf/protobuf-c_1.4.0.bb
> index 1a0bf535c..cc037d393 100644
> --- a/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.3.bb
> +++ b/meta-oe/recipes-devtools/protobuf/protobuf-c_1.4.0.bb
> @@ -12,11 +12,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=cb901168715f4782a2b06c3ddaefa558"
>   
>   DEPENDS = "protobuf-native protobuf"
>   
> -SRCREV = "f20a3fa131c275a0e795d99a28f94b4dbbb5af26"
> -
> -SRC_URI = "git://github.com/protobuf-c/protobuf-c.git \
> -           file://0001-avoid-race-condition.patch \
> -          "
> +SRC_URI = "git://github.com/protobuf-c/protobuf-c.git"
> +SRCREV = "f224ab2eeb648a818eb20687d7150a285442c907"
>   
>   S = "${WORKDIR}/git"
>   
> 
> 
> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#93306): https://lists.openembedded.org/g/openembedded-devel/message/93306
> Mute This Topic: https://lists.openembedded.org/mt/86326318/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
> 


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-10-15  4:07 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-14 22:14 [meta-oe][PATCH] protobuf-c: update to 1.4.0 Oleksandr Kravchuk
2021-10-15  4:07 ` [oe] " Khem Raj

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).