* [meta-oe][thud][PATCH] protobuf-c: fix race condition
@ 2019-10-17 3:39 Sinan Kaya
2019-10-17 20:44 ` Martin Jansa
0 siblings, 1 reply; 3+ messages in thread
From: Sinan Kaya @ 2019-10-17 3:39 UTC (permalink / raw)
To: openembedded-devel
From: "Qi.Chen@windriver.com" <Qi.Chen@windriver.com>
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Sinan Kaya <okaya@kernel.org>
(cherry picked from commit 489d3b4b932ee8016d792341f8ea5836a9522cd4)
---
.../0001-avoid-race-condition.patch | 36 +++++++++++++++++++
.../protobuf/protobuf-c_1.3.1.bb | 3 +-
2 files changed, 38 insertions(+), 1 deletion(-)
create mode 100644 meta-oe/recipes-devtools/protobuf/protobuf-c/0001-avoid-race-condition.patch
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
new file mode 100644
index 000000000..4fc7703d8
--- /dev/null
+++ b/meta-oe/recipes-devtools/protobuf/protobuf-c/0001-avoid-race-condition.patch
@@ -0,0 +1,36 @@
+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.1.bb b/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.1.bb
index 7ef030092..17f92f04b 100644
--- a/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.1.bb
+++ b/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.1.bb
@@ -15,7 +15,8 @@ DEPENDS = "protobuf-native protobuf"
PV .= "+git${SRCPV}"
SRCREV = "269771b4b45d3aba04e59569f53600003db8d9ff"
-SRC_URI = "git://github.com/protobuf-c/protobuf-c.git"
+SRC_URI = "git://github.com/protobuf-c/protobuf-c.git \
+ file://0001-avoid-race-condition.patch"
S = "${WORKDIR}/git"
--
2.23.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [meta-oe][thud][PATCH] protobuf-c: fix race condition
2019-10-17 3:39 [meta-oe][thud][PATCH] protobuf-c: fix race condition Sinan Kaya
@ 2019-10-17 20:44 ` Martin Jansa
2019-10-18 0:03 ` Sinan Kaya
0 siblings, 1 reply; 3+ messages in thread
From: Martin Jansa @ 2019-10-17 20:44 UTC (permalink / raw)
To: Sinan Kaya; +Cc: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 3313 bytes --]
On Thu, Oct 17, 2019 at 03:39:46AM +0000, Sinan Kaya wrote:
> From: "Qi.Chen@windriver.com" <Qi.Chen@windriver.com>
>
> Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> Signed-off-by: Sinan Kaya <okaya@kernel.org>
> (cherry picked from commit 489d3b4b932ee8016d792341f8ea5836a9522cd4)
Yes this is needed in thud as well, but first it should be backported to
warrior as well, I'll send separate patch for that.
> ---
> .../0001-avoid-race-condition.patch | 36 +++++++++++++++++++
> .../protobuf/protobuf-c_1.3.1.bb | 3 +-
> 2 files changed, 38 insertions(+), 1 deletion(-)
> create mode 100644 meta-oe/recipes-devtools/protobuf/protobuf-c/0001-avoid-race-condition.patch
>
> 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
> new file mode 100644
> index 000000000..4fc7703d8
> --- /dev/null
> +++ b/meta-oe/recipes-devtools/protobuf/protobuf-c/0001-avoid-race-condition.patch
> @@ -0,0 +1,36 @@
> +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.1.bb b/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.1.bb
> index 7ef030092..17f92f04b 100644
> --- a/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.1.bb
> +++ b/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.1.bb
> @@ -15,7 +15,8 @@ DEPENDS = "protobuf-native protobuf"
> PV .= "+git${SRCPV}"
> SRCREV = "269771b4b45d3aba04e59569f53600003db8d9ff"
>
> -SRC_URI = "git://github.com/protobuf-c/protobuf-c.git"
> +SRC_URI = "git://github.com/protobuf-c/protobuf-c.git \
> + file://0001-avoid-race-condition.patch"
>
> S = "${WORKDIR}/git"
>
> --
> 2.23.0
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 201 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [meta-oe][thud][PATCH] protobuf-c: fix race condition
2019-10-17 20:44 ` Martin Jansa
@ 2019-10-18 0:03 ` Sinan Kaya
0 siblings, 0 replies; 3+ messages in thread
From: Sinan Kaya @ 2019-10-18 0:03 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembedded-devel
On 10/17/2019 1:44 PM, Martin Jansa wrote:
> On Thu, Oct 17, 2019 at 03:39:46AM +0000, Sinan Kaya wrote:
>> From: "Qi.Chen@windriver.com" <Qi.Chen@windriver.com>
>>
>> Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> Signed-off-by: Sinan Kaya <okaya@kernel.org>
>> (cherry picked from commit 489d3b4b932ee8016d792341f8ea5836a9522cd4)
> Yes this is needed in thud as well, but first it should be backported to
> warrior as well, I'll send separate patch for that.
>
Thanks Martin
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-10-18 0:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-10-17 3:39 [meta-oe][thud][PATCH] protobuf-c: fix race condition Sinan Kaya
2019-10-17 20:44 ` Martin Jansa
2019-10-18 0:03 ` Sinan Kaya
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.