diff options
author | Jianchuan Wang <jianchuan.wang@windriver.com> | 2015-09-07 13:29:57 +0800 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2015-09-08 10:01:24 -0400 |
commit | 34a127f3c52550f6ec903e22356a5d772a32bbed (patch) | |
tree | e5c8544ebfb84fd9b74eb8c91e71d41dbe8e8cd0 /recipes-containers | |
parent | 25228032779e492ce08eb3697cb2a68934fef383 (diff) | |
download | meta-virtualization-34a127f3c52550f6ec903e22356a5d772a32bbed.tar.gz |
criu: upgrade 1.4 -> 1.6
Signed-off-by: Jianchuan Wang <jianchuan.wang@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'recipes-containers')
-rw-r--r-- | recipes-containers/criu/criu_git.bb | 30 | ||||
-rw-r--r-- | recipes-containers/criu/files/0001-criu-Change-libraries-install-directory.patch | 48 |
2 files changed, 71 insertions, 7 deletions
diff --git a/recipes-containers/criu/criu_git.bb b/recipes-containers/criu/criu_git.bb index 2b8921fa..48bcdc27 100644 --- a/recipes-containers/criu/criu_git.bb +++ b/recipes-containers/criu/criu_git.bb | |||
@@ -13,16 +13,17 @@ EXCLUDE_FROM_WORLD = "1" | |||
13 | 13 | ||
14 | LIC_FILES_CHKSUM = "file://COPYING;md5=5cc804625b8b491b6b4312f0c9cb5efa" | 14 | LIC_FILES_CHKSUM = "file://COPYING;md5=5cc804625b8b491b6b4312f0c9cb5efa" |
15 | 15 | ||
16 | SRCREV = "bda033e1e91ac5b86afd0a9fdb9fcdd581da6185" | 16 | SRCREV = "4c5b23e52c1dc4e3fbbc7472b92e7b1ce9d22f02" |
17 | PR = "r0" | 17 | PR = "r0" |
18 | PV = "1.4+git${SRCPV}" | 18 | PV = "1.6+git${SRCPV}" |
19 | 19 | ||
20 | SRC_URI = "git://git.criu.org/crtools.git;protocol=git \ | 20 | SRC_URI = "git://github.com/xemul/criu.git;protocol=git \ |
21 | file://0001-criu-Fix-toolchain-hardcode.patch \ | 21 | file://0001-criu-Fix-toolchain-hardcode.patch \ |
22 | file://0002-criu-Skip-documentation-install.patch \ | 22 | file://0002-criu-Skip-documentation-install.patch \ |
23 | file://0001-criu-Change-libraries-install-directory.patch \ | ||
23 | " | 24 | " |
24 | 25 | ||
25 | COMPATIBLE_HOST = "(x86_64|arm).*-linux" | 26 | COMPATIBLE_HOST = "(x86_64|arm|aarch64).*-linux" |
26 | 27 | ||
27 | DEPENDS += "protobuf-c-native protobuf-c" | 28 | DEPENDS += "protobuf-c-native protobuf-c" |
28 | 29 | ||
@@ -35,8 +36,9 @@ S = "${WORKDIR}/git" | |||
35 | # | 36 | # |
36 | EXTRA_OEMAKE_arm += "ARCH=${CRIU_BUILD_ARCH} WERROR=0" | 37 | EXTRA_OEMAKE_arm += "ARCH=${CRIU_BUILD_ARCH} WERROR=0" |
37 | EXTRA_OEMAKE_x86-64 += "ARCH=${TARGET_ARCH} WERROR=0" | 38 | EXTRA_OEMAKE_x86-64 += "ARCH=${TARGET_ARCH} WERROR=0" |
39 | EXTRA_OEMAKE_aarch64 += "ARCH=${TARGET_ARCH} WERROR=0" | ||
38 | 40 | ||
39 | EXTRA_OEMAKE_append += "SBINDIR=${sbindir} LIBDIR=${libdir} INCLUDEDIR=${includedir}" | 41 | EXTRA_OEMAKE_append += "SBINDIR=${sbindir} LIBDIR=${libdir} INCLUDEDIR=${includedir} PIEGEN=no" |
40 | EXTRA_OEMAKE_append += "LOGROTATEDIR=${sysconfdir} SYSTEMDUNITDIR=${systemd_unitdir}" | 42 | EXTRA_OEMAKE_append += "LOGROTATEDIR=${sysconfdir} SYSTEMDUNITDIR=${systemd_unitdir}" |
41 | 43 | ||
42 | CFLAGS += "-D__USE_GNU -D_GNU_SOURCE" | 44 | CFLAGS += "-D__USE_GNU -D_GNU_SOURCE" |
@@ -44,12 +46,26 @@ CFLAGS += "-D__USE_GNU -D_GNU_SOURCE" | |||
44 | # overide LDFLAGS to allow criu to build without: "x86_64-poky-linux-ld: unrecognized option '-Wl,-O1'" | 46 | # overide LDFLAGS to allow criu to build without: "x86_64-poky-linux-ld: unrecognized option '-Wl,-O1'" |
45 | export LDFLAGS="" | 47 | export LDFLAGS="" |
46 | 48 | ||
49 | export BUILD_SYS | ||
50 | export HOST_SYS | ||
51 | |||
52 | inherit setuptools | ||
53 | |||
54 | do_compile_prepend() { | ||
55 | rm -rf ${S}/protobuf/google/protobuf/descriptor.proto | ||
56 | ln -s ${PKG_CONFIG_SYSROOT_DIR}/usr/include/google/protobuf/descriptor.proto ${S}/protobuf/google/protobuf/descriptor.proto | ||
57 | } | ||
58 | |||
47 | do_compile () { | 59 | do_compile () { |
48 | oe_runmake | 60 | oe_runmake |
49 | } | 61 | } |
50 | 62 | ||
51 | do_install () { | 63 | do_install () { |
52 | oe_runmake DESTDIR="${D}" install | 64 | oe_runmake PREFIX=${exec_prefix} LIBDIR=${libdir} DESTDIR="${D}" install |
53 | } | 65 | } |
54 | 66 | ||
55 | FILES_${PN} += "${systemd_unitdir}/" | 67 | FILES_${PN} += "${systemd_unitdir}/ \ |
68 | ${libdir}/python2.7/site-packages/ \ | ||
69 | ${libdir}/pycriu/ \ | ||
70 | ${libdir}/crit-0.0.1-py2.7.egg-info \ | ||
71 | " | ||
diff --git a/recipes-containers/criu/files/0001-criu-Change-libraries-install-directory.patch b/recipes-containers/criu/files/0001-criu-Change-libraries-install-directory.patch new file mode 100644 index 00000000..28d638b3 --- /dev/null +++ b/recipes-containers/criu/files/0001-criu-Change-libraries-install-directory.patch | |||
@@ -0,0 +1,48 @@ | |||
1 | From cb9933dc34af0b4d52c4584332600114ac65c402 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jianchuan Wang <jianchuan.wang@windriver.com> | ||
3 | Date: Tue, 4 Aug 2015 17:45:51 +0800 | ||
4 | Subject: [PATCH] criu: Change libraries install directory | ||
5 | |||
6 | Install the libraries into /usr/lib(/usr/lib64) | ||
7 | |||
8 | Signed-off-by: Jianchuan Wang <jianchuan.wang@windriver.com> | ||
9 | --- | ||
10 | Makefile | 2 +- | ||
11 | Makefile.inc | 9 --------- | ||
12 | 2 files changed, 1 insertion(+), 10 deletions(-) | ||
13 | |||
14 | diff --git a/Makefile b/Makefile | ||
15 | index 7f5c890..6dbc436 100644 | ||
16 | --- a/Makefile | ||
17 | +++ b/Makefile | ||
18 | @@ -351,7 +351,7 @@ install-man: | ||
19 | |||
20 | install-crit: crit | ||
21 | $(E) " INSTALL crit" | ||
22 | - $(Q) python scripts/crit-setup.py install --root=$(DESTDIR) --prefix=$(PREFIX) | ||
23 | + $(Q) python scripts/crit-setup.py install --root=$(DESTDIR) --prefix=$(PREFIX) --install-lib=$(LIBDIR) | ||
24 | |||
25 | .PHONY: install install-man install-crit install-criu | ||
26 | |||
27 | diff --git a/Makefile.inc b/Makefile.inc | ||
28 | index 5496f41..ba70aea 100644 | ||
29 | --- a/Makefile.inc | ||
30 | +++ b/Makefile.inc | ||
31 | @@ -17,14 +17,5 @@ MANDIR := $(PREFIX)/share/man | ||
32 | SYSTEMDUNITDIR := $(PREFIX)/lib/systemd/system/ | ||
33 | LOGROTATEDIR := $(PREFIX)/etc/logrotate.d/ | ||
34 | LIBDIR := $(PREFIX)/lib | ||
35 | -# For recent Debian/Ubuntu with multiarch support | ||
36 | -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture \ | ||
37 | - -qDEB_HOST_MULTIARCH 2>/dev/null) | ||
38 | -ifneq "$(DEB_HOST_MULTIARCH)" "" | ||
39 | -LIBDIR := $(PREFIX)/lib/$(DEB_HOST_MULTIARCH) | ||
40 | -# For most other systems | ||
41 | -else ifeq "$(shell uname -m)" "x86_64" | ||
42 | -LIBDIR := $(PREFIX)/lib64 | ||
43 | -endif | ||
44 | |||
45 | INCLUDEDIR := $(PREFIX)/include/criu | ||
46 | -- | ||
47 | 1.9.1 | ||
48 | |||