diff options
Diffstat (limited to 'import-layers/meta-virtualization/recipes-containers/criu/files')
8 files changed, 283 insertions, 0 deletions
diff --git a/import-layers/meta-virtualization/recipes-containers/criu/files/0001-criu-Change-libraries-install-directory.patch b/import-layers/meta-virtualization/recipes-containers/criu/files/0001-criu-Change-libraries-install-directory.patch new file mode 100644 index 000000000..28d638b31 --- /dev/null +++ b/import-layers/meta-virtualization/recipes-containers/criu/files/0001-criu-Change-libraries-install-directory.patch @@ -0,0 +1,48 @@ +From cb9933dc34af0b4d52c4584332600114ac65c402 Mon Sep 17 00:00:00 2001 +From: Jianchuan Wang <jianchuan.wang@windriver.com> +Date: Tue, 4 Aug 2015 17:45:51 +0800 +Subject: [PATCH] criu: Change libraries install directory + +Install the libraries into /usr/lib(/usr/lib64) + +Signed-off-by: Jianchuan Wang <jianchuan.wang@windriver.com> +--- + Makefile | 2 +- + Makefile.inc | 9 --------- + 2 files changed, 1 insertion(+), 10 deletions(-) + +diff --git a/Makefile b/Makefile +index 7f5c890..6dbc436 100644 +--- a/Makefile ++++ b/Makefile +@@ -351,7 +351,7 @@ install-man: + + install-crit: crit + $(E) " INSTALL crit" +- $(Q) python scripts/crit-setup.py install --root=$(DESTDIR) --prefix=$(PREFIX) ++ $(Q) python scripts/crit-setup.py install --root=$(DESTDIR) --prefix=$(PREFIX) --install-lib=$(LIBDIR) + + .PHONY: install install-man install-crit install-criu + +diff --git a/Makefile.inc b/Makefile.inc +index 5496f41..ba70aea 100644 +--- a/Makefile.inc ++++ b/Makefile.inc +@@ -17,14 +17,5 @@ MANDIR := $(PREFIX)/share/man + SYSTEMDUNITDIR := $(PREFIX)/lib/systemd/system/ + LOGROTATEDIR := $(PREFIX)/etc/logrotate.d/ + LIBDIR := $(PREFIX)/lib +-# For recent Debian/Ubuntu with multiarch support +-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture \ +- -qDEB_HOST_MULTIARCH 2>/dev/null) +-ifneq "$(DEB_HOST_MULTIARCH)" "" +-LIBDIR := $(PREFIX)/lib/$(DEB_HOST_MULTIARCH) +-# For most other systems +-else ifeq "$(shell uname -m)" "x86_64" +-LIBDIR := $(PREFIX)/lib64 +-endif + + INCLUDEDIR := $(PREFIX)/include/criu +-- +1.9.1 + diff --git a/import-layers/meta-virtualization/recipes-containers/criu/files/0001-criu-Fix-toolchain-hardcode.patch b/import-layers/meta-virtualization/recipes-containers/criu/files/0001-criu-Fix-toolchain-hardcode.patch new file mode 100644 index 000000000..2fabe0adf --- /dev/null +++ b/import-layers/meta-virtualization/recipes-containers/criu/files/0001-criu-Fix-toolchain-hardcode.patch @@ -0,0 +1,46 @@ +From 3d4f112fdb434712eba09239a468842323f1af4c Mon Sep 17 00:00:00 2001 +From: Yang Shi <yang.shi@windriver.com> +Date: Tue, 26 Aug 2014 14:42:42 -0700 +Subject: [PATCH 1/2] criu: Fix toolchain hardcode + +Replace ":=" to "?=" so that the toolchain used by bitbake build system will +be taken. + +Signed-off-by: Yang Shi <yang.shi@windriver.com> +Signed-off-by: Nam Ninh <nam.ninh@windriver.com> +--- + Makefile | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/Makefile b/Makefile +index f1c8784..43252ec 100644 +--- a/Makefile ++++ b/Makefile +@@ -23,15 +23,15 @@ export VERSION_SO_MAJOR VERSION_SO_MINOR + # Common definitions + # + +-FIND := find +-CSCOPE := cscope +-RM := rm -f +-LD := $(CROSS_COMPILE)ld +-CC := $(CROSS_COMPILE)gcc +-NM := $(CROSS_COMPILE)nm +-SH := bash +-MAKE := make +-OBJCOPY := $(CROSS_COMPILE)objcopy ++FIND ?= find ++CSCOPE ?= cscope ++RM ?= rm -f ++LD ?= $(CROSS_COMPILE)ld ++CC ?= $(CROSS_COMPILE)gcc ++NM ?= $(CROSS_COMPILE)nm ++SH ?= bash ++MAKE ?= make ++OBJCOPY ?= $(CROSS_COMPILE)objcopy + + CFLAGS += $(USERCFLAGS) + +-- +2.0.2 + diff --git a/import-layers/meta-virtualization/recipes-containers/criu/files/0001-protobuf-c-Remove-the-rules-which-depend-on-the-nati.patch b/import-layers/meta-virtualization/recipes-containers/criu/files/0001-protobuf-c-Remove-the-rules-which-depend-on-the-nati.patch new file mode 100644 index 000000000..b6fbf0176 --- /dev/null +++ b/import-layers/meta-virtualization/recipes-containers/criu/files/0001-protobuf-c-Remove-the-rules-which-depend-on-the-nati.patch @@ -0,0 +1,46 @@ +From 81bc5928cdc1b432656eb6590967306d8cf3ac9d Mon Sep 17 00:00:00 2001 +From: Jianchuan Wang <jianchuan.wang@windriver.com> +Date: Tue, 4 Aug 2015 10:22:21 +0800 +Subject: [PATCH] protobuf-c: Remove the rules which depend on the native + command + +Those rules are not for cross-compile since the command protoc-c/cxx-generate-packed-data +need be executed to generate some local files in the compiling processing. + +Signed-off-by: Jianchuan Wang <jianchuan.wang@windriver.com> +--- + Makefile.am | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 310aa09..0602e96 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -148,17 +148,18 @@ t_generated_code2_cxx_generate_packed_data_CXXFLAGS = \ + t_generated_code2_cxx_generate_packed_data_LDADD = \ + $(protobuf_LIBS) + +-t/test.pb-c.c t/test.pb-c.h: $(top_builddir)/protoc-c/protoc-c$(EXEEXT) $(top_srcdir)/t/test.proto +- $(AM_V_GEN)$(top_builddir)/protoc-c/protoc-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test.proto ++t/test.pb-c.c t/test.pb-c.h: $(top_srcdir)/t/test.proto ++ $(AM_V_GEN)protoc-c -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test.proto + +-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 +- $(AM_V_GEN)$(top_builddir)/protoc-c/protoc-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-full.proto ++t/test-full.pb-c.c t/test-full.pb-c.h: $(top_srcdir)/t/test-full.proto ++ $(AM_V_GEN)protoc-c -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-full.proto + + t/test-full.pb.cc t/test-full.pb.h: @PROTOC@ $(top_srcdir)/t/test-full.proto + $(AM_V_GEN)@PROTOC@ -I$(top_srcdir) --cpp_out=$(top_builddir) $(top_srcdir)/t/test-full.proto + +-t/generated-code2/test-full-cxx-output.inc: t/generated-code2/cxx-generate-packed-data$(EXEEXT) +- $(AM_V_GEN)$(top_builddir)/t/generated-code2/cxx-generate-packed-data$(EXEEXT) > $(top_builddir)/t/generated-code2/test-full-cxx-output.inc ++t/generated-code2/test-full-cxx-output.inc: ++ mkdir -p $(top_builddir)/t/generated-code2 ++ $(AM_V_GEN)cxx-generate-packed-data > $(top_builddir)/t/generated-code2/test-full-cxx-output.inc + + BUILT_SOURCES += \ + t/test.pb-c.c t/test.pb-c.h \ +-- +1.9.1 + diff --git a/import-layers/meta-virtualization/recipes-containers/criu/files/0002-criu-Skip-documentation-install.patch b/import-layers/meta-virtualization/recipes-containers/criu/files/0002-criu-Skip-documentation-install.patch new file mode 100644 index 000000000..eaf816031 --- /dev/null +++ b/import-layers/meta-virtualization/recipes-containers/criu/files/0002-criu-Skip-documentation-install.patch @@ -0,0 +1,29 @@ +From e9c2a94b9eb37ad24672b10caa398bd18282b962 Mon Sep 17 00:00:00 2001 +From: Yang Shi <yang.shi@windriver.com> +Date: Tue, 26 Aug 2014 14:44:51 -0700 +Subject: [PATCH 2/2] criu: Skip documentation install + +asciidoc is needed to generate CRIU documentation, so skip it in install. + +Signed-off-by: Yang Shi <yang.shi@windriver.com> +Signed-off-by: Nam Ninh <nam.ninh@windriver.com> +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 43252ec..e25edcc 100644 +--- a/Makefile ++++ b/Makefile +@@ -265,7 +265,7 @@ install: $(PROGRAM) install-man + $(Q) install -m 644 scripts/logrotate.d/criu-service $(DESTDIR)$(LOGROTATEDIR) + + install-man: +- $(Q) $(MAKE) -C Documentation install ++# $(Q) $(MAKE) -C Documentation install + + .PHONY: install install-man + +-- +2.0.2 + diff --git a/import-layers/meta-virtualization/recipes-containers/criu/files/Omit-google-apputils-dependency.patch b/import-layers/meta-virtualization/recipes-containers/criu/files/Omit-google-apputils-dependency.patch new file mode 100644 index 000000000..ef60fc018 --- /dev/null +++ b/import-layers/meta-virtualization/recipes-containers/criu/files/Omit-google-apputils-dependency.patch @@ -0,0 +1,25 @@ +From f8b7c90f6da90b67bdd7d5301894c5c28bd9d076 Mon Sep 17 00:00:00 2001 +From: Jianchuan Wang <jianchuan.wang@windriver.com> +Date: Mon, 10 Aug 2015 11:23:31 +0800 +Subject: [PATCH] Omit google-apputils dependency + +Signed-off-by: Jianchuan Wang <jianchuan.wang@windriver.com> +--- + python/setup.py | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/python/setup.py b/python/setup.py +index 2450a77..6f6bffb 100755 +--- a/python/setup.py ++++ b/python/setup.py +@@ -189,7 +189,6 @@ if __name__ == '__main__': + 'google.protobuf.text_format'], + cmdclass = { 'clean': clean, 'build_py': build_py }, + install_requires = ['setuptools'], +- setup_requires = ['google-apputils'], + ext_modules = ext_module_list, + url = 'https://developers.google.com/protocol-buffers/', + maintainer = maintainer_email, +-- +1.9.1 + diff --git a/import-layers/meta-virtualization/recipes-containers/criu/files/disable_tests.patch b/import-layers/meta-virtualization/recipes-containers/criu/files/disable_tests.patch new file mode 100644 index 000000000..dac89421a --- /dev/null +++ b/import-layers/meta-virtualization/recipes-containers/criu/files/disable_tests.patch @@ -0,0 +1,19 @@ +diff -Naur protobuf-c-0.15.old/src/Makefile.am protobuf-c-0.15/src/Makefile.am +--- protobuf-c-0.15.old/src/Makefile.am 2012-11-28 14:59:57.845251943 +0100 ++++ protobuf-c-0.15/src/Makefile.am 2012-11-28 15:00:23.549252632 +0100 +@@ -1,5 +1,5 @@ + if BUILD_PROTOC_C +-SUBDIRS = . test ++ + bin_PROGRAMS = protoc-c + protoc_c_SOURCES = \ + google/protobuf/compiler/c/c_service.cc \ +@@ -23,7 +23,7 @@ + lib_LTLIBRARIES = libprotobuf-c.la + protobufcincludedir = $(includedir)/google/protobuf-c + +-EXTRA_DIST = CMakeLists.txt test/CMakeLists.txt ++EXTRA_DIST = CMakeLists.txt + + libprotobuf_c_la_SOURCES = \ + google/protobuf-c/protobuf-c-dispatch.c \ diff --git a/import-layers/meta-virtualization/recipes-containers/criu/files/protobuf-allow-running-python-scripts-from-anywhere.patch b/import-layers/meta-virtualization/recipes-containers/criu/files/protobuf-allow-running-python-scripts-from-anywhere.patch new file mode 100644 index 000000000..13d4e8485 --- /dev/null +++ b/import-layers/meta-virtualization/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/import-layers/meta-virtualization/recipes-containers/criu/files/run-ptest b/import-layers/meta-virtualization/recipes-containers/criu/files/run-ptest new file mode 100755 index 000000000..a5a7b0f9b --- /dev/null +++ b/import-layers/meta-virtualization/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 + |
