* [PATCH 0/2] Upgrade protobuf and protobuf-c
@ 2016-09-08 2:32 Venkateswara Rao Mandela
2016-09-08 2:32 ` [PATCH 1/2] protobuf: update 2.5.0 -> 3.0.2 Venkateswara Rao Mandela
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Venkateswara Rao Mandela @ 2016-09-08 2:32 UTC (permalink / raw)
To: meta-virtualization, jianchuan.wang
Hi Jianchun,
Here are two patches I am using while trying to upgrade to criu-2.5. These
are reworked from the existing recipes in the tree. Hope this helps when you
are rebasing the patches.
criu-1.6 build will not work with these patches.
regards,
Venkat
Venkateswara Rao Mandela (2):
protobuf: update 2.5.0 -> 3.0.2
protobuf-c: update 0.15 -> 1.2.1
recipes-devtools/protobuf/protobuf-3.0.2.inc | 4 ++
recipes-devtools/protobuf/protobuf-c-1.2.1.inc | 4 ++
recipes-devtools/protobuf/protobuf-c.inc | 11 +++
recipes-devtools/protobuf/protobuf-c_1.2.1.bb | 10 +++
recipes-devtools/protobuf/protobuf-native_3.0.2.bb | 5 ++
recipes-devtools/protobuf/protobuf.inc | 14 ++++
recipes-devtools/protobuf/protobuf_3.0.2.bb | 82 ++++++++++++++++++++++
7 files changed, 130 insertions(+)
create mode 100644 recipes-devtools/protobuf/protobuf-3.0.2.inc
create mode 100644 recipes-devtools/protobuf/protobuf-c-1.2.1.inc
create mode 100644 recipes-devtools/protobuf/protobuf-c.inc
create mode 100644 recipes-devtools/protobuf/protobuf-c_1.2.1.bb
create mode 100644 recipes-devtools/protobuf/protobuf-native_3.0.2.bb
create mode 100644 recipes-devtools/protobuf/protobuf.inc
create mode 100644 recipes-devtools/protobuf/protobuf_3.0.2.bb
--
2.9.3
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 1/2] protobuf: update 2.5.0 -> 3.0.2
2016-09-08 2:32 [PATCH 0/2] Upgrade protobuf and protobuf-c Venkateswara Rao Mandela
@ 2016-09-08 2:32 ` Venkateswara Rao Mandela
2016-09-08 2:32 ` [PATCH 2/2] protobuf-c: update 0.15 -> 1.2.1 Venkateswara Rao Mandela
2016-09-08 2:46 ` [PATCH 0/2] Upgrade protobuf and protobuf-c Jianchuan Wang
2 siblings, 0 replies; 6+ messages in thread
From: Venkateswara Rao Mandela @ 2016-09-08 2:32 UTC (permalink / raw)
To: meta-virtualization, jianchuan.wang
- Create a separate file for 3.0.2 protobuf. This is the latest version
as on Sep 8 2016.
Mimic the recipe organization used by m4 (oe-core/meta/recipes-devtools/m4)
- Move the description,source URI and license checksum to protobuf.inc
- Move tar ball checksum into protobuf-3.0.2.inc
- Create a separate recipes for native and cross compilation
Signed-off-by: Venkateswara Rao Mandela <venkat.mandela@ti.com>
---
recipes-devtools/protobuf/protobuf-3.0.2.inc | 4 ++
recipes-devtools/protobuf/protobuf-native_3.0.2.bb | 5 ++
recipes-devtools/protobuf/protobuf.inc | 14 ++++
recipes-devtools/protobuf/protobuf_3.0.2.bb | 82 ++++++++++++++++++++++
4 files changed, 105 insertions(+)
create mode 100644 recipes-devtools/protobuf/protobuf-3.0.2.inc
create mode 100644 recipes-devtools/protobuf/protobuf-native_3.0.2.bb
create mode 100644 recipes-devtools/protobuf/protobuf.inc
create mode 100644 recipes-devtools/protobuf/protobuf_3.0.2.bb
diff --git a/recipes-devtools/protobuf/protobuf-3.0.2.inc b/recipes-devtools/protobuf/protobuf-3.0.2.inc
new file mode 100644
index 0000000..d64b1ff
--- /dev/null
+++ b/recipes-devtools/protobuf/protobuf-3.0.2.inc
@@ -0,0 +1,4 @@
+require protobuf.inc
+
+SRC_URI[md5sum] = "845b39e4b7681a2ddfd8c7f528299fbb"
+SRC_URI[sha256sum] = "b700647e11556b643ccddffd1f41d8cb7704ed02090af54cc517d44d912d11c1"
diff --git a/recipes-devtools/protobuf/protobuf-native_3.0.2.bb b/recipes-devtools/protobuf/protobuf-native_3.0.2.bb
new file mode 100644
index 0000000..1104d94
--- /dev/null
+++ b/recipes-devtools/protobuf/protobuf-native_3.0.2.bb
@@ -0,0 +1,5 @@
+require protobuf-${PV}.inc
+
+EXTRA_OECONF += " --with-protoc=echo --disable-shared"
+
+inherit native autotools
diff --git a/recipes-devtools/protobuf/protobuf.inc b/recipes-devtools/protobuf/protobuf.inc
new file mode 100644
index 0000000..2778037
--- /dev/null
+++ b/recipes-devtools/protobuf/protobuf.inc
@@ -0,0 +1,14 @@
+SUMMARY = "protobuf"
+DESCRIPTION = "Protocol Buffers are a way of encoding structured data in \
+an efficient yet extensible format. Google uses Protocol Buffers for \
+almost all of its internal RPC protocols and file formats."
+HOMEPAGE = "https://github.com/google/protobuf/"
+SECTION = "console/tools"
+LICENSE = "BSD-3-Clause"
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=35953c752efc9299b184f91bef540095"
+
+inherit autotools
+
+SRC_URI = "https://github.com/google/protobuf/archive/v${PV}.tar.gz \
+ "
diff --git a/recipes-devtools/protobuf/protobuf_3.0.2.bb b/recipes-devtools/protobuf/protobuf_3.0.2.bb
new file mode 100644
index 0000000..779ce6e
--- /dev/null
+++ b/recipes-devtools/protobuf/protobuf_3.0.2.bb
@@ -0,0 +1,82 @@
+require protobuf-${PV}.inc
+
+EXCLUDE_FROM_WORLD = "1"
+
+SRC_URI += "file://protobuf-allow-running-python-scripts-from-anywhere.patch \
+ file://run-ptest"
+
+EXTRA_OECONF += " --with-protoc=${STAGING_BINDIR_NATIVE}/protoc"
+inherit autotools setuptools ptest
+
+DEPENDS += "protobuf-native"
+RDEPENDS_${PN}-ptest = "bash python"
+
+PYTHON_SRC_DIR="python"
+TEST_SRC_DIR="examples"
+LANG_SUPPORT="python"
+
+do_compile() {
+ # Compile protoc compiler
+ base_do_compile
+}
+
+do_compile_ptest() {
+ # Modify makefile to use the cross-compiler
+ sed -e "s|c++|${CXX}|g" -i "${S}/${TEST_SRC_DIR}/Makefile"
+
+ mkdir -p "${B}/${TEST_SRC_DIR}"
+
+ # Add the location of the cross-compiled header and library files
+ # which haven't been installed yet.
+ cp "${B}/protobuf.pc" "${B}/${TEST_SRC_DIR}/protobuf.pc"
+ sed -e 's|libdir=|libdir=${PKG_CONFIG_SYSROOT_DIR}|' -i "${B}/${TEST_SRC_DIR}/protobuf.pc"
+ sed -e 's|Cflags:|Cflags: -I${S}/src|' -i "${B}/${TEST_SRC_DIR}/protobuf.pc"
+ sed -e 's|Libs:|Libs: -L${B}/src/.libs|' -i "${B}/${TEST_SRC_DIR}/protobuf.pc"
+ export PKG_CONFIG_PATH="${B}/${TEST_SRC_DIR}"
+
+ # Save the pkgcfg sysroot variable, and update it to nothing so
+ # that it doesn't append the sysroot to the beginning of paths.
+ # The header and library files aren't installed to the target
+ # system yet. So the absolute paths were specified above.
+ save_pkg_config_sysroot_dir=$PKG_CONFIG_SYSROOT_DIR
+ export PKG_CONFIG_SYSROOT_DIR=
+
+ # Compile the tests
+ for lang in ${LANG_SUPPORT}; do
+ oe_runmake -C "${S}/${TEST_SRC_DIR}" ${lang}
+ done
+
+ # Restore the pkgconfig sysroot variable
+ export PKG_CONFIG_SYSROOT_DIR=$save_pkg_config_sysroot_dir
+}
+
+do_install() {
+ local olddir=`pwd`
+
+ # Install protoc compiler
+ autotools_do_install
+
+ # Install header files
+ export PROTOC="${STAGING_BINDIR_NATIVE}/protoc"
+ cd "${S}/${PYTHON_SRC_DIR}"
+ distutils_do_install
+
+ cd "$olddir"
+}
+
+do_install_ptest() {
+ local olddir=`pwd`
+
+ cd "${S}/${TEST_SRC_DIR}"
+ install -d "${D}/${PTEST_PATH}"
+ for i in add_person* list_people*; do
+ if [ -x "$i" ]; then
+ install "$i" "${D}/${PTEST_PATH}"
+ fi
+ done
+ cp "${S}/${TEST_SRC_DIR}/addressbook_pb2.py" "${D}/${PTEST_PATH}"
+
+ cd "$olddir"
+}
+
+BBCLASSEXTEND = "nativesdk"
--
2.9.3
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/2] protobuf-c: update 0.15 -> 1.2.1
2016-09-08 2:32 [PATCH 0/2] Upgrade protobuf and protobuf-c Venkateswara Rao Mandela
2016-09-08 2:32 ` [PATCH 1/2] protobuf: update 2.5.0 -> 3.0.2 Venkateswara Rao Mandela
@ 2016-09-08 2:32 ` Venkateswara Rao Mandela
2016-09-08 2:46 ` [PATCH 0/2] Upgrade protobuf and protobuf-c Jianchuan Wang
2 siblings, 0 replies; 6+ messages in thread
From: Venkateswara Rao Mandela @ 2016-09-08 2:32 UTC (permalink / raw)
To: meta-virtualization, jianchuan.wang
Following the same recipe organization as protobuf
1. Description, SRC URI and license checksum go into protobuf-c.inc
2. version specific checksums go into protobuf-c_1.2.1.inc
3. recipe for cross compilation goes into protobuf-c_1.2.1.bb
Signed-off-by: Venkateswara Rao Mandela <venkat.mandela@ti.com>
---
recipes-devtools/protobuf/protobuf-c-1.2.1.inc | 4 ++++
recipes-devtools/protobuf/protobuf-c.inc | 11 +++++++++++
recipes-devtools/protobuf/protobuf-c_1.2.1.bb | 10 ++++++++++
3 files changed, 25 insertions(+)
create mode 100644 recipes-devtools/protobuf/protobuf-c-1.2.1.inc
create mode 100644 recipes-devtools/protobuf/protobuf-c.inc
create mode 100644 recipes-devtools/protobuf/protobuf-c_1.2.1.bb
diff --git a/recipes-devtools/protobuf/protobuf-c-1.2.1.inc b/recipes-devtools/protobuf/protobuf-c-1.2.1.inc
new file mode 100644
index 0000000..25e6be3
--- /dev/null
+++ b/recipes-devtools/protobuf/protobuf-c-1.2.1.inc
@@ -0,0 +1,4 @@
+require protobuf-c.inc
+
+SRC_URI[md5sum] = "b884aeba4283309445a8e3b6e7322dd6"
+SRC_URI[sha256sum] = "2d708fb3c024b9e6e86df141faff802194f5db90a4b79e6d4aa6bd61dd983dd6"
diff --git a/recipes-devtools/protobuf/protobuf-c.inc b/recipes-devtools/protobuf/protobuf-c.inc
new file mode 100644
index 0000000..15d1393
--- /dev/null
+++ b/recipes-devtools/protobuf/protobuf-c.inc
@@ -0,0 +1,11 @@
+SUMMARY = "protobuf-c"
+DESCRIPTION = "This package provides a code generator and runtime libraries to use Protocol Buffers from pure C"
+HOMEPAGE = "https://github.com/protobuf-c/protobuf-c"
+SECTION = "console/tools"
+LICENSE = "BSD-2-Clause"
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=235c3195a3968524dc1524b4ebea0c0e"
+
+SRC_URI = "https://github.com/protobuf-c/protobuf-c/archive/v${PV}.tar.gz \
+ "
+inherit autotools
diff --git a/recipes-devtools/protobuf/protobuf-c_1.2.1.bb b/recipes-devtools/protobuf/protobuf-c_1.2.1.bb
new file mode 100644
index 0000000..a8c4628
--- /dev/null
+++ b/recipes-devtools/protobuf/protobuf-c_1.2.1.bb
@@ -0,0 +1,10 @@
+require protobuf-c-${PV}.inc
+
+DEPENDS = "protobuf"
+
+#SRC_URI += "file://disable_tests.patch \
+# "
+
+inherit autotools
+
+BBCLASSEXTEND = "native nativesdk"
--
2.9.3
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 0/2] Upgrade protobuf and protobuf-c
2016-09-08 2:32 [PATCH 0/2] Upgrade protobuf and protobuf-c Venkateswara Rao Mandela
2016-09-08 2:32 ` [PATCH 1/2] protobuf: update 2.5.0 -> 3.0.2 Venkateswara Rao Mandela
2016-09-08 2:32 ` [PATCH 2/2] protobuf-c: update 0.15 -> 1.2.1 Venkateswara Rao Mandela
@ 2016-09-08 2:46 ` Jianchuan Wang
2016-09-08 2:49 ` Mandela, Venkateswara Rao
2 siblings, 1 reply; 6+ messages in thread
From: Jianchuan Wang @ 2016-09-08 2:46 UTC (permalink / raw)
To: Venkateswara Rao Mandela, meta-virtualization
On 09/08/2016 10:32 AM, Venkateswara Rao Mandela wrote:
> Hi Jianchun,
>
> Here are two patches I am using while trying to upgrade to criu-2.5. These
> are reworked from the existing recipes in the tree. Hope this helps when you
> are rebasing the patches.
>
> criu-1.6 build will not work with these patches.
The criu-1.6 can work in my env after uprev protobuf and protobuf-c.
Thanks,
Jianchuan
> regards,
> Venkat
>
> Venkateswara Rao Mandela (2):
> protobuf: update 2.5.0 -> 3.0.2
> protobuf-c: update 0.15 -> 1.2.1
>
> recipes-devtools/protobuf/protobuf-3.0.2.inc | 4 ++
> recipes-devtools/protobuf/protobuf-c-1.2.1.inc | 4 ++
> recipes-devtools/protobuf/protobuf-c.inc | 11 +++
> recipes-devtools/protobuf/protobuf-c_1.2.1.bb | 10 +++
> recipes-devtools/protobuf/protobuf-native_3.0.2.bb | 5 ++
> recipes-devtools/protobuf/protobuf.inc | 14 ++++
> recipes-devtools/protobuf/protobuf_3.0.2.bb | 82 ++++++++++++++++++++++
> 7 files changed, 130 insertions(+)
> create mode 100644 recipes-devtools/protobuf/protobuf-3.0.2.inc
> create mode 100644 recipes-devtools/protobuf/protobuf-c-1.2.1.inc
> create mode 100644 recipes-devtools/protobuf/protobuf-c.inc
> create mode 100644 recipes-devtools/protobuf/protobuf-c_1.2.1.bb
> create mode 100644 recipes-devtools/protobuf/protobuf-native_3.0.2.bb
> create mode 100644 recipes-devtools/protobuf/protobuf.inc
> create mode 100644 recipes-devtools/protobuf/protobuf_3.0.2.bb
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 0/2] Upgrade protobuf and protobuf-c
2016-09-08 2:46 ` [PATCH 0/2] Upgrade protobuf and protobuf-c Jianchuan Wang
@ 2016-09-08 2:49 ` Mandela, Venkateswara Rao
2016-09-08 2:59 ` Jianchuan Wang
0 siblings, 1 reply; 6+ messages in thread
From: Mandela, Venkateswara Rao @ 2016-09-08 2:49 UTC (permalink / raw)
To: Jianchuan Wang, meta-virtualization
Hi Jianchun,
On Thursday 08 September 2016 08:16 AM, Jianchuan Wang wrote:
>> criu-1.6 build will not work with these patches.
>
> The criu-1.6 can work in my env after uprev protobuf and protobuf-c.
What is the kernel and tool chain versions that you are using? i am trying with gcc-4.7 and kernel 3.14.
regards,
Venkat
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 0/2] Upgrade protobuf and protobuf-c
2016-09-08 2:49 ` Mandela, Venkateswara Rao
@ 2016-09-08 2:59 ` Jianchuan Wang
0 siblings, 0 replies; 6+ messages in thread
From: Jianchuan Wang @ 2016-09-08 2:59 UTC (permalink / raw)
To: venkat.mandela, meta-virtualization
On 09/08/2016 10:49 AM, Mandela, Venkateswara Rao wrote:
> Hi Jianchun,
>
> On Thursday 08 September 2016 08:16 AM, Jianchuan Wang wrote:
>>> criu-1.6 build will not work with these patches.
>> The criu-1.6 can work in my env after uprev protobuf and protobuf-c.
> What is the kernel and tool chain versions that you are using? i am trying with gcc-4.7 and kernel 3.14.
kernel version is 4.1/4.8
Gcc version is 6.1.1
Thanks,
Jianchuan
> regards,
> Venkat
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-09-08 3:00 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-08 2:32 [PATCH 0/2] Upgrade protobuf and protobuf-c Venkateswara Rao Mandela
2016-09-08 2:32 ` [PATCH 1/2] protobuf: update 2.5.0 -> 3.0.2 Venkateswara Rao Mandela
2016-09-08 2:32 ` [PATCH 2/2] protobuf-c: update 0.15 -> 1.2.1 Venkateswara Rao Mandela
2016-09-08 2:46 ` [PATCH 0/2] Upgrade protobuf and protobuf-c Jianchuan Wang
2016-09-08 2:49 ` Mandela, Venkateswara Rao
2016-09-08 2:59 ` Jianchuan Wang
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.