diff options
author | Jianchuan Wang <jianchuan.wang@windriver.com> | 2016-09-08 01:36:00 -0400 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2016-09-12 10:03:05 -0400 |
commit | b9b7ece0cd52966467035fb71ad9ba472bf24b88 (patch) | |
tree | 1c7f62718927b9c2873edf99d4d848c7c2198ea0 /recipes-containers/criu/files/0001-criu-Change-libraries-install-directory.patch | |
parent | c415f9786025622ff253ac21f24eef4755118e82 (diff) | |
download | meta-virtualization-b9b7ece0cd52966467035fb71ad9ba472bf24b88.tar.gz |
criu: uprev to 2.5
Signed-off-by: Jianchuan Wang <jianchuan.wang@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'recipes-containers/criu/files/0001-criu-Change-libraries-install-directory.patch')
-rw-r--r-- | recipes-containers/criu/files/0001-criu-Change-libraries-install-directory.patch | 63 |
1 files changed, 27 insertions, 36 deletions
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 index 28d638b3..a7214050 100644 --- a/recipes-containers/criu/files/0001-criu-Change-libraries-install-directory.patch +++ b/recipes-containers/criu/files/0001-criu-Change-libraries-install-directory.patch | |||
@@ -1,48 +1,39 @@ | |||
1 | From cb9933dc34af0b4d52c4584332600114ac65c402 Mon Sep 17 00:00:00 2001 | 1 | From 7ebde06e00b591a88397dad74a1aa47fd562eb50 Mon Sep 17 00:00:00 2001 |
2 | From: Jianchuan Wang <jianchuan.wang@windriver.com> | 2 | From: Jianchuan Wang <jianchuan.wang@windriver.com> |
3 | Date: Tue, 4 Aug 2015 17:45:51 +0800 | 3 | Date: Tue, 16 Aug 2016 09:48:08 +0800 |
4 | Subject: [PATCH] criu: Change libraries install directory | 4 | Subject: [PATCH 1/2] criu: Change libraries install directory |
5 | 5 | ||
6 | Install the libraries into /usr/lib(/usr/lib64) | 6 | Install the libraries into /usr/lib(or /usr/lib64) |
7 | 7 | ||
8 | Signed-off-by: Jianchuan Wang <jianchuan.wang@windriver.com> | 8 | Signed-off-by: Jianchuan Wang <jianchuan.wang@windriver.com> |
9 | --- | 9 | --- |
10 | Makefile | 2 +- | 10 | Makefile.install | 13 ------------- |
11 | Makefile.inc | 9 --------- | 11 | 1 file changed, 13 deletions(-) |
12 | 2 files changed, 1 insertion(+), 10 deletions(-) | ||
13 | 12 | ||
14 | diff --git a/Makefile b/Makefile | 13 | diff --git a/Makefile.install b/Makefile.install |
15 | index 7f5c890..6dbc436 100644 | 14 | index dbc22e1..a30dc96 100644 |
16 | --- a/Makefile | 15 | --- a/Makefile.install |
17 | +++ b/Makefile | 16 | +++ b/Makefile.install |
18 | @@ -351,7 +351,7 @@ install-man: | 17 | @@ -11,19 +11,6 @@ LIBDIR ?= $(PREFIX)/lib |
18 | INCLUDEDIR ?= $(PREFIX)/include/criu | ||
19 | LIBEXECDIR ?= $(PREFIX)/libexec | ||
19 | 20 | ||
20 | install-crit: crit | 21 | -# |
21 | $(E) " INSTALL crit" | 22 | -# For recent Debian/Ubuntu with multiarch support. |
22 | - $(Q) python scripts/crit-setup.py install --root=$(DESTDIR) --prefix=$(PREFIX) | 23 | -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null) |
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)" "" | 24 | -ifneq "$(DEB_HOST_MULTIARCH)" "" |
39 | -LIBDIR := $(PREFIX)/lib/$(DEB_HOST_MULTIARCH) | 25 | - LIBDIR ?= $(PREFIX)/lib/$(DEB_HOST_MULTIARCH) |
40 | -# For most other systems | 26 | -else |
41 | -else ifeq "$(shell uname -m)" "x86_64" | 27 | - # |
42 | -LIBDIR := $(PREFIX)/lib64 | 28 | - # For most other systems |
29 | - ifeq "$(shell uname -m)" "x86_64" | ||
30 | - LIBDIR ?= $(PREFIX)/lib64 | ||
31 | - endif | ||
43 | -endif | 32 | -endif |
33 | - | ||
34 | export BINDIR SBINDIR MANDIR SYSTEMDUNITDIR LOGROTATEDIR | ||
35 | export INCLUDEDIR LIBDIR DESTDIR PREFIX LIBEXECDIR | ||
44 | 36 | ||
45 | INCLUDEDIR := $(PREFIX)/include/criu | ||
46 | -- | 37 | -- |
47 | 1.9.1 | 38 | 2.7.4 |
48 | 39 | ||