All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/5] protobuf: update google protocol buffers to 2.5.0
@ 2014-08-20 20:46 Keith Holman
  2014-08-20 20:46 ` [PATCH 2/5] protobuf: add python support Keith Holman
                   ` (4 more replies)
  0 siblings, 5 replies; 8+ messages in thread
From: Keith Holman @ 2014-08-20 20:46 UTC (permalink / raw)
  To: meta-virtualization; +Cc: keith.holman

Upgrade Google Protocol Buffers to version 2.5.0.  The previous
version 2.4.1 is getting quite old (released April 2011).  The newer
version provides bug fixes and more functionality.  This version adds
some speed optimization and the ability to allow multiple enum
symbols to have the same value.

Signed-off-by: Keith Holman <Keith.Holman@windriver.com>
---
 recipes-containers/criu/protobuf_2.4.1.bb | 18 ------------------
 recipes-containers/criu/protobuf_2.5.0.bb | 20 ++++++++++++++++++++
 2 files changed, 20 insertions(+), 18 deletions(-)
 delete mode 100644 recipes-containers/criu/protobuf_2.4.1.bb
 create mode 100644 recipes-containers/criu/protobuf_2.5.0.bb

diff --git a/recipes-containers/criu/protobuf_2.4.1.bb b/recipes-containers/criu/protobuf_2.4.1.bb
deleted file mode 100644
index d8f1b53..0000000
--- a/recipes-containers/criu/protobuf_2.4.1.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-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 = "http://code.google.com/p/protobuf/"
-SECTION = "console/tools"
-LICENSE = "BSD-3-Clause"
-
-LIC_FILES_CHKSUM = "file://COPYING.txt;md5=af6809583bfde9a31595a58bb4a24514"
-
-PR = "r0"
-
-SRC_URI[md5sum] = "dc84e9912ea768baa1976cb7bbcea7b5"
-SRC_URI[sha256sum] = "eac6969b617f397247e805267da2b0db3ff9e5a9163b123503a192fbb5776567"
-SRC_URI = "http://protobuf.googlecode.com/files/protobuf-${PV}.tar.gz"
-
-EXTRA_OECONF += " --with-protoc=echo"
-inherit autotools
-
-BBCLASSEXTEND = "native nativesdk"
\ No newline at end of file
diff --git a/recipes-containers/criu/protobuf_2.5.0.bb b/recipes-containers/criu/protobuf_2.5.0.bb
new file mode 100644
index 0000000..4a90b2c
--- /dev/null
+++ b/recipes-containers/criu/protobuf_2.5.0.bb
@@ -0,0 +1,20 @@
+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 = "http://code.google.com/p/protobuf/"
+SECTION = "console/tools"
+LICENSE = "BSD-3-Clause"
+
+LIC_FILES_CHKSUM = "file://COPYING.txt;md5=af6809583bfde9a31595a58bb4a24514"
+
+PR = "r0"
+
+SRC_URI[md5sum] = "b751f772bdeb2812a2a8e7202bf1dae8"
+SRC_URI[sha256sum] = "c55aa3dc538e6fd5eaf732f4eb6b98bdcb7cedb5b91d3b5bdcf29c98c293f58e"
+SRC_URI = "http://protobuf.googlecode.com/files/protobuf-${PV}.tar.gz"
+
+EXTRA_OECONF += " --with-protoc=echo"
+inherit autotools
+
+BBCLASSEXTEND = "native nativesdk"
-- 
1.9.3



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

* [PATCH 2/5] protobuf: add python support
  2014-08-20 20:46 [PATCH 1/5] protobuf: update google protocol buffers to 2.5.0 Keith Holman
@ 2014-08-20 20:46 ` Keith Holman
  2014-08-20 20:46 ` [PATCH 3/5] protobuf: replace spaces with tabs in recipe Keith Holman
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 8+ messages in thread
From: Keith Holman @ 2014-08-20 20:46 UTC (permalink / raw)
  To: meta-virtualization; +Cc: keith.holman

The compiler generated by Google Protocol Buffers currently includes
support for Python bindings.  However, currently the python files
required to use the generated files are not included on the system.
This fix installs the python header files using python setup-tools
after the compiler is built.

Signed-off-by: Keith Holman <Keith.Holman@windriver.com>
---
 recipes-containers/criu/protobuf_2.5.0.bb | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/recipes-containers/criu/protobuf_2.5.0.bb b/recipes-containers/criu/protobuf_2.5.0.bb
index 4a90b2c..a9a26d8 100644
--- a/recipes-containers/criu/protobuf_2.5.0.bb
+++ b/recipes-containers/criu/protobuf_2.5.0.bb
@@ -13,8 +13,22 @@ PR = "r0"
 SRC_URI[md5sum] = "b751f772bdeb2812a2a8e7202bf1dae8"
 SRC_URI[sha256sum] = "c55aa3dc538e6fd5eaf732f4eb6b98bdcb7cedb5b91d3b5bdcf29c98c293f58e"
 SRC_URI = "http://protobuf.googlecode.com/files/protobuf-${PV}.tar.gz"
+PYTHON_SRC_DIR="python"
 
 EXTRA_OECONF += " --with-protoc=echo"
-inherit autotools
+inherit autotools setuptools
+
+do_compile() {
+    # Compile protoc compiler
+    base_do_compile
+}
+
+do_install() {
+    # Install protoc compiler
+    autotools_do_install
+    # Install header files
+    cd "${PYTHON_SRC_DIR}"
+    distutils_do_install
+}
 
 BBCLASSEXTEND = "native nativesdk"
-- 
1.9.3



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

* [PATCH 3/5] protobuf: replace spaces with tabs in recipe
  2014-08-20 20:46 [PATCH 1/5] protobuf: update google protocol buffers to 2.5.0 Keith Holman
  2014-08-20 20:46 ` [PATCH 2/5] protobuf: add python support Keith Holman
@ 2014-08-20 20:46 ` Keith Holman
  2014-08-20 20:46 ` [PATCH 4/5] protobuf: add examples when test feature enabled Keith Holman
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 8+ messages in thread
From: Keith Holman @ 2014-08-20 20:46 UTC (permalink / raw)
  To: meta-virtualization; +Cc: keith.holman

The recipe uses 4 spaces instead of tabs when indenting.  The recipe
style guidelines indicate that tabs should be used instead.  This
simple fix replaces the spaces with tabs where appropriate in the
recipe file.

Signed-off-by: Keith Holman <Keith.Holman@windriver.com>
---
 recipes-containers/criu/protobuf_2.5.0.bb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/recipes-containers/criu/protobuf_2.5.0.bb b/recipes-containers/criu/protobuf_2.5.0.bb
index a9a26d8..5cf6cc9 100644
--- a/recipes-containers/criu/protobuf_2.5.0.bb
+++ b/recipes-containers/criu/protobuf_2.5.0.bb
@@ -19,16 +19,16 @@ EXTRA_OECONF += " --with-protoc=echo"
 inherit autotools setuptools
 
 do_compile() {
-    # Compile protoc compiler
-    base_do_compile
+	# Compile protoc compiler
+	base_do_compile
 }
 
 do_install() {
-    # Install protoc compiler
-    autotools_do_install
-    # Install header files
-    cd "${PYTHON_SRC_DIR}"
-    distutils_do_install
+	# Install protoc compiler
+	autotools_do_install
+	# Install header files
+	cd "${PYTHON_SRC_DIR}"
+	distutils_do_install
 }
 
 BBCLASSEXTEND = "native nativesdk"
-- 
1.9.3



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

* [PATCH 4/5] protobuf: add examples when test feature enabled
  2014-08-20 20:46 [PATCH 1/5] protobuf: update google protocol buffers to 2.5.0 Keith Holman
  2014-08-20 20:46 ` [PATCH 2/5] protobuf: add python support Keith Holman
  2014-08-20 20:46 ` [PATCH 3/5] protobuf: replace spaces with tabs in recipe Keith Holman
@ 2014-08-20 20:46 ` Keith Holman
  2014-08-20 20:46 ` [PATCH 5/5] protobuf: add native package to solve self-dependency Keith Holman
  2014-08-22 18:52 ` [PATCH 1/5] protobuf: update google protocol buffers to 2.5.0 Bruce Ashfield
  4 siblings, 0 replies; 8+ messages in thread
From: Keith Holman @ 2014-08-20 20:46 UTC (permalink / raw)
  To: meta-virtualization; +Cc: keith.holman

Google Protocol Buffers includes some basic example applications to
show its functionality.  This fix installs these examples to the
target system when the "test" feature is enabled in the configuration.

Signed-off-by: Keith Holman <Keith.Holman@windriver.com>
---
 ...llow-running-python-scripts-from-anywhere.patch | 38 +++++++++++++
 recipes-containers/criu/files/run-ptest            | 32 +++++++++++
 recipes-containers/criu/protobuf_2.5.0.bb          | 62 ++++++++++++++++++++--
 3 files changed, 128 insertions(+), 4 deletions(-)
 create mode 100644 recipes-containers/criu/files/protobuf-allow-running-python-scripts-from-anywhere.patch
 create mode 100755 recipes-containers/criu/files/run-ptest

diff --git a/recipes-containers/criu/files/protobuf-allow-running-python-scripts-from-anywhere.patch b/recipes-containers/criu/files/protobuf-allow-running-python-scripts-from-anywhere.patch
new file mode 100644
index 0000000..13d4e84
--- /dev/null
+++ b/recipes-containers/criu/files/protobuf-allow-running-python-scripts-from-anywhere.patch
@@ -0,0 +1,38 @@
+From 46e331263eb92e47510e88478b255f226d30245c Mon Sep 17 00:00:00 2001
+From: Keith Holman <Keith.Holman@windriver.com>
+Date: Mon, 18 Aug 2014 15:19:35 -0400
+Subject: [PATCH] protobuf: allow running python scripts from anywhere
+
+The Makefile to generate the examples with Google Protocol Buffers
+generates some scripts for python.  However, these generated scripts
+only work if they are ran in the same directory as the source files.
+This fix generates scripts to execute from anywhere on the system.
+
+Signed-off-by: Keith Holman <Keith.Holman@windriver.com>
+---
+ examples/Makefile | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/examples/Makefile b/examples/Makefile
+index 8dc9083..a993d63 100644
+--- a/examples/Makefile
++++ b/examples/Makefile
+@@ -48,11 +48,13 @@ list_people_java: javac_middleman
+ add_person_python: add_person.py protoc_middleman
+ 	@echo "Writing shortcut script add_person_python..."
+ 	@echo '#! /bin/sh' > add_person_python
+-	@echo './add_person.py "$$@"' >> add_person_python
++	@echo 'SCRIPT_DIR=$$(dirname $$0)' >> add_person_python
++	@echo '$$SCRIPT_DIR/add_person.py "$$@"' >> add_person_python
+ 	@chmod +x add_person_python
+ 
+ list_people_python: list_people.py protoc_middleman
+ 	@echo "Writing shortcut script list_people_python..."
+ 	@echo '#! /bin/sh' > list_people_python
+-	@echo './list_people.py "$$@"' >> list_people_python
++	@echo 'SCRIPT_DIR=$$(dirname $$0)' >> list_people_python
++	@echo '$$SCRIPT_DIR/list_people.py "$$@"' >> list_people_python
+ 	@chmod +x list_people_python
+-- 
+1.9.3
+
diff --git a/recipes-containers/criu/files/run-ptest b/recipes-containers/criu/files/run-ptest
new file mode 100755
index 0000000..a5a7b0f
--- /dev/null
+++ b/recipes-containers/criu/files/run-ptest
@@ -0,0 +1,32 @@
+#!/bin/bash
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+TEST_FILE="/tmp/test.data"
+
+RETVAL=0
+# Test every writing test application
+for write_exe_full_path in ${DIR}/add_person_*; do
+	if [ -x "${write_exe_full_path}" ]; then
+		write_exe=`basename ${write_exe_full_path}`
+		echo "Generating new test file using ${write_exe}..."
+		${write_exe_full_path} "${TEST_FILE}"
+		RETVAL=$?
+
+		# Test every reading test application
+		for read_exe_full_path in ${DIR}/list_people_*; do
+			read_exe=`basename ${read_exe_full_path}`
+			echo "Test: Write with ${write_exe}; Read with ${read_exe}..."
+			if [ -x "${read_exe_full_path}" ]; then
+				${read_exe_full_path} "${TEST_FILE}"
+				RETVAL=$?
+			fi
+		done
+
+		# Cleanup...
+		if [ -e "${TEST_FILE}" ]; then
+			rm "${TEST_FILE}"
+		fi
+	fi
+done
+
+exit $RETVAL
+
diff --git a/recipes-containers/criu/protobuf_2.5.0.bb b/recipes-containers/criu/protobuf_2.5.0.bb
index 5cf6cc9..851fbf0 100644
--- a/recipes-containers/criu/protobuf_2.5.0.bb
+++ b/recipes-containers/criu/protobuf_2.5.0.bb
@@ -12,23 +12,77 @@ PR = "r0"
 
 SRC_URI[md5sum] = "b751f772bdeb2812a2a8e7202bf1dae8"
 SRC_URI[sha256sum] = "c55aa3dc538e6fd5eaf732f4eb6b98bdcb7cedb5b91d3b5bdcf29c98c293f58e"
-SRC_URI = "http://protobuf.googlecode.com/files/protobuf-${PV}.tar.gz"
-PYTHON_SRC_DIR="python"
+SRC_URI = "http://protobuf.googlecode.com/files/protobuf-${PV}.tar.gz \
+	file://protobuf-allow-running-python-scripts-from-anywhere.patch \
+	file://run-ptest"
 
 EXTRA_OECONF += " --with-protoc=echo"
-inherit autotools setuptools
+inherit autotools setuptools ptest
+
+RDEPENDS_${PN}-ptest += "make"
+
+PYTHON_SRC_DIR="python"
+TEST_SRC_DIR="examples"
+LANG_SUPPORT="cpp 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"
+
+	# Add the location of the cross-compiled header and library files
+	# which haven't been installed yet.
+	cp "${S}/protobuf.pc" "${S}/${TEST_SRC_DIR}/protobuf.pc"
+	sed -e 's|Cflags:|Cflags: -I${S}/src|' -i "${S}/${TEST_SRC_DIR}/protobuf.pc"
+	sed -e 's|Libs:|Libs: -L${S}/src/.libs|' -i "${S}/${TEST_SRC_DIR}/protobuf.pc"
+	export PKG_CONFIG_PATH="${S}/${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
-	cd "${PYTHON_SRC_DIR}"
+	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 = "native nativesdk"
-- 
1.9.3



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

* [PATCH 5/5] protobuf: add native package to solve self-dependency
  2014-08-20 20:46 [PATCH 1/5] protobuf: update google protocol buffers to 2.5.0 Keith Holman
                   ` (2 preceding siblings ...)
  2014-08-20 20:46 ` [PATCH 4/5] protobuf: add examples when test feature enabled Keith Holman
@ 2014-08-20 20:46 ` Keith Holman
  2014-08-22 18:52 ` [PATCH 1/5] protobuf: update google protocol buffers to 2.5.0 Bruce Ashfield
  4 siblings, 0 replies; 8+ messages in thread
From: Keith Holman @ 2014-08-20 20:46 UTC (permalink / raw)
  To: meta-virtualization; +Cc: keith.holman

The installation of Google Protocol Buffers python header files
requires the ability to run the "protoc" compiler on the host to
generate the Python header files.  This fix adds a native package
that builds Google Protocol Buffers for the host machine to provide
the compiler that is used to cross-compile the package for the target
machine.

Signed-off-by: Keith Holman <Keith.Holman@windriver.com>
---
 recipes-containers/criu/protobuf-native_2.5.0.bb | 21 +++++++++++++++++++++
 recipes-containers/criu/protobuf_2.5.0.bb        |  8 +++++---
 2 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 recipes-containers/criu/protobuf-native_2.5.0.bb

diff --git a/recipes-containers/criu/protobuf-native_2.5.0.bb b/recipes-containers/criu/protobuf-native_2.5.0.bb
new file mode 100644
index 0000000..b3f00dd
--- /dev/null
+++ b/recipes-containers/criu/protobuf-native_2.5.0.bb
@@ -0,0 +1,21 @@
+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 = "http://code.google.com/p/protobuf/"
+SECTION = "console/tools"
+LICENSE = "BSD-3-Clause"
+
+LIC_FILES_CHKSUM = "file://COPYING.txt;md5=af6809583bfde9a31595a58bb4a24514"
+
+PR = "r0"
+
+SRC_URI[md5sum] = "b751f772bdeb2812a2a8e7202bf1dae8"
+SRC_URI[sha256sum] = "c55aa3dc538e6fd5eaf732f4eb6b98bdcb7cedb5b91d3b5bdcf29c98c293f58e"
+SRC_URI = "http://protobuf.googlecode.com/files/protobuf-${PV}.tar.gz \
+	"
+
+EXTRA_OECONF += " --with-protoc=echo --disable-shared"
+
+inherit native autotools
+
diff --git a/recipes-containers/criu/protobuf_2.5.0.bb b/recipes-containers/criu/protobuf_2.5.0.bb
index 851fbf0..5c7454b 100644
--- a/recipes-containers/criu/protobuf_2.5.0.bb
+++ b/recipes-containers/criu/protobuf_2.5.0.bb
@@ -16,10 +16,10 @@ SRC_URI = "http://protobuf.googlecode.com/files/protobuf-${PV}.tar.gz \
 	file://protobuf-allow-running-python-scripts-from-anywhere.patch \
 	file://run-ptest"
 
-EXTRA_OECONF += " --with-protoc=echo"
+EXTRA_OECONF += " --with-protoc=${STAGING_BINDIR_NATIVE}/protoc"
 inherit autotools setuptools ptest
 
-RDEPENDS_${PN}-ptest += "make"
+DEPENDS += "protobuf-native"
 
 PYTHON_SRC_DIR="python"
 TEST_SRC_DIR="examples"
@@ -64,6 +64,7 @@ do_install() {
 	autotools_do_install
 
 	# Install header files
+	export PROTOC="${STAGING_BINDIR_NATIVE}/protoc"
 	cd "${S}/${PYTHON_SRC_DIR}"
 	distutils_do_install
 
@@ -85,4 +86,5 @@ do_install_ptest() {
 	cd "$olddir"
 }
 
-BBCLASSEXTEND = "native nativesdk"
+BBCLASSEXTEND = "nativesdk"
+
-- 
1.9.3



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

* Re: [PATCH 1/5] protobuf: update google protocol buffers to 2.5.0
  2014-08-20 20:46 [PATCH 1/5] protobuf: update google protocol buffers to 2.5.0 Keith Holman
                   ` (3 preceding siblings ...)
  2014-08-20 20:46 ` [PATCH 5/5] protobuf: add native package to solve self-dependency Keith Holman
@ 2014-08-22 18:52 ` Bruce Ashfield
  2014-08-22 18:56   ` Keith Holman
  4 siblings, 1 reply; 8+ messages in thread
From: Bruce Ashfield @ 2014-08-22 18:52 UTC (permalink / raw)
  To: Keith Holman; +Cc: meta-virtualization

Keith,

My build test is showing this:

NOTE: Executing RunQueue Tasks
ERROR: Function failed: do_compile_ptest_base (log file is located at
/home/bruce/poky/build/tmp/work/core2-64-poky-linux/protobuf/2.5.0-r0/temp/log.do_compile_ptest_base.30471)
ERROR: Logfile of failure stored in:
/home/bruce/poky/build/tmp/work/core2-64-poky-linux/protobuf/2.5.0-r0/temp/log.do_compile_ptest_base.30471
Log data follows:
| DEBUG: SITE files ['endian-little', 'common-linux', 'common-glibc',
'bit-64', 'x86_64-linux', 'common']
| DEBUG: Executing shell function do_compile_ptest_base
| cp: cannot stat
'/home/bruce/poky/build/tmp/work/core2-64-poky-linux/protobuf/2.5.0-r0/protobuf-2.5.0/protobuf.pc':
No such file or directory
| WARNING: exit code 1 from a shell command.
| ERROR: Function failed: do_compile_ptest_base (log file is located
at /home/bruce/poky/build/tmp/work/core2-64-poky-linux/protobuf/2.5.0-r0/temp/log.do_compile_ptest_base.30471)
ERROR: Task 9 (/home/bruce/poky/meta-virtualization/recipes-containers/criu/protobuf_2.5.0.bb,
do_compile_ptest_base) failed with exit code '1'

Does that look familiar ?

Bruce


On Wed, Aug 20, 2014 at 4:46 PM, Keith Holman
<Keith.Holman@windriver.com> wrote:
> Upgrade Google Protocol Buffers to version 2.5.0.  The previous
> version 2.4.1 is getting quite old (released April 2011).  The newer
> version provides bug fixes and more functionality.  This version adds
> some speed optimization and the ability to allow multiple enum
> symbols to have the same value.
>
> Signed-off-by: Keith Holman <Keith.Holman@windriver.com>
> ---
>  recipes-containers/criu/protobuf_2.4.1.bb | 18 ------------------
>  recipes-containers/criu/protobuf_2.5.0.bb | 20 ++++++++++++++++++++
>  2 files changed, 20 insertions(+), 18 deletions(-)
>  delete mode 100644 recipes-containers/criu/protobuf_2.4.1.bb
>  create mode 100644 recipes-containers/criu/protobuf_2.5.0.bb
>
> diff --git a/recipes-containers/criu/protobuf_2.4.1.bb b/recipes-containers/criu/protobuf_2.4.1.bb
> deleted file mode 100644
> index d8f1b53..0000000
> --- a/recipes-containers/criu/protobuf_2.4.1.bb
> +++ /dev/null
> @@ -1,18 +0,0 @@
> -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 = "http://code.google.com/p/protobuf/"
> -SECTION = "console/tools"
> -LICENSE = "BSD-3-Clause"
> -
> -LIC_FILES_CHKSUM = "file://COPYING.txt;md5=af6809583bfde9a31595a58bb4a24514"
> -
> -PR = "r0"
> -
> -SRC_URI[md5sum] = "dc84e9912ea768baa1976cb7bbcea7b5"
> -SRC_URI[sha256sum] = "eac6969b617f397247e805267da2b0db3ff9e5a9163b123503a192fbb5776567"
> -SRC_URI = "http://protobuf.googlecode.com/files/protobuf-${PV}.tar.gz"
> -
> -EXTRA_OECONF += " --with-protoc=echo"
> -inherit autotools
> -
> -BBCLASSEXTEND = "native nativesdk"
> \ No newline at end of file
> diff --git a/recipes-containers/criu/protobuf_2.5.0.bb b/recipes-containers/criu/protobuf_2.5.0.bb
> new file mode 100644
> index 0000000..4a90b2c
> --- /dev/null
> +++ b/recipes-containers/criu/protobuf_2.5.0.bb
> @@ -0,0 +1,20 @@
> +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 = "http://code.google.com/p/protobuf/"
> +SECTION = "console/tools"
> +LICENSE = "BSD-3-Clause"
> +
> +LIC_FILES_CHKSUM = "file://COPYING.txt;md5=af6809583bfde9a31595a58bb4a24514"
> +
> +PR = "r0"
> +
> +SRC_URI[md5sum] = "b751f772bdeb2812a2a8e7202bf1dae8"
> +SRC_URI[sha256sum] = "c55aa3dc538e6fd5eaf732f4eb6b98bdcb7cedb5b91d3b5bdcf29c98c293f58e"
> +SRC_URI = "http://protobuf.googlecode.com/files/protobuf-${PV}.tar.gz"
> +
> +EXTRA_OECONF += " --with-protoc=echo"
> +inherit autotools
> +
> +BBCLASSEXTEND = "native nativesdk"
> --
> 1.9.3
>
> --
> _______________________________________________
> 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 1/5] protobuf: update google protocol buffers to 2.5.0
  2014-08-22 18:52 ` [PATCH 1/5] protobuf: update google protocol buffers to 2.5.0 Bruce Ashfield
@ 2014-08-22 18:56   ` Keith Holman
  2014-08-22 19:29     ` Bruce Ashfield
  0 siblings, 1 reply; 8+ messages in thread
From: Keith Holman @ 2014-08-22 18:56 UTC (permalink / raw)
  To: Bruce Ashfield; +Cc: meta-virtualization



On 22/08/14 02:52 PM, Bruce Ashfield wrote:
> Keith,
>
> My build test is showing this:
>
> NOTE: Executing RunQueue Tasks
> ERROR: Function failed: do_compile_ptest_base (log file is located at
> /home/bruce/poky/build/tmp/work/core2-64-poky-linux/protobuf/2.5.0-r0/temp/log.do_compile_ptest_base.30471)
> ERROR: Logfile of failure stored in:
> /home/bruce/poky/build/tmp/work/core2-64-poky-linux/protobuf/2.5.0-r0/temp/log.do_compile_ptest_base.30471
> Log data follows:
> | DEBUG: SITE files ['endian-little', 'common-linux', 'common-glibc',
> 'bit-64', 'x86_64-linux', 'common']
> | DEBUG: Executing shell function do_compile_ptest_base
> | cp: cannot stat
> '/home/bruce/poky/build/tmp/work/core2-64-poky-linux/protobuf/2.5.0-r0/protobuf-2.5.0/protobuf.pc':
> No such file or directory
> | WARNING: exit code 1 from a shell command.
> | ERROR: Function failed: do_compile_ptest_base (log file is located
> at /home/bruce/poky/build/tmp/work/core2-64-poky-linux/protobuf/2.5.0-r0/temp/log.do_compile_ptest_base.30471)
> ERROR: Task 9 (/home/bruce/poky/meta-virtualization/recipes-containers/criu/protobuf_2.5.0.bb,
> do_compile_ptest_base) failed with exit code '1'
>
> Does that look familiar ?

No, I never got that.  The "protobuf.pc" file should be generated from 
the do_compile() command.  I wouldn't know why it doesn't generate the 
file.  Its required to be used by the pkgcfg command in the Makefile in 
the examples directory.  It contains the location of the compiler flags 
and library flags for the compiler being used on the system. The script 
makes a temporary copy of this file into the "examples" directory and 
modifies it to cross-compile the examples for the target machine.

- Keith

>
> Bruce
>
>
> On Wed, Aug 20, 2014 at 4:46 PM, Keith Holman
> <Keith.Holman@windriver.com> wrote:
>> Upgrade Google Protocol Buffers to version 2.5.0.  The previous
>> version 2.4.1 is getting quite old (released April 2011).  The newer
>> version provides bug fixes and more functionality.  This version adds
>> some speed optimization and the ability to allow multiple enum
>> symbols to have the same value.
>>
>> Signed-off-by: Keith Holman <Keith.Holman@windriver.com>
>> ---
>>   recipes-containers/criu/protobuf_2.4.1.bb | 18 ------------------
>>   recipes-containers/criu/protobuf_2.5.0.bb | 20 ++++++++++++++++++++
>>   2 files changed, 20 insertions(+), 18 deletions(-)
>>   delete mode 100644 recipes-containers/criu/protobuf_2.4.1.bb
>>   create mode 100644 recipes-containers/criu/protobuf_2.5.0.bb
>>
>> diff --git a/recipes-containers/criu/protobuf_2.4.1.bb b/recipes-containers/criu/protobuf_2.4.1.bb
>> deleted file mode 100644
>> index d8f1b53..0000000
>> --- a/recipes-containers/criu/protobuf_2.4.1.bb
>> +++ /dev/null
>> @@ -1,18 +0,0 @@
>> -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 = "http://code.google.com/p/protobuf/"
>> -SECTION = "console/tools"
>> -LICENSE = "BSD-3-Clause"
>> -
>> -LIC_FILES_CHKSUM = "file://COPYING.txt;md5=af6809583bfde9a31595a58bb4a24514"
>> -
>> -PR = "r0"
>> -
>> -SRC_URI[md5sum] = "dc84e9912ea768baa1976cb7bbcea7b5"
>> -SRC_URI[sha256sum] = "eac6969b617f397247e805267da2b0db3ff9e5a9163b123503a192fbb5776567"
>> -SRC_URI = "http://protobuf.googlecode.com/files/protobuf-${PV}.tar.gz"
>> -
>> -EXTRA_OECONF += " --with-protoc=echo"
>> -inherit autotools
>> -
>> -BBCLASSEXTEND = "native nativesdk"
>> \ No newline at end of file
>> diff --git a/recipes-containers/criu/protobuf_2.5.0.bb b/recipes-containers/criu/protobuf_2.5.0.bb
>> new file mode 100644
>> index 0000000..4a90b2c
>> --- /dev/null
>> +++ b/recipes-containers/criu/protobuf_2.5.0.bb
>> @@ -0,0 +1,20 @@
>> +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 = "http://code.google.com/p/protobuf/"
>> +SECTION = "console/tools"
>> +LICENSE = "BSD-3-Clause"
>> +
>> +LIC_FILES_CHKSUM = "file://COPYING.txt;md5=af6809583bfde9a31595a58bb4a24514"
>> +
>> +PR = "r0"
>> +
>> +SRC_URI[md5sum] = "b751f772bdeb2812a2a8e7202bf1dae8"
>> +SRC_URI[sha256sum] = "c55aa3dc538e6fd5eaf732f4eb6b98bdcb7cedb5b91d3b5bdcf29c98c293f58e"
>> +SRC_URI = "http://protobuf.googlecode.com/files/protobuf-${PV}.tar.gz"
>> +
>> +EXTRA_OECONF += " --with-protoc=echo"
>> +inherit autotools
>> +
>> +BBCLASSEXTEND = "native nativesdk"
>> --
>> 1.9.3
>>
>> --
>> _______________________________________________
>> meta-virtualization mailing list
>> meta-virtualization@yoctoproject.org
>> https://lists.yoctoproject.org/listinfo/meta-virtualization
>
>
>


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

* Re: [PATCH 1/5] protobuf: update google protocol buffers to 2.5.0
  2014-08-22 18:56   ` Keith Holman
@ 2014-08-22 19:29     ` Bruce Ashfield
  0 siblings, 0 replies; 8+ messages in thread
From: Bruce Ashfield @ 2014-08-22 19:29 UTC (permalink / raw)
  To: Keith Holman; +Cc: meta-virtualization

On Fri, Aug 22, 2014 at 2:56 PM, Keith Holman
<Keith.Holman@windriver.com> wrote:
>
>
> On 22/08/14 02:52 PM, Bruce Ashfield wrote:
>>
>> Keith,
>>
>> My build test is showing this:
>>
>> NOTE: Executing RunQueue Tasks
>> ERROR: Function failed: do_compile_ptest_base (log file is located at
>>
>> /home/bruce/poky/build/tmp/work/core2-64-poky-linux/protobuf/2.5.0-r0/temp/log.do_compile_ptest_base.30471)
>> ERROR: Logfile of failure stored in:
>>
>> /home/bruce/poky/build/tmp/work/core2-64-poky-linux/protobuf/2.5.0-r0/temp/log.do_compile_ptest_base.30471
>> Log data follows:
>> | DEBUG: SITE files ['endian-little', 'common-linux', 'common-glibc',
>> 'bit-64', 'x86_64-linux', 'common']
>> | DEBUG: Executing shell function do_compile_ptest_base
>> | cp: cannot stat
>>
>> '/home/bruce/poky/build/tmp/work/core2-64-poky-linux/protobuf/2.5.0-r0/protobuf-2.5.0/protobuf.pc':
>> No such file or directory
>> | WARNING: exit code 1 from a shell command.
>> | ERROR: Function failed: do_compile_ptest_base (log file is located
>> at
>> /home/bruce/poky/build/tmp/work/core2-64-poky-linux/protobuf/2.5.0-r0/temp/log.do_compile_ptest_base.30471)
>> ERROR: Task 9
>> (/home/bruce/poky/meta-virtualization/recipes-containers/criu/protobuf_2.5.0.bb,
>> do_compile_ptest_base) failed with exit code '1'
>>
>> Does that look familiar ?
>
>
> No, I never got that.  The "protobuf.pc" file should be generated from the
> do_compile() command.  I wouldn't know why it doesn't generate the file.
> Its required to be used by the pkgcfg command in the Makefile in the
> examples directory.  It contains the location of the compiler flags and
> library flags for the compiler being used on the system. The script makes a
> temporary copy of this file into the "examples" directory and modifies it to
> cross-compile the examples for the target machine.

problem solved. It ws the autotools source / build separation. I made a patch
on top, and will merge the change shortly.

Bruce

>
> - Keith
>
>
>>
>> Bruce
>>
>>
>> On Wed, Aug 20, 2014 at 4:46 PM, Keith Holman
>> <Keith.Holman@windriver.com> wrote:
>>>
>>> Upgrade Google Protocol Buffers to version 2.5.0.  The previous
>>> version 2.4.1 is getting quite old (released April 2011).  The newer
>>> version provides bug fixes and more functionality.  This version adds
>>> some speed optimization and the ability to allow multiple enum
>>> symbols to have the same value.
>>>
>>> Signed-off-by: Keith Holman <Keith.Holman@windriver.com>
>>> ---
>>>   recipes-containers/criu/protobuf_2.4.1.bb | 18 ------------------
>>>   recipes-containers/criu/protobuf_2.5.0.bb | 20 ++++++++++++++++++++
>>>   2 files changed, 20 insertions(+), 18 deletions(-)
>>>   delete mode 100644 recipes-containers/criu/protobuf_2.4.1.bb
>>>   create mode 100644 recipes-containers/criu/protobuf_2.5.0.bb
>>>
>>> diff --git a/recipes-containers/criu/protobuf_2.4.1.bb
>>> b/recipes-containers/criu/protobuf_2.4.1.bb
>>> deleted file mode 100644
>>> index d8f1b53..0000000
>>> --- a/recipes-containers/criu/protobuf_2.4.1.bb
>>> +++ /dev/null
>>> @@ -1,18 +0,0 @@
>>> -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 = "http://code.google.com/p/protobuf/"
>>> -SECTION = "console/tools"
>>> -LICENSE = "BSD-3-Clause"
>>> -
>>> -LIC_FILES_CHKSUM =
>>> "file://COPYING.txt;md5=af6809583bfde9a31595a58bb4a24514"
>>> -
>>> -PR = "r0"
>>> -
>>> -SRC_URI[md5sum] = "dc84e9912ea768baa1976cb7bbcea7b5"
>>> -SRC_URI[sha256sum] =
>>> "eac6969b617f397247e805267da2b0db3ff9e5a9163b123503a192fbb5776567"
>>> -SRC_URI = "http://protobuf.googlecode.com/files/protobuf-${PV}.tar.gz"
>>> -
>>> -EXTRA_OECONF += " --with-protoc=echo"
>>> -inherit autotools
>>> -
>>> -BBCLASSEXTEND = "native nativesdk"
>>> \ No newline at end of file
>>> diff --git a/recipes-containers/criu/protobuf_2.5.0.bb
>>> b/recipes-containers/criu/protobuf_2.5.0.bb
>>> new file mode 100644
>>> index 0000000..4a90b2c
>>> --- /dev/null
>>> +++ b/recipes-containers/criu/protobuf_2.5.0.bb
>>> @@ -0,0 +1,20 @@
>>> +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 = "http://code.google.com/p/protobuf/"
>>> +SECTION = "console/tools"
>>> +LICENSE = "BSD-3-Clause"
>>> +
>>> +LIC_FILES_CHKSUM =
>>> "file://COPYING.txt;md5=af6809583bfde9a31595a58bb4a24514"
>>> +
>>> +PR = "r0"
>>> +
>>> +SRC_URI[md5sum] = "b751f772bdeb2812a2a8e7202bf1dae8"
>>> +SRC_URI[sha256sum] =
>>> "c55aa3dc538e6fd5eaf732f4eb6b98bdcb7cedb5b91d3b5bdcf29c98c293f58e"
>>> +SRC_URI = "http://protobuf.googlecode.com/files/protobuf-${PV}.tar.gz"
>>> +
>>> +EXTRA_OECONF += " --with-protoc=echo"
>>> +inherit autotools
>>> +
>>> +BBCLASSEXTEND = "native nativesdk"
>>> --
>>> 1.9.3
>>>
>>> --
>>> _______________________________________________
>>> 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:[~2014-08-22 19:29 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-08-20 20:46 [PATCH 1/5] protobuf: update google protocol buffers to 2.5.0 Keith Holman
2014-08-20 20:46 ` [PATCH 2/5] protobuf: add python support Keith Holman
2014-08-20 20:46 ` [PATCH 3/5] protobuf: replace spaces with tabs in recipe Keith Holman
2014-08-20 20:46 ` [PATCH 4/5] protobuf: add examples when test feature enabled Keith Holman
2014-08-20 20:46 ` [PATCH 5/5] protobuf: add native package to solve self-dependency Keith Holman
2014-08-22 18:52 ` [PATCH 1/5] protobuf: update google protocol buffers to 2.5.0 Bruce Ashfield
2014-08-22 18:56   ` Keith Holman
2014-08-22 19:29     ` 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.