summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--recipes-containers/criu/files/0001-protobuf-c-Remove-the-rules-which-depend-on-the-nati.patch46
-rw-r--r--recipes-containers/criu/files/Omit-google-apputils-dependency.patch25
-rw-r--r--recipes-containers/criu/files/disable_tests.patch19
-rw-r--r--recipes-containers/criu/files/protobuf-allow-running-python-scripts-from-anywhere.patch38
-rwxr-xr-xrecipes-containers/criu/files/run-ptest32
-rw-r--r--recipes-containers/criu/protobuf-c_1.1.1.bb28
-rw-r--r--recipes-containers/criu/protobuf-native_2.6.1.bb21
-rw-r--r--recipes-containers/criu/protobuf_2.6.1.bb97
8 files changed, 0 insertions, 306 deletions
diff --git a/recipes-containers/criu/files/0001-protobuf-c-Remove-the-rules-which-depend-on-the-nati.patch b/recipes-containers/criu/files/0001-protobuf-c-Remove-the-rules-which-depend-on-the-nati.patch
deleted file mode 100644
index b6fbf017..00000000
--- a/recipes-containers/criu/files/0001-protobuf-c-Remove-the-rules-which-depend-on-the-nati.patch
+++ /dev/null
@@ -1,46 +0,0 @@
1From 81bc5928cdc1b432656eb6590967306d8cf3ac9d Mon Sep 17 00:00:00 2001
2From: Jianchuan Wang <jianchuan.wang@windriver.com>
3Date: Tue, 4 Aug 2015 10:22:21 +0800
4Subject: [PATCH] protobuf-c: Remove the rules which depend on the native
5 command
6
7Those rules are not for cross-compile since the command protoc-c/cxx-generate-packed-data
8need be executed to generate some local files in the compiling processing.
9
10Signed-off-by: Jianchuan Wang <jianchuan.wang@windriver.com>
11---
12 Makefile.am | 13 +++++++------
13 1 file changed, 7 insertions(+), 6 deletions(-)
14
15diff --git a/Makefile.am b/Makefile.am
16index 310aa09..0602e96 100644
17--- a/Makefile.am
18+++ b/Makefile.am
19@@ -148,17 +148,18 @@ t_generated_code2_cxx_generate_packed_data_CXXFLAGS = \
20 t_generated_code2_cxx_generate_packed_data_LDADD = \
21 $(protobuf_LIBS)
22
23-t/test.pb-c.c t/test.pb-c.h: $(top_builddir)/protoc-c/protoc-c$(EXEEXT) $(top_srcdir)/t/test.proto
24- $(AM_V_GEN)$(top_builddir)/protoc-c/protoc-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test.proto
25+t/test.pb-c.c t/test.pb-c.h: $(top_srcdir)/t/test.proto
26+ $(AM_V_GEN)protoc-c -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test.proto
27
28-t/test-full.pb-c.c t/test-full.pb-c.h: $(top_builddir)/protoc-c/protoc-c$(EXEEXT) $(top_srcdir)/t/test-full.proto
29- $(AM_V_GEN)$(top_builddir)/protoc-c/protoc-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-full.proto
30+t/test-full.pb-c.c t/test-full.pb-c.h: $(top_srcdir)/t/test-full.proto
31+ $(AM_V_GEN)protoc-c -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-full.proto
32
33 t/test-full.pb.cc t/test-full.pb.h: @PROTOC@ $(top_srcdir)/t/test-full.proto
34 $(AM_V_GEN)@PROTOC@ -I$(top_srcdir) --cpp_out=$(top_builddir) $(top_srcdir)/t/test-full.proto
35
36-t/generated-code2/test-full-cxx-output.inc: t/generated-code2/cxx-generate-packed-data$(EXEEXT)
37- $(AM_V_GEN)$(top_builddir)/t/generated-code2/cxx-generate-packed-data$(EXEEXT) > $(top_builddir)/t/generated-code2/test-full-cxx-output.inc
38+t/generated-code2/test-full-cxx-output.inc:
39+ mkdir -p $(top_builddir)/t/generated-code2
40+ $(AM_V_GEN)cxx-generate-packed-data > $(top_builddir)/t/generated-code2/test-full-cxx-output.inc
41
42 BUILT_SOURCES += \
43 t/test.pb-c.c t/test.pb-c.h \
44--
451.9.1
46
diff --git a/recipes-containers/criu/files/Omit-google-apputils-dependency.patch b/recipes-containers/criu/files/Omit-google-apputils-dependency.patch
deleted file mode 100644
index ef60fc01..00000000
--- a/recipes-containers/criu/files/Omit-google-apputils-dependency.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1From f8b7c90f6da90b67bdd7d5301894c5c28bd9d076 Mon Sep 17 00:00:00 2001
2From: Jianchuan Wang <jianchuan.wang@windriver.com>
3Date: Mon, 10 Aug 2015 11:23:31 +0800
4Subject: [PATCH] Omit google-apputils dependency
5
6Signed-off-by: Jianchuan Wang <jianchuan.wang@windriver.com>
7---
8 python/setup.py | 1 -
9 1 file changed, 1 deletion(-)
10
11diff --git a/python/setup.py b/python/setup.py
12index 2450a77..6f6bffb 100755
13--- a/python/setup.py
14+++ b/python/setup.py
15@@ -189,7 +189,6 @@ if __name__ == '__main__':
16 'google.protobuf.text_format'],
17 cmdclass = { 'clean': clean, 'build_py': build_py },
18 install_requires = ['setuptools'],
19- setup_requires = ['google-apputils'],
20 ext_modules = ext_module_list,
21 url = 'https://developers.google.com/protocol-buffers/',
22 maintainer = maintainer_email,
23--
241.9.1
25
diff --git a/recipes-containers/criu/files/disable_tests.patch b/recipes-containers/criu/files/disable_tests.patch
deleted file mode 100644
index dac89421..00000000
--- a/recipes-containers/criu/files/disable_tests.patch
+++ /dev/null
@@ -1,19 +0,0 @@
1diff -Naur protobuf-c-0.15.old/src/Makefile.am protobuf-c-0.15/src/Makefile.am
2--- protobuf-c-0.15.old/src/Makefile.am 2012-11-28 14:59:57.845251943 +0100
3+++ protobuf-c-0.15/src/Makefile.am 2012-11-28 15:00:23.549252632 +0100
4@@ -1,5 +1,5 @@
5 if BUILD_PROTOC_C
6-SUBDIRS = . test
7+
8 bin_PROGRAMS = protoc-c
9 protoc_c_SOURCES = \
10 google/protobuf/compiler/c/c_service.cc \
11@@ -23,7 +23,7 @@
12 lib_LTLIBRARIES = libprotobuf-c.la
13 protobufcincludedir = $(includedir)/google/protobuf-c
14
15-EXTRA_DIST = CMakeLists.txt test/CMakeLists.txt
16+EXTRA_DIST = CMakeLists.txt
17
18 libprotobuf_c_la_SOURCES = \
19 google/protobuf-c/protobuf-c-dispatch.c \
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
deleted file mode 100644
index 13d4e848..00000000
--- a/recipes-containers/criu/files/protobuf-allow-running-python-scripts-from-anywhere.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1From 46e331263eb92e47510e88478b255f226d30245c Mon Sep 17 00:00:00 2001
2From: Keith Holman <Keith.Holman@windriver.com>
3Date: Mon, 18 Aug 2014 15:19:35 -0400
4Subject: [PATCH] protobuf: allow running python scripts from anywhere
5
6The Makefile to generate the examples with Google Protocol Buffers
7generates some scripts for python. However, these generated scripts
8only work if they are ran in the same directory as the source files.
9This fix generates scripts to execute from anywhere on the system.
10
11Signed-off-by: Keith Holman <Keith.Holman@windriver.com>
12---
13 examples/Makefile | 6 ++++--
14 1 file changed, 4 insertions(+), 2 deletions(-)
15
16diff --git a/examples/Makefile b/examples/Makefile
17index 8dc9083..a993d63 100644
18--- a/examples/Makefile
19+++ b/examples/Makefile
20@@ -48,11 +48,13 @@ list_people_java: javac_middleman
21 add_person_python: add_person.py protoc_middleman
22 @echo "Writing shortcut script add_person_python..."
23 @echo '#! /bin/sh' > add_person_python
24- @echo './add_person.py "$$@"' >> add_person_python
25+ @echo 'SCRIPT_DIR=$$(dirname $$0)' >> add_person_python
26+ @echo '$$SCRIPT_DIR/add_person.py "$$@"' >> add_person_python
27 @chmod +x add_person_python
28
29 list_people_python: list_people.py protoc_middleman
30 @echo "Writing shortcut script list_people_python..."
31 @echo '#! /bin/sh' > list_people_python
32- @echo './list_people.py "$$@"' >> list_people_python
33+ @echo 'SCRIPT_DIR=$$(dirname $$0)' >> list_people_python
34+ @echo '$$SCRIPT_DIR/list_people.py "$$@"' >> list_people_python
35 @chmod +x list_people_python
36--
371.9.3
38
diff --git a/recipes-containers/criu/files/run-ptest b/recipes-containers/criu/files/run-ptest
deleted file mode 100755
index a5a7b0f9..00000000
--- a/recipes-containers/criu/files/run-ptest
+++ /dev/null
@@ -1,32 +0,0 @@
1#!/bin/bash
2DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
3TEST_FILE="/tmp/test.data"
4
5RETVAL=0
6# Test every writing test application
7for write_exe_full_path in ${DIR}/add_person_*; do
8 if [ -x "${write_exe_full_path}" ]; then
9 write_exe=`basename ${write_exe_full_path}`
10 echo "Generating new test file using ${write_exe}..."
11 ${write_exe_full_path} "${TEST_FILE}"
12 RETVAL=$?
13
14 # Test every reading test application
15 for read_exe_full_path in ${DIR}/list_people_*; do
16 read_exe=`basename ${read_exe_full_path}`
17 echo "Test: Write with ${write_exe}; Read with ${read_exe}..."
18 if [ -x "${read_exe_full_path}" ]; then
19 ${read_exe_full_path} "${TEST_FILE}"
20 RETVAL=$?
21 fi
22 done
23
24 # Cleanup...
25 if [ -e "${TEST_FILE}" ]; then
26 rm "${TEST_FILE}"
27 fi
28 fi
29done
30
31exit $RETVAL
32
diff --git a/recipes-containers/criu/protobuf-c_1.1.1.bb b/recipes-containers/criu/protobuf-c_1.1.1.bb
deleted file mode 100644
index 0d03ebef..00000000
--- a/recipes-containers/criu/protobuf-c_1.1.1.bb
+++ /dev/null
@@ -1,28 +0,0 @@
1SUMMARY = "protobuf-c"
2DESCRIPTION = "This package provides a code generator and runtime libraries to use Protocol Buffers from pure C"
3HOMEPAGE = "http://code.google.com/p/protobuf-c/"
4SECTION = "console/tools"
5LICENSE = "Apache-2.0"
6
7LIC_FILES_CHKSUM = "file://protobuf-c/protobuf-c.c;endline=28;md5=0feb44cc63eacef97219b0174967492f"
8
9COMPATIBLE_HOST = "(x86_64|arm|aarch64).*-linux"
10
11DEPENDS = "protobuf protobuf-c-native"
12
13SRC_URI[md5sum] = "41d437677ea16f9d3611d98841c4af3b"
14SRC_URI[sha256sum] = "09c5bb187b7a8e86bc0ff860f7df86370be9e8661cdb99c1072dcdab0763562c"
15SRC_URI = "https://github.com/protobuf-c/protobuf-c/releases/download/v1.1.1/protobuf-c-1.1.1.tar.gz "
16SRC_URI_append_class-target ="file://0001-protobuf-c-Remove-the-rules-which-depend-on-the-nati.patch"
17
18inherit autotools pkgconfig
19
20BBCLASSEXTEND = "native nativesdk"
21
22do_configure_prepend_class-target() {
23 export PKG_CONFIG_PATH="${STAGING_LIBDIR_NATIVE}/pkgconfig:${PKG_CONFIG_PATH}"
24}
25
26do_install_append_class-native() {
27 install -m 755 ${B}/t/generated-code2/cxx-generate-packed-data ${D}/${bindir}
28}
diff --git a/recipes-containers/criu/protobuf-native_2.6.1.bb b/recipes-containers/criu/protobuf-native_2.6.1.bb
deleted file mode 100644
index e88c9e78..00000000
--- a/recipes-containers/criu/protobuf-native_2.6.1.bb
+++ /dev/null
@@ -1,21 +0,0 @@
1SUMMARY = "protobuf"
2DESCRIPTION = "Protocol Buffers are a way of encoding structured data in \
3an efficient yet extensible format. Google uses Protocol Buffers for \
4almost all of its internal RPC protocols and file formats."
5HOMEPAGE = "http://code.google.com/p/protobuf/"
6SECTION = "console/tools"
7LICENSE = "BSD-3-Clause"
8
9LIC_FILES_CHKSUM = "file://LICENSE;md5=af6809583bfde9a31595a58bb4a24514"
10
11PR = "r0"
12
13SRC_URI[md5sum] = "af05b2cca289f7b86eef2734a0cdc8b9"
14SRC_URI[sha256sum] = "2667b7cda4a6bc8a09e5463adf3b5984e08d94e72338277affa8594d8b6e5cd1"
15SRC_URI = "https://github.com/google/protobuf/archive/v2.6.1.tar.gz;downloadfilename=protobuf-2.6.1.tar.gz \
16 "
17
18EXTRA_OECONF += " --with-protoc=echo --disable-shared"
19
20inherit native autotools
21
diff --git a/recipes-containers/criu/protobuf_2.6.1.bb b/recipes-containers/criu/protobuf_2.6.1.bb
deleted file mode 100644
index 1b7ab201..00000000
--- a/recipes-containers/criu/protobuf_2.6.1.bb
+++ /dev/null
@@ -1,97 +0,0 @@
1SUMMARY = "protobuf"
2DESCRIPTION = "Protocol Buffers are a way of encoding structured data in \
3an efficient yet extensible format. Google uses Protocol Buffers for \
4almost all of its internal RPC protocols and file formats."
5HOMEPAGE = "http://code.google.com/p/protobuf/"
6SECTION = "console/tools"
7LICENSE = "BSD-3-Clause"
8
9LIC_FILES_CHKSUM = "file://LICENSE;md5=af6809583bfde9a31595a58bb4a24514"
10
11PR = "r0"
12EXCLUDE_FROM_WORLD = "1"
13
14SRC_URI[md5sum] = "af05b2cca289f7b86eef2734a0cdc8b9"
15SRC_URI[sha256sum] = "2667b7cda4a6bc8a09e5463adf3b5984e08d94e72338277affa8594d8b6e5cd1"
16SRC_URI = "https://github.com/google/protobuf/archive/v2.6.1.tar.gz;downloadfilename=protobuf-2.6.1.tar.gz\
17 file://protobuf-allow-running-python-scripts-from-anywhere.patch \
18 file://Omit-google-apputils-dependency.patch \
19 file://run-ptest"
20
21COMPATIBLE_HOST = "(x86_64|arm|aarch64).*-linux"
22
23EXTRA_OECONF += " --with-protoc=${STAGING_BINDIR_NATIVE}/protoc"
24inherit autotools setuptools ptest
25
26DEPENDS += "protobuf-native"
27
28PYTHON_SRC_DIR="python"
29TEST_SRC_DIR="examples"
30LANG_SUPPORT="cpp python"
31
32do_compile() {
33 # Compile protoc compiler
34 base_do_compile
35}
36
37do_compile_ptest() {
38 # Modify makefile to use the cross-compiler
39 sed -e "s|c++|${CXX}|g" -i "${S}/${TEST_SRC_DIR}/Makefile"
40
41 mkdir -p "${B}/${TEST_SRC_DIR}"
42
43 # Add the location of the cross-compiled header and library files
44 # which haven't been installed yet.
45 cp "${B}/protobuf.pc" "${B}/${TEST_SRC_DIR}/protobuf.pc"
46 sed -e 's|libdir=|libdir=${PKG_CONFIG_SYSROOT_DIR}|' -i "${B}/${TEST_SRC_DIR}/protobuf.pc"
47 sed -e 's|Cflags:|Cflags: -I${S}/src|' -i "${B}/${TEST_SRC_DIR}/protobuf.pc"
48 sed -e 's|Libs:|Libs: -L${B}/src/.libs|' -i "${B}/${TEST_SRC_DIR}/protobuf.pc"
49 export PKG_CONFIG_PATH="${B}/${TEST_SRC_DIR}"
50
51 # Save the pkgcfg sysroot variable, and update it to nothing so
52 # that it doesn't append the sysroot to the beginning of paths.
53 # The header and library files aren't installed to the target
54 # system yet. So the absolute paths were specified above.
55 save_pkg_config_sysroot_dir=$PKG_CONFIG_SYSROOT_DIR
56 export PKG_CONFIG_SYSROOT_DIR=
57
58 # Compile the tests
59 for lang in ${LANG_SUPPORT}; do
60 oe_runmake -C "${S}/${TEST_SRC_DIR}" ${lang}
61 done
62
63 # Restore the pkgconfig sysroot variable
64 export PKG_CONFIG_SYSROOT_DIR=$save_pkg_config_sysroot_dir
65}
66
67do_install() {
68 local olddir=`pwd`
69
70 # Install protoc compiler
71 autotools_do_install
72
73 # Install header files
74 export PROTOC="${STAGING_BINDIR_NATIVE}/protoc"
75 cd "${S}/${PYTHON_SRC_DIR}"
76 distutils_do_install
77
78 cd "$olddir"
79}
80
81do_install_ptest() {
82 local olddir=`pwd`
83
84 cd "${S}/${TEST_SRC_DIR}"
85 install -d "${D}/${PTEST_PATH}"
86 for i in add_person* list_people*; do
87 if [ -x "$i" ]; then
88 install "$i" "${D}/${PTEST_PATH}"
89 fi
90 done
91 cp "${S}/${TEST_SRC_DIR}/addressbook_pb2.py" "${D}/${PTEST_PATH}"
92
93 cd "$olddir"
94}
95
96BBCLASSEXTEND = "nativesdk"
97
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-05-31 06:38:00 +0000